Merge "Postgres installation fixes"

[lhc/web/wiklou.git] / includes / libs / rdbms / lbfactory / LBFactory.php

diff --git a/includes/libs/rdbms/lbfactory/LBFactory.php b/includes/libs/rdbms/lbfactory/LBFactory.php
index f5d57c4..f3a3275 100644 (file)
--- a/includes/libs/rdbms/lbfactory/LBFactory.php
+++ b/includes/libs/rdbms/lbfactory/LBFactory.php
@@ -22,6 +22,7 @@
  */
 
 use Psr\Log\LoggerInterface;
+use Wikimedia\ScopedCallback;
 
 /**
  * An interface for generating database load balancers
@@ -96,7 +97,7 @@ abstract class LBFactory implements ILBFactory {
                $this->errorLogger = isset( $conf['errorLogger'] )
                        ? $conf['errorLogger']
                        : function ( Exception $e ) {
-                               trigger_error( E_WARNING, get_class( $e ) . ': ' . $e->getMessage() );
+                               trigger_error( E_USER_WARNING, get_class( $e ) . ': ' . $e->getMessage() );
                        };
 
                $this->profiler = isset( $params['profiler'] ) ? $params['profiler'] : null;
@@ -145,7 +146,7 @@ abstract class LBFactory implements ILBFactory {
        /**
         * @see ILBFactory::getMainLB()
         * @param bool $domain
-        * @return mixed
+        * @return LoadBalancer
         */
        abstract public function getMainLB( $domain = false );
 
@@ -161,7 +162,7 @@ abstract class LBFactory implements ILBFactory {
         * @see ILBFactory::getExternalLB()
         * @param string $cluster
         * @param bool $domain
-        * @return mixed
+        * @return LoadBalancer
         */
        abstract public function getExternalLB( $cluster, $domain = false );