Merge "resourceloader: Simplify StringSet fallback"

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

diff --git a/tests/parser/ParserTestRunner.php b/tests/parser/ParserTestRunner.php
index 5eb91c3..cc3ef1c 100644 (file)
--- a/tests/parser/ParserTestRunner.php
+++ b/tests/parser/ParserTestRunner.php
@@ -410,7 +410,7 @@ class ParserTestRunner {
                // any live Language object, both on setup and teardown
                $reset = function () {
                        MWNamespace::clearCaches();
-                       $GLOBALS['wgContLang']->resetNamespaces();
+                       MediaWikiServices::getInstance()->getContentLanguage()->resetNamespaces();
                };
                $setup[] = $reset;
                $teardown[] = $reset;
@@ -830,7 +830,7 @@ class ParserTestRunner {
         * @return ParserTestResult|false false if skipped
         */
        public function runTest( $test ) {
-               wfDebug( __METHOD__.": running {$test['desc']}" );
+               wfDebug( __METHOD__ . ": running {$test['desc']}" );
                $opts = $this->parseOptions( $test['options'] );
                $teardownGuard = $this->perTestSetup( $test );
 
@@ -1151,8 +1151,20 @@ class ParserTestRunner {
                $lang = Language::factory( $langCode );
                $lang->resetNamespaces();
                $setup['wgContLang'] = $lang;
+               $setup[] = function () use ( $lang ) {
+                       MediaWikiServices::getInstance()->disableService( 'ContentLanguage' );
+                       MediaWikiServices::getInstance()->redefineService(
+                               'ContentLanguage',
+                               function () use ( $lang ) {
+                                       return $lang;
+                               }
+                       );
+               };
+               $teardown[] = function () {
+                       MediaWikiServices::getInstance()->resetServiceForTesting( 'ContentLanguage' );
+               };
                $reset = function () {
-                       MagicWord::clearCache();
+                       MediaWikiServices::getInstance()->resetServiceForTesting( 'MagicWordFactory' );
                        $this->resetTitleServices();
                };
                $setup[] = $reset;
@@ -1610,15 +1622,25 @@ class ParserTestRunner {
         * @param array $articles Article info array from TestFileReader
         */
        public function addArticles( $articles ) {
-               global $wgContLang;
                $setup = [];
                $teardown = [];
 
                // Be sure ParserTestRunner::addArticle has correct language set,
                // so that system messages get into the right language cache
-               if ( $wgContLang->getCode() !== 'en' ) {
+               if ( MediaWikiServices::getInstance()->getContentLanguage()->getCode() !== 'en' ) {
                        $setup['wgLanguageCode'] = 'en';
-                       $setup['wgContLang'] = Language::factory( 'en' );
+                       $lang = Language::factory( 'en' );
+                       $setup['wgContLang'] = $lang;
+                       $setup[] = function () use ( $lang ) {
+                               $services = MediaWikiServices::getInstance();
+                               $services->disableService( 'ContentLanguage' );
+                               $services->redefineService( 'ContentLanguage', function () use ( $lang ) {
+                                       return $lang;
+                               } );
+                       };
+                       $teardown[] = function () {
+                               MediaWikiServices::getInstance()->resetServiceForTesting( 'ContentLanguage' );
+                       };
                }
 
                // Add special namespaces, in case that hasn't been done by staticSetup() yet