Merge "parser: Validate $length in padleft/padright parser functions" into REL1_31

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

diff --git a/tests/parser/ParserTestRunner.php b/tests/parser/ParserTestRunner.php
index d4b1f91..844a43f 100644 (file)
--- a/tests/parser/ParserTestRunner.php
+++ b/tests/parser/ParserTestRunner.php
@@ -615,9 +615,13 @@ class ParserTestRunner {
                        return false;
                } );// hooks::register
 
+               // Reset the service in case any other tests already cached some prefixes.
+               MediaWikiServices::getInstance()->resetServiceForTesting( 'InterwikiLookup' );
+
                return function () {
                        // Tear down
                        Hooks::clear( 'InterwikiLoadPrefix' );
+                       MediaWikiServices::getInstance()->resetServiceForTesting( 'InterwikiLookup' );
                };
        }
 
@@ -636,7 +640,6 @@ class ParserTestRunner {
 
        /**
         * Remove last character if it is a newline
-        * @group utility
         * @param string $s
         * @return string
         */
@@ -831,6 +834,19 @@ class ParserTestRunner {
                $parser = $this->getParser( $preprocessor );
                $title = Title::newFromText( $titleText );
 
+               if ( isset( $opts['styletag'] ) ) {
+                       // For testing the behavior of <style> (including those deduplicated
+                       // into <link> tags), add tag hooks to allow them to be generated.
+                       $parser->setHook( 'style', function ( $content, $attributes, $parser ) {
+                               $marker = Parser::MARKER_PREFIX . '-style-' . md5( $content ) . Parser::MARKER_SUFFIX;
+                               $parser->mStripState->addNoWiki( $marker, $content );
+                               return Html::inlineStyle( $marker, 'all', $attributes );
+                       } );
+                       $parser->setHook( 'link', function ( $content, $attributes, $parser ) {
+                               return Html::element( 'link', $attributes );
+                       } );
+               }
+
                if ( isset( $opts['pst'] ) ) {
                        $out = $parser->preSaveTransform( $test['input'], $title, $user, $options );
                        $output = $parser->getOutput();
@@ -1096,6 +1112,7 @@ class ParserTestRunner {
 
                // Set content language. This invalidates the magic word cache and title services
                $lang = Language::factory( $langCode );
+               $lang->resetNamespaces();
                $setup['wgContLang'] = $lang;
                $reset = function () {
                        MagicWord::clearCache();