X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2Fparser%2FTagHooksTest.php;h=06fe272b291cefe515216e8afba94188972634d2;hb=f7e1770fb832aa77bf4e16ce8cc815f2b24dd10d;hp=12936ee21d10248063e33ea5804655c5d490c751;hpb=50f1de243986a1d006fb4500fb19e5fa88cce336;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/includes/parser/TagHooksTest.php b/tests/phpunit/includes/parser/TagHooksTest.php
index 12936ee21d..06fe272b29 100644
--- a/tests/phpunit/includes/parser/TagHooksTest.php
+++ b/tests/phpunit/includes/parser/TagHooksTest.php
@@ -43,18 +43,25 @@ class TagHookTest extends MediaWikiTestCase {
 		return [ [ "foo<bar" ], [ "foo>bar" ], [ "foo\nbar" ], [ "foo\rbar" ] ];
 	}
 
+	private function getParserOptions() {
+		global $wgContLang;
+		$popt = ParserOptions::newFromUserAndLang( new User, $wgContLang );
+		$popt->setWrapOutputClass( false );
+		return $popt;
+	}
+
 	/**
 	 * @dataProvider provideValidNames
 	 */
 	public function testTagHooks( $tag ) {
-		global $wgParserConf, $wgContLang;
+		global $wgParserConf;
 		$parser = new Parser( $wgParserConf );
 
 		$parser->setHook( $tag, [ $this, 'tagCallback' ] );
 		$parserOutput = $parser->parse(
 			"Foo<$tag>Bar</$tag>Baz",
 			Title::newFromText( 'Test' ),
-			ParserOptions::newFromUserAndLang( new User, $wgContLang )
+			$this->getParserOptions()
 		);
 		$this->assertEquals( "<p>FooOneBaz\n</p>", $parserOutput->getText() );
 
@@ -66,14 +73,14 @@ class TagHookTest extends MediaWikiTestCase {
 	 * @expectedException MWException
 	 */
 	public function testBadTagHooks( $tag ) {
-		global $wgParserConf, $wgContLang;
+		global $wgParserConf;
 		$parser = new Parser( $wgParserConf );
 
 		$parser->setHook( $tag, [ $this, 'tagCallback' ] );
 		$parser->parse(
 			"Foo<$tag>Bar</$tag>Baz",
 			Title::newFromText( 'Test' ),
-			ParserOptions::newFromUserAndLang( new User, $wgContLang )
+			$this->getParserOptions()
 		);
 		$this->fail( 'Exception not thrown.' );
 	}
@@ -82,14 +89,14 @@ class TagHookTest extends MediaWikiTestCase {
 	 * @dataProvider provideValidNames
 	 */
 	public function testFunctionTagHooks( $tag ) {
-		global $wgParserConf, $wgContLang;
+		global $wgParserConf;
 		$parser = new Parser( $wgParserConf );
 
 		$parser->setFunctionTagHook( $tag, [ $this, 'functionTagCallback' ], 0 );
 		$parserOutput = $parser->parse(
 			"Foo<$tag>Bar</$tag>Baz",
 			Title::newFromText( 'Test' ),
-			ParserOptions::newFromUserAndLang( new User, $wgContLang )
+			$this->getParserOptions()
 		);
 		$this->assertEquals( "<p>FooOneBaz\n</p>", $parserOutput->getText() );
 
@@ -101,7 +108,7 @@ class TagHookTest extends MediaWikiTestCase {
 	 * @expectedException MWException
 	 */
 	public function testBadFunctionTagHooks( $tag ) {
-		global $wgParserConf, $wgContLang;
+		global $wgParserConf;
 		$parser = new Parser( $wgParserConf );
 
 		$parser->setFunctionTagHook(
@@ -112,7 +119,7 @@ class TagHookTest extends MediaWikiTestCase {
 		$parser->parse(
 			"Foo<$tag>Bar</$tag>Baz",
 			Title::newFromText( 'Test' ),
-			ParserOptions::newFromUserAndLang( new User, $wgContLang )
+			$this->getParserOptions()
 		);
 		$this->fail( 'Exception not thrown.' );
 	}