Merge "parserTests: Use "fallback" skin unless otherwise specified"

diff --combined tests/parser/ParserTestRunner.php
index 8615edc,fff1eec..feed77f
--- 1/tests/parser/ParserTestRunner.php
--- 2/tests/parser/ParserTestRunner.php
+++ b/tests/parser/ParserTestRunner.php
@@@ -168,7 -168,7 +168,7 @@@ class ParserTestRunner 
                global $wgParserTestFiles;
  
                // Add core test files
 -              $files = array_map( function( $item ) {
 +              $files = array_map( function ( $item ) {
                        return __DIR__ . "/$item";
                }, self::$coreTestFiles );
  
@@@ -1036,6 -1036,9 +1036,9 @@@
                $linkHolderBatchSize =
                        self::getOptionValue( 'wgLinkHolderBatchSize', $opts, 1000 );
  
+               // Default to fallback skin, but allow it to be overridden
+               $skin = self::getOptionValue( 'skin', $opts, 'fallback' );
+ 
                $setup = [
                        'wgEnableUploads' => self::getOptionValue( 'wgEnableUploads', $opts, true ),
                        'wgLanguageCode' => $langCode,
@@@ -1105,7 -1108,13 +1108,13 @@@
                $context = RequestContext::getMain();
                $context->setUser( $user );
                $context->setLanguage( $lang );
-               $teardown[] = function () use ( $context ) {
+               // And the skin!
+               $oldSkin = $context->getSkin();
+               $skinFactory = MediaWikiServices::getInstance()->getSkinFactory();
+               $context->setSkin( $skinFactory->makeSkin( $skin ) );
+               $context->setOutput( new OutputPage( $context ) );
+               $setup['wgOut'] = $context->getOutput();
+               $teardown[] = function () use ( $context, $oldSkin ) {
                        // Clear language conversion tables
                        $wrapper = TestingAccessWrapper::newFromObject(
                                $context->getLanguage()->getConverter()
@@@ -1114,6 -1123,8 +1123,8 @@@
                        // Reset context to the restored globals
                        $context->setUser( $GLOBALS['wgUser'] );
                        $context->setLanguage( $GLOBALS['wgContLang'] );
+                       $context->setSkin( $oldSkin );
+                       $context->setOutput( $GLOBALS['wgOut'] );
                };
  
                $teardown[] = $this->executeSetupSnippets( $setup );