Merge "rdbms: Use "mixed" type for $profiler field in LoadBalancer"

diff --combined includes/libs/rdbms/loadbalancer/LoadBalancer.php
index ba40bda,0e8f0d3..2a6175f
--- 1/includes/libs/rdbms/loadbalancer/LoadBalancer.php
--- 2/includes/libs/rdbms/loadbalancer/LoadBalancer.php
+++ b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
@@@ -47,7 -47,7 +47,7 @@@ class LoadBalancer implements ILoadBala
        private $srvCache;
        /** @var WANObjectCache */
        private $wanCache;
-       /** @var object|string Class name or object With profileIn/profileOut methods */
+       /** @var mixed Class name or object With profileIn/profileOut methods */
        private $profiler;
        /** @var TransactionProfiler */
        private $trxProfiler;
@@@ -204,7 -204,11 +204,7 @@@
                        $this->maxLag = $params['maxLag'];
                }
  
 -              if ( isset( $params['loadMonitor'] ) ) {
 -                      $this->loadMonitorConfig = $params['loadMonitor'];
 -              } else {
 -                      $this->loadMonitorConfig = [ 'class' => 'LoadMonitorNull' ];
 -              }
 +              $this->loadMonitorConfig = $params['loadMonitor'] ?? [ 'class' => 'LoadMonitorNull' ];
                $this->loadMonitorConfig += [ 'lagWarnThreshold' => $this->maxLag ];
  
                foreach ( $params['servers'] as $i => $server ) {
@@@ -219,10 -223,22 +219,10 @@@
                        }
                }
  
 -              if ( isset( $params['srvCache'] ) ) {
 -                      $this->srvCache = $params['srvCache'];
 -              } else {
 -                      $this->srvCache = new EmptyBagOStuff();
 -              }
 -              if ( isset( $params['wanCache'] ) ) {
 -                      $this->wanCache = $params['wanCache'];
 -              } else {
 -                      $this->wanCache = WANObjectCache::newEmpty();
 -              }
 +              $this->srvCache = $params['srvCache'] ?? new EmptyBagOStuff();
 +              $this->wanCache = $params['wanCache'] ?? WANObjectCache::newEmpty();
                $this->profiler = $params['profiler'] ?? null;
 -              if ( isset( $params['trxProfiler'] ) ) {
 -                      $this->trxProfiler = $params['trxProfiler'];
 -              } else {
 -                      $this->trxProfiler = new TransactionProfiler();
 -              }
 +              $this->trxProfiler = $params['trxProfiler'] ?? new TransactionProfiler();
  
                $this->errorLogger = $params['errorLogger'] ?? function ( Exception $e ) {
                        trigger_error( get_class( $e ) . ': ' . $e->getMessage(), E_USER_WARNING );
@@@ -1207,13 -1223,23 +1207,13 @@@
        }
  
        public function getServerName( $i ) {
 -              if ( isset( $this->servers[$i]['hostName'] ) ) {
 -                      $name = $this->servers[$i]['hostName'];
 -              } elseif ( isset( $this->servers[$i]['host'] ) ) {
 -                      $name = $this->servers[$i]['host'];
 -              } else {
 -                      $name = '';
 -              }
 +              $name = $this->servers[$i]['hostName'] ?? $this->servers[$i]['host'] ?? '';
  
                return ( $name != '' ) ? $name : 'localhost';
        }
  
        public function getServerInfo( $i ) {
 -              if ( isset( $this->servers[$i] ) ) {
 -                      return $this->servers[$i];
 -              } else {
 -                      return false;
 -              }
 +              return $this->servers[$i] ?? false;
        }
  
        public function getServerType( $i ) {