Change DatabaseBase => IDatabase in /db where possible

[lhc/web/wiklou.git] / includes / db / loadbalancer / LBFactorySingle.php

diff --git a/includes/db/loadbalancer/LBFactorySingle.php b/includes/db/loadbalancer/LBFactorySingle.php
index 14c1c28..3937dfd 100644 (file)
--- a/includes/db/loadbalancer/LBFactorySingle.php
+++ b/includes/db/loadbalancer/LBFactorySingle.php
@@ -30,17 +30,12 @@ class LBFactorySingle extends LBFactory {
 
        /**
         * @param array $conf An associative array with one member:
-        *  - connection: The DatabaseBase connection object
+        *  - connection: The IDatabase connection object
         */
        public function __construct( array $conf ) {
                parent::__construct( $conf );
 
-               $this->lb = new LoadBalancerSingle( [
-                       'readOnlyReason' => $this->readOnlyReason,
-                       'trxProfiler' => $this->trxProfiler,
-                       'srvCache' => $this->srvCache,
-                       'wanCache' => $this->wanCache
-               ] + $conf );
+               $this->lb = new LoadBalancerSingle( array_merge( $this->baseLoadBalancerParams(), $conf ) );
        }
 
        /**
@@ -73,7 +68,7 @@ class LBFactorySingle extends LBFactory {
         * @param bool|string $wiki Wiki ID, or false for the current wiki
         * @return LoadBalancerSingle
         */
-       public function &getExternalLB( $cluster, $wiki = false ) {
+       public function getExternalLB( $cluster, $wiki = false ) {
                return $this->lb;
        }
 
@@ -90,7 +85,7 @@ class LBFactorySingle extends LBFactory {
  * Helper class for LBFactorySingle.
  */
 class LoadBalancerSingle extends LoadBalancer {
-       /** @var DatabaseBase */
+       /** @var IDatabase */
        private $db;
 
        /**
@@ -123,7 +118,7 @@ class LoadBalancerSingle extends LoadBalancer {
         * @param string $server
         * @param bool $dbNameOverride
         *
-        * @return DatabaseBase
+        * @return IDatabase
         */
        protected function reallyOpenConnection( $server, $dbNameOverride = false ) {
                return $this->db;