Fixed spacing

[lhc/web/wiklou.git] / tests / parser / parserTest.inc

diff --git a/tests/parser/parserTest.inc b/tests/parser/parserTest.inc
index 55e93e2..f20d73a 100644 (file)
--- a/tests/parser/parserTest.inc
+++ b/tests/parser/parserTest.inc
@@ -5,7 +5,7 @@
  * at the same time.
  *
  * Copyright © 2004, 2010 Brion Vibber <brion@pobox.com>
- * http://www.mediawiki.org/
+ * https://www.mediawiki.org/
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -387,7 +387,7 @@ class ParserTest {
 
                foreach ( $filenames as $filename ) {
                        $contents = file_get_contents( $filename );
-                       preg_match_all( '/!!\s*input\n(.*?)\n!!\s*result/s', $contents, $matches );
+                       preg_match_all( '/!!\s*(input|wikitext)\n(.*?)\n!!\s*(result|html|html\/\*|html\/php)/s', $contents, $matches );
 
                        foreach ( $matches[1] as $match ) {
                                $dict .= $match . "\n";
@@ -672,7 +672,7 @@ class ParserTest {
                                )
                        )
                )';
-               $regex = '/'.$defs.'\b
+               $regex = '/' . $defs . '\b
                        (?<k>[\w-]+)                            # Key
                        \b
                        (?:\s*
@@ -688,7 +688,7 @@ class ParserTest {
                                )
                        )?
                        /x';
-               $valueregex = '/'.$defs.'(?&value)/x';
+               $valueregex = '/' . $defs . '(?&value)/x';
 
                if ( preg_match_all( $regex, $instring, $matches, PREG_SET_ORDER ) ) {
                        foreach ( $matches as $bits ) {
@@ -787,6 +787,7 @@ class ParserTest {
                        'wgSVGConverters' => array( 'null' => 'echo "1">$output' ),
                        'wgLocaltimezone' => 'UTC',
                        'wgAllowExternalImages' => self::getOptionValue( 'wgAllowExternalImages', $opts, true ),
+                       'wgThumbLimits' => array( self::getOptionValue( 'thumbsize', $opts, 180 ) ),
                        'wgUseTidy' => false,
                        'wgDefaultLanguageVariant' => $variant,
                        'wgVariantArticlePath' => false,
@@ -841,8 +842,10 @@ class ParserTest {
                $context = new RequestContext();
                $GLOBALS['wgLang'] = $context->getLanguage();
                $GLOBALS['wgOut'] = $context->getOutput();
+               $GLOBALS['wgUser'] = $context->getUser();
 
-               $GLOBALS['wgUser'] = new User();
+               // We (re)set $wgThumbLimits to a single-element array above.
+               $context->getUser()->setOption( 'thumbsize', 0 );
 
                global $wgHooks;
 
@@ -1074,10 +1077,10 @@ class ParserTest {
                wfMkdirParents( $dir . '/0/09', null, __METHOD__ );
                copy( "$IP/skins/monobook/headbg.jpg", "$dir/0/09/Bad.jpg" );
                wfMkdirParents( $dir . '/f/ff', null, __METHOD__ );
-               copy( "$IP/skins/monobook/headbg.jpg", "$dir/f/ff/Foobar.svg" );
                file_put_contents( "$dir/f/ff/Foobar.svg",
                        '<?xml version="1.0" encoding="utf-8"?>' .
-                       '<svg xmlns="http://www.w3.org/2000/svg" />' );
+                       '<svg xmlns="http://www.w3.org/2000/svg"' .
+                       ' version="1.1" width="240" height="180"/>' );
                return $dir;
        }