X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2Fcontent%2FJavaScriptContentTest.php;h=9506c364c5dfa3527edc04caf6cb48286fa55439;hb=e143c40fee88922eb393a88f94e60afc439d1f49;hp=434e17cfb46272de72cced2205f7ab5b7c809f91;hpb=1a40e0cc86b6ee0706606ded3ea243dfde4a414c;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/includes/content/JavaScriptContentTest.php b/tests/phpunit/includes/content/JavaScriptContentTest.php
index 434e17cfb4..9506c364c5 100644
--- a/tests/phpunit/includes/content/JavaScriptContentTest.php
+++ b/tests/phpunit/includes/content/JavaScriptContentTest.php
@@ -1,5 +1,7 @@
 <?php
 
+use MediaWiki\MediaWikiServices;
+
 /**
  * @group ContentHandler
  * @group Database
@@ -153,16 +155,6 @@ class JavaScriptContentTest extends TextContentTest {
 				'any',
 				true
 			],
-			[ 'Foo',
-				null,
-				'comma',
-				false
-			],
-			[ 'Foo, bar',
-				null,
-				'comma',
-				false
-			],
 			[ 'Foo',
 				null,
 				'link',
@@ -188,11 +180,6 @@ class JavaScriptContentTest extends TextContentTest {
 				'any',
 				true
 			],
-			[ '#REDIRECT [[bar]]',
-				true,
-				'comma',
-				false
-			],
 			[ '#REDIRECT [[bar]]',
 				true,
 				'link',
@@ -222,7 +209,7 @@ class JavaScriptContentTest extends TextContentTest {
 	 * @covers JavaScriptContent::matchMagicWord
 	 */
 	public function testMatchMagicWord() {
-		$mw = MagicWord::get( "staticredirect" );
+		$mw = MediaWikiServices::getInstance()->getMagicWordFactory()->get( "staticredirect" );
 
 		$content = $this->newContent( "#REDIRECT [[FOO]]\n__STATICREDIRECT__" );
 		$this->assertFalse(
@@ -251,19 +238,18 @@ class JavaScriptContentTest extends TextContentTest {
 	}
 
 	public static function provideUpdateRedirect() {
+		// phpcs:disable Generic.Files.LineLength
 		return [
 			[
 				'#REDIRECT [[Someplace]]',
 				'#REDIRECT [[Someplace]]',
 			],
-
-			// @codingStandardsIgnoreStart Generic.Files.LineLength
 			[
 				'/* #REDIRECT */mw.loader.load("//example.org/w/index.php?title=MediaWiki:MonoBook.js\u0026action=raw\u0026ctype=text/javascript");',
 				'/* #REDIRECT */mw.loader.load("//example.org/w/index.php?title=TestUpdateRedirect_target\u0026action=raw\u0026ctype=text/javascript");'
 			]
-			// @codingStandardsIgnoreEnd
 		];
+		// phpcs:enable
 	}
 
 	/**
@@ -313,7 +299,7 @@ class JavaScriptContentTest extends TextContentTest {
 	 * Keep this in sync with JavaScriptContentHandlerTest::provideMakeRedirectContent()
 	 */
 	public static function provideGetRedirectTarget() {
-		// @codingStandardsIgnoreStart Generic.Files.LineLength
+		// phpcs:disable Generic.Files.LineLength
 		return [
 			[
 				'MediaWiki:MonoBook.js',
@@ -338,6 +324,6 @@ class JavaScriptContentTest extends TextContentTest {
 				'/* #REDIRECT */mw.loader.load("//example.com/w/index.php?title=MediaWiki:OtherWiki.js\u0026action=raw\u0026ctype=text/javascript");'
 			],
 		];
-		// @codingStandardsIgnoreEnd
+		// phpcs:enable
 	}
 }