Merge "Rename autonym for 'no' from 'norsk bokmål' to 'norsk'"

[lhc/web/wiklou.git] / includes / parser / ParserDiffTest.php

diff --git a/includes/parser/ParserDiffTest.php b/includes/parser/ParserDiffTest.php
index 2db0597..353825a 100644 (file)
--- a/includes/parser/ParserDiffTest.php
+++ b/includes/parser/ParserDiffTest.php
@@ -24,31 +24,23 @@
 /**
  * @ingroup Parser
  */
-class ParserDiffTest
-{
-       var $parsers, $conf;
-       var $shortOutput = false;
+class ParserDiffTest {
+       public $parsers;
+       public $conf;
+       public $shortOutput = false;
 
-       var $dtUniqPrefix;
-
-       function __construct( $conf ) {
+       public function __construct( $conf ) {
                if ( !isset( $conf['parsers'] ) ) {
                        throw new MWException( __METHOD__ . ': no parsers specified' );
                }
                $this->conf = $conf;
        }
 
-       function init() {
+       public function init() {
                if ( !is_null( $this->parsers ) ) {
                        return;
                }
 
-               global $wgHooks;
-               static $doneHook = false;
-               if ( !$doneHook ) {
-                       $doneHook = true;
-                       $wgHooks['ParserClearState'][] = array( $this, 'onClearState' );
-               }
                if ( isset( $this->conf['shortOutput'] ) ) {
                        $this->shortOutput = $this->conf['shortOutput'];
                }
@@ -56,7 +48,7 @@ class ParserDiffTest
                foreach ( $this->conf['parsers'] as $i => $parserConf ) {
                        if ( !is_array( $parserConf ) ) {
                                $class = $parserConf;
-                               $parserConf = array( 'class' => $parserConf );
+                               $parserConf = [ 'class' => $parserConf ];
                        } else {
                                $class = $parserConf['class'];
                        }
@@ -64,14 +56,14 @@ class ParserDiffTest
                }
        }
 
-       function __call( $name, $args ) {
+       public function __call( $name, $args ) {
                $this->init();
-               $results = array();
+               $results = [];
                $mismatch = false;
                $lastResult = null;
                $first = true;
                foreach ( $this->parsers as $i => $parser ) {
-                       $currentResult = call_user_func_array( array( &$this->parsers[$i], $name ), $args );
+                       $currentResult = call_user_func_array( [ &$this->parsers[$i], $name ], $args );
                        if ( $first ) {
                                $first = false;
                        } else {
@@ -90,7 +82,7 @@ class ParserDiffTest
                }
                if ( $mismatch ) {
                        if ( count( $results ) == 2 ) {
-                               $resultsList = array();
+                               $resultsList = [];
                                foreach ( $this->parsers as $i => $parser ) {
                                        $resultsList[] = var_export( $results[$i], true );
                                }
@@ -109,7 +101,7 @@ class ParserDiffTest
                return $lastResult;
        }
 
-       function formatArray( $array ) {
+       public function formatArray( $array ) {
                if ( $this->shortOutput ) {
                        foreach ( $array as $key => $value ) {
                                if ( $value instanceof ParserOutput ) {
@@ -120,24 +112,10 @@ class ParserDiffTest
                return var_export( $array, true );
        }
 
-       function setFunctionHook( $id, $callback, $flags = 0 ) {
+       public function setFunctionHook( $id, $callback, $flags = 0 ) {
                $this->init();
                foreach ( $this->parsers as $parser ) {
                        $parser->setFunctionHook( $id, $callback, $flags );
                }
        }
-
-       /**
-        * @param Parser $parser
-        * @return bool
-        */
-       function onClearState( &$parser ) {
-               // hack marker prefixes to get identical output
-               if ( !isset( $this->dtUniqPrefix ) ) {
-                       $this->dtUniqPrefix = $parser->uniqPrefix();
-               } else {
-                       $parser->mUniqPrefix = $this->dtUniqPrefix;
-               }
-               return true;
-       }
 }