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

diff --combined tests/phpunit/MediaWikiIntegrationTestCase.php
index e0418a8,b1eb9ef..ed03a14
--- 1/tests/phpunit/MediaWikiIntegrationTestCase.php
--- 2/tests/phpunit/MediaWikiIntegrationTestCase.php
+++ b/tests/phpunit/MediaWikiIntegrationTestCase.php
@@@ -182,10 -182,8 +182,10 @@@ abstract class MediaWikiIntegrationTest
                global $IP;
                parent::setUpBeforeClass();
                if ( !file_exists( "$IP/LocalSettings.php" ) ) {
 -                      echo 'A working MediaWiki installation with a configured LocalSettings.php file is'
 -                      . ' required for tests that extend ' . self::class;
 +                              echo "File \"$IP/LocalSettings.php\" could not be found. "
 +                              . "Test case " . static::class . " extends " . self::class . " "
 +                              . "which requires a working MediaWiki installation.\n"
 +                              . ( new RuntimeException() )->getTraceAsString();
                        die();
                }
                self::initializeForStandardPhpunitEntrypointIfNeeded();
@@@ -719,7 -717,9 +719,9 @@@
                        $instantiator
                );
  
-               self::resetLegacyGlobals();
+               if ( $name === 'ContentLanguage' ) {
+                       $this->setMwGlobals( [ 'wgContLang' => $this->localServices->getContentLanguage() ] );
+               }
        }
  
        /**
@@@ -932,7 -932,7 +934,7 @@@
                        $this->localServices->resetServiceForTesting( $name, true );
                }
  
-               self::resetLegacyGlobals();
+               self::resetGlobalParser();
                Language::clearCaches();
        }
  
@@@ -986,7 -986,7 +988,7 @@@
                        $newInstance->redefineService( $name, $callback );
                }
  
-               self::resetLegacyGlobals();
+               self::resetGlobalParser();
  
                return $newInstance;
        }
@@@ -1053,7 -1053,7 +1055,7 @@@
  
                MediaWikiServices::forceGlobalInstance( $newServices );
  
-               self::resetLegacyGlobals();
+               self::resetGlobalParser();
  
                return $newServices;
        }
@@@ -1083,29 -1083,24 +1085,24 @@@
                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 -1113,6 +1115,6 @@@
        }
  
        /**
-        * @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 -1122,10 +1124,10 @@@
                        $this->setService( 'ContentLanguage', $lang );
                        $this->setMwGlobals( 'wgLanguageCode', $lang->getCode() );
                } else {
-                       $this->setMwGlobals( 'wgLanguageCode', $lang );
+                       $this->setMwGlobals( [
+                               'wgLanguageCode' => $lang,
+                               'wgContLang' => Language::factory( $lang ),
+                       ] );
                }
        }