Merge "IcuCollation: Use codepoint as tiebreaker when getting first-letters" into...

[lhc/web/wiklou.git] / tests / parser / parserTests.php

diff --git a/tests/parser/parserTests.php b/tests/parser/parserTests.php
index 1d0867a..6a423d5 100644 (file)
--- a/tests/parser/parserTests.php
+++ b/tests/parser/parserTests.php
@@ -30,6 +30,8 @@ define( 'MW_PARSER_TEST', true );
 
 require __DIR__ . '/../../maintenance/Maintenance.php';
 
+use MediaWiki\MediaWikiServices;
+
 class ParserTestsMaintenance extends Maintenance {
        function __construct() {
                parent::__construct();
@@ -80,7 +82,7 @@ class ParserTestsMaintenance extends Maintenance {
        }
 
        public function execute() {
-               global $wgParserTestFiles, $wgDBtype;
+               global $wgDBtype;
 
                // Cases of weird db corruption were encountered when running tests on earlyish
                // versions of SQLite
@@ -145,7 +147,8 @@ class ParserTestsMaintenance extends Maintenance {
 
                $recorderLB = false;
                if ( $record || $compare ) {
-                       $recorderLB = wfGetLBFactory()->newMainLB();
+                       $lbFactory = MediaWikiServices::getInstance()->getDBLoadBalancerFactory();
+                       $recorderLB = $lbFactory->newMainLB();
                        // This connection will have the wiki's table prefix, not parsertest_
                        $recorderDB = $recorderLB->getConnection( DB_MASTER );
 
@@ -167,7 +170,7 @@ class ParserTestsMaintenance extends Maintenance {
                }
 
                // Default parser tests and any set from extensions or local config
-               $files = $this->getOption( 'file', $wgParserTestFiles );
+               $files = $this->getOption( 'file', ParserTestRunner::getParserTestFiles() );
 
                $norm = $this->hasOption( 'norm' ) ? explode( ',', $this->getOption( 'norm' ) ) : [];