Merge "Reduce calls to MediaWikiServices::getInstance()"

[lhc/web/wiklou.git] / maintenance / backup.inc

diff --git a/maintenance/backup.inc b/maintenance/backup.inc
index ffc75c6..6eeb81b 100644 (file)
--- a/maintenance/backup.inc
+++ b/maintenance/backup.inc
@@ -26,6 +26,7 @@
 
 require_once __DIR__ . '/Maintenance.php';
 
+use MediaWiki\MediaWikiServices;
 use Wikimedia\Rdbms\LoadBalancer;
 use Wikimedia\Rdbms\IDatabase;
 
@@ -75,7 +76,7 @@ class BackupDumper extends Maintenance {
        private $stubText = false; // include rev_text_id instead of text; for 2-pass dump
 
        /**
-        * @param array $args For backward compatibility
+        * @param array|null $args For backward compatibility
         */
        function __construct( $args = null ) {
                parent::__construct();
@@ -141,7 +142,7 @@ class BackupDumper extends Maintenance {
                        require_once $file;
                }
                $register = [ $class, 'register' ];
-               call_user_func_array( $register, [ $this ] );
+               $register( $this );
        }
 
        function execute() {
@@ -323,7 +324,8 @@ class BackupDumper extends Maintenance {
                        return $this->forcedDb;
                }
 
-               $this->lb = wfGetLBFactory()->newMainLB();
+               $lbFactory = MediaWikiServices::getInstance()->getDBLoadBalancerFactory();
+               $this->lb = $lbFactory->newMainLB();
                $db = $this->lb->getConnection( DB_REPLICA, 'dump' );
 
                // Discourage the server from disconnecting us if it takes a long time