X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fparser%2FParserDiffTest.php;h=32f5d06826fc98a11b2e8e16a92f33ba8f985dc7;hb=38ba6b620be9f6333d902055ae1c0c610af4985e;hp=2db0597e2bddb430ae36775bb30e439c715e98eb;hpb=86b2bcc97577b79b6977b5fa3c3ec19c9312dc99;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/parser/ParserDiffTest.php b/includes/parser/ParserDiffTest.php
index 2db0597e2b..32f5d06826 100644
--- a/includes/parser/ParserDiffTest.php
+++ b/includes/parser/ParserDiffTest.php
@@ -26,29 +26,22 @@
  */
 class ParserDiffTest
 {
-	var $parsers, $conf;
-	var $shortOutput = false;
+	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'];
 		}
@@ -64,7 +57,7 @@ class ParserDiffTest
 		}
 	}
 
-	function __call( $name, $args ) {
+	public function __call( $name, $args ) {
 		$this->init();
 		$results = array();
 		$mismatch = false;
@@ -109,7 +102,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 +113,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;
-	}
 }