Merge "phpunit: Add more info to LocalSettings.php error in MediaWikiIntegrationTestCase"

diff --combined tests/phpunit/MediaWikiIntegrationTestCase.php
index c22bf45,ed03a14..e0418a8
--- 1/tests/phpunit/MediaWikiIntegrationTestCase.php
--- 2/tests/phpunit/MediaWikiIntegrationTestCase.php
+++ b/tests/phpunit/MediaWikiIntegrationTestCase.php
@@@ -182,8 -182,10 +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();
@@@ -717,7 -719,9 +719,7 @@@
                        $instantiator
                );
  
 -              if ( $name === 'ContentLanguage' ) {
 -                      $this->setMwGlobals( [ 'wgContLang' => $this->localServices->getContentLanguage() ] );
 -              }
 +              self::resetLegacyGlobals();
        }
  
        /**
@@@ -930,7 -934,7 +932,7 @@@
                        $this->localServices->resetServiceForTesting( $name, true );
                }
  
 -              self::resetGlobalParser();
 +              self::resetLegacyGlobals();
                Language::clearCaches();
        }
  
@@@ -984,7 -988,7 +986,7 @@@
                        $newInstance->redefineService( $name, $callback );
                }
  
 -              self::resetGlobalParser();
 +              self::resetLegacyGlobals();
  
                return $newInstance;
        }
@@@ -1051,7 -1055,7 +1053,7 @@@
  
                MediaWikiServices::forceGlobalInstance( $newServices );
  
 -              self::resetGlobalParser();
 +              self::resetLegacyGlobals();
  
                return $newServices;
        }
@@@ -1081,29 -1085,24 +1083,29 @@@
                MediaWikiServices::forceGlobalInstance( self::$originalServices );
                $currentServices->destroy();
  
 -              self::resetGlobalParser();
 +              self::resetLegacyGlobals();
  
                return true;
        }
  
        /**
 -       * 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.
 +       * 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.
         */
 -      private static function resetGlobalParser() {
 +      private static function resetLegacyGlobals() {
                // phpcs:ignore MediaWiki.Usage.DeprecatedGlobalVariables.Deprecated$wgParser
 -              global $wgParser;
 -              if ( $wgParser instanceof StubObject ) {
 -                      return;
 +              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();
 +                      } );
                }
 -              $wgParser = new StubObject( 'wgParser', function () {
 -                      return MediaWikiServices::getInstance()->getParser();
 -              } );
        }
  
        /**
@@@ -1116,8 -1115,6 +1118,8 @@@
        }
  
        /**
 +       * @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
         */
@@@ -1127,7 -1124,10 +1129,7 @@@
                        $this->setService( 'ContentLanguage', $lang );
                        $this->setMwGlobals( 'wgLanguageCode', $lang->getCode() );
                } else {
 -                      $this->setMwGlobals( [
 -                              'wgLanguageCode' => $lang,
 -                              'wgContLang' => Language::factory( $lang ),
 -                      ] );
 +                      $this->setMwGlobals( 'wgLanguageCode', $lang );
                }
        }