From: Reedy <reedy@wikimedia.org>
Date: Wed, 15 Nov 2017 03:37:27 +0000 (+0000)
Subject: Fix phpcs issues from LanguageConverter patches
X-Git-Tag: 1.31.0-rc.0~1505
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=f600b4ede9a6390cc5e929d2a48ed98af2edbc60;hp=f21f3942eb10d7e688eb25261ac3a9478268cbd3

Fix phpcs issues from LanguageConverter patches

Change-Id: I34e57c90ffd40fbd9f8afe3c57dd73fa7f655841
---

diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index f9610fa93c..8e98abd618 100644
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -412,11 +412,11 @@ class LanguageConverter {
 				$log = LoggerFactory::getInstance( 'languageconverter' );
 				$log->error( "Hit pcre.backtrack_limit in " . __METHOD__
 					. ". Disabling language conversion for this page.",
-					array(
+					[
 						"method" => __METHOD__,
 						"variant" => $toVariant,
 						"startOfText" => substr( $text, 0, 500 )
-					)
+					]
 				);
 				return $text;
 			}
@@ -665,7 +665,9 @@ class LanguageConverter {
 
 		$noScript = '<script.*?>.*?<\/script>(*SKIP)(*FAIL)';
 		$noStyle = '<style.*?>.*?<\/style>(*SKIP)(*FAIL)';
+		// @codingStandardsIgnoreStart Generic.Files.LineLength.TooLong
 		$noHtml = '<(?:[^>=]*+(?>[^>=]*+=\s*+(?:"[^"]*"|\'[^\']*\'|[^\'">\s]*+))*+[^>=]*+>|.*+)(*SKIP)(*FAIL)';
+		// @codingStandardsIgnoreEnd
 		while ( $startPos < $length && $continue ) {
 			$continue = preg_match(
 				// Only match -{ outside of html.
diff --git a/tests/phpunit/languages/LanguageConverterTest.php b/tests/phpunit/languages/LanguageConverterTest.php
index 331368ec29..fc2ed33b65 100644
--- a/tests/phpunit/languages/LanguageConverterTest.php
+++ b/tests/phpunit/languages/LanguageConverterTest.php
@@ -167,7 +167,7 @@ class LanguageConverterTest extends MediaWikiLangTestCase {
 			$testString .= 'xxx xxx xxx';
 		}
 		$testString .= "\n<big id='в'></big>";
-		$old = ini_set('pcre.backtrack_limit', 200 );
+		$old = ini_set( 'pcre.backtrack_limit', 200 );
 		$result = $this->lc->autoConvert( $testString, 'tg-latn' );
 		ini_set( 'pcre.backtrack_limit', $old );
 		// The в in the id attribute should not get converted to a v