Merge "Revert "Reset $wgContLang consistently for tests""

diff --git a/RELEASE-NOTES-1.34 b/RELEASE-NOTES-1.34
index b9b26ce..275f4c2 100644 (file)
--- a/RELEASE-NOTES-1.34
+++ b/RELEASE-NOTES-1.34
@@ -443,10 +443,6 @@ because of Phabricator reports.
   Use OutputPage::getRevisionId() and OutputPage::isRevisionCurrent() instead.
 * LoadBalancer::haveIndex() and LoadBalancer::isNonZeroLoad() have
   been deprecated.
-* MediaWikiIntegrationTest::setContentLang() has been deprecated. Use
-  setMwGlobals( 'wgLanguageCode', 'xxx' ) to set a different site language
-  code, or setService( 'ContentLanguage', $myObj ) to set a specific Language
-  object. Service resets and $wgContLang will be handled automatically.
 * FileBackend::getWikiId() has been deprecated.
   Use FileBackend::getDomainId() instead.
 * User::getRights() and User::$mRights have been deprecated. Use

diff --git a/tests/phpunit/MediaWikiIntegrationTestCase.php b/tests/phpunit/MediaWikiIntegrationTestCase.php
index e0418a8..ed03a14 100644 (file)
--- a/tests/phpunit/MediaWikiIntegrationTestCase.php
+++ b/tests/phpunit/MediaWikiIntegrationTestCase.php
@@ -719,7 +719,9 @@ abstract class MediaWikiIntegrationTestCase extends PHPUnit\Framework\TestCase {
                        $instantiator
                );
 
-               self::resetLegacyGlobals();
+               if ( $name === 'ContentLanguage' ) {
+                       $this->setMwGlobals( [ 'wgContLang' => $this->localServices->getContentLanguage() ] );
+               }
        }
 
        /**
@@ -932,7 +934,7 @@ abstract class MediaWikiIntegrationTestCase extends PHPUnit\Framework\TestCase {
                        $this->localServices->resetServiceForTesting( $name, true );
                }
 
-               self::resetLegacyGlobals();
+               self::resetGlobalParser();
                Language::clearCaches();
        }
 
@@ -986,7 +988,7 @@ abstract class MediaWikiIntegrationTestCase extends PHPUnit\Framework\TestCase {
                        $newInstance->redefineService( $name, $callback );
                }
 
-               self::resetLegacyGlobals();
+               self::resetGlobalParser();
 
                return $newInstance;
        }
@@ -1053,7 +1055,7 @@ abstract class MediaWikiIntegrationTestCase extends PHPUnit\Framework\TestCase {
 
                MediaWikiServices::forceGlobalInstance( $newServices );
 
-               self::resetLegacyGlobals();
+               self::resetGlobalParser();
 
                return $newServices;
        }
@@ -1083,29 +1085,24 @@ abstract class MediaWikiIntegrationTestCase extends PHPUnit\Framework\TestCase {
                MediaWikiServices::forceGlobalInstance( self::$originalServices );
                $currentServices->destroy();
 
-               self::resetLegacyGlobals();
+               self::resetGlobalParser();
 
                return true;
        }
 
        /**
-        * If legacy globals such as $wgParser or $wgContLang have been unstubbed, replace them with
-        * fresh ones so they pick up any config changes. They're deprecated, but we still support them
-        * for now.
+        * If $wgParser has been unstubbed, replace it with a fresh one so it picks up any config
+        * changes. $wgParser is deprecated, but we still support it for now.
         */
-       private static function resetLegacyGlobals() {
+       private static function resetGlobalParser() {
                // phpcs:ignore MediaWiki.Usage.DeprecatedGlobalVariables.Deprecated$wgParser
-               global $wgParser, $wgContLang;
-               if ( !( $wgParser instanceof StubObject ) ) {
-                       $wgParser = new StubObject( 'wgParser', function () {
-                               return MediaWikiServices::getInstance()->getParser();
-                       } );
-               }
-               if ( !( $wgContLang instanceof StubObject ) ) {
-                       $wgContlang = new StubObject( 'wgContLang', function () {
-                               return MediaWikiServices::getInstance()->getContLang();
-                       } );
+               global $wgParser;
+               if ( $wgParser instanceof StubObject ) {
+                       return;
                }
+               $wgParser = new StubObject( 'wgParser', function () {
+                       return MediaWikiServices::getInstance()->getParser();
+               } );
        }
 
        /**
@@ -1118,8 +1115,6 @@ abstract class MediaWikiIntegrationTestCase extends PHPUnit\Framework\TestCase {
        }
 
        /**
-        * @deprecated since 1.34, use setMwGlobals( 'wgLanguageCode' ) to set the code or
-        *   setService( 'ContentLanguage' ) to set an object
         * @since 1.27
         * @param string|Language $lang
         */
@@ -1129,7 +1124,10 @@ abstract class MediaWikiIntegrationTestCase extends PHPUnit\Framework\TestCase {
                        $this->setService( 'ContentLanguage', $lang );
                        $this->setMwGlobals( 'wgLanguageCode', $lang->getCode() );
                } else {
-                       $this->setMwGlobals( 'wgLanguageCode', $lang );
+                       $this->setMwGlobals( [
+                               'wgLanguageCode' => $lang,
+                               'wgContLang' => Language::factory( $lang ),
+                       ] );
                }
        }