From: Paladox <thomasmulhall410@yahoo.com>
Date: Sat, 21 Oct 2017 02:18:40 +0000 (+0000)
Subject: build: Updating mediawiki/mediawiki-codesniffer to 14.1.0
X-Git-Tag: 1.31.0-rc.0~1703
X-Git-Url: http://git.cyclocoop.org/?a=commitdiff_plain;h=d97455ca21711e8493beada7c533ca73de3d790b;p=lhc%2Fweb%2Fwiklou.git

build: Updating mediawiki/mediawiki-codesniffer to 14.1.0

And moved phpcs.xml to .phpcs.xml (T177256).

Change-Id: Idaa1fe006a528c25ce34abd0a857c657c26e8b0f
---

diff --git a/.phpcs.xml b/.phpcs.xml
new file mode 100644
index 0000000000..3170381fda
--- /dev/null
+++ b/.phpcs.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0"?>
+<ruleset name="MediaWiki">
+	<rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
+		<exclude name="Generic.ControlStructures.InlineControlStructure" />
+		<exclude name="MediaWiki.Commenting.FunctionComment.MissingParamComment" />
+		<exclude name="MediaWiki.Commenting.FunctionComment.MissingDocumentationProtected" />
+		<exclude name="MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic" />
+		<exclude name="MediaWiki.Commenting.FunctionComment.MissingParamTag" />
+		<exclude name="MediaWiki.Commenting.FunctionComment.MissingReturn" />
+		<exclude name="MediaWiki.Commenting.FunctionComment.ParamNameNoMatch" />
+		<exclude name="MediaWiki.Commenting.FunctionComment.ExtraParamComment" />
+		<exclude name="MediaWiki.Commenting.FunctionComment.WrongStyle" />
+		<exclude name="MediaWiki.Commenting.IllegalSingleLineComment.IllegalSingleLineCommentStart" />
+		<exclude name="MediaWiki.Commenting.IllegalSingleLineComment.IllegalSingleLineCommentEnd" />
+		<exclude name="MediaWiki.ControlStructures.AssignmentInControlStructures.AssignmentInControlStructures" />
+		<exclude name="MediaWiki.NamingConventions.LowerCamelFunctionsName.FunctionName" />
+		<exclude name="MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment" />
+		<exclude name="MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.SingleSpaceBeforeSingleLineComment" />
+		<exclude name="MediaWiki.Usage.DbrQueryUsage.DbrQueryFound" />
+		<exclude name="MediaWiki.Usage.ExtendClassUsage.FunctionVarUsage" />
+		<exclude name="MediaWiki.Usage.SuperGlobalsUsage.SuperGlobals" />
+		<exclude name="MediaWiki.Files.ClassMatchesFilename.WrongCase" />
+		<exclude name="MediaWiki.Files.ClassMatchesFilename.NotMatch" />
+		<exclude name="MediaWiki.Files.OneClassPerFile.MultipleFound" />
+		<exclude name="MediaWiki.VariableAnalysis.ForbiddenGlobalVariables.ForbiddenGlobal$wgTitle" />
+		<exclude name="MediaWiki.Usage.DeprecatedConstantUsage.NS_IMAGE" />
+		<exclude name="MediaWiki.Usage.DeprecatedConstantUsage.NS_IMAGE_TALK" />
+		<exclude name="MediaWiki.Commenting.FunctionComment.SpacingDocStar" />
+		<exclude name="MediaWiki.Commenting.FunctionComment.SpacingDocTag" />
+	</rule>
+	<rule ref="MediaWiki.NamingConventions.PrefixedGlobalFunctions">
+		<properties>
+			<!--
+			includes/compat/normal/UtfNormalUtil.php
+			* codepointToUtf8
+			* escapeSingleString
+			* hexSequenceToUtf8
+			* utf8ToCodepoint
+			* utf8ToHexSequence
+			includes/GlobalFunctions.php
+			* mimeTypeMatch
+			maintenance/benchmarks/bench_strtr_str_replace.php
+			* bfNormalizeTitleStrReplace
+			* bfNormalizeTitleStrTr
+			maintenance/cdb.php
+			* cdbShowHelp
+			maintenance/language/transstat.php
+			* showUsage
+			maintenance/mcc.php
+			* mccGetHelp
+			* mccShowUsage
+			maintenance/storage/moveToExternal.php
+			* moveToExternal
+			maintenance/storage/resolveStubs.php
+			* resolveStub
+			* resolveStubs
+			profileinfo.php
+			* compare_point
+			* getEscapedProfileUrl
+			tests/phpunit/includes/HooksTest.php
+			* NothingFunction
+			* NothingFunctionData
+			tests/qunit/data/styleTest.css.php
+			* cssfilter
+			-->
+			<property name="ignoreList" type="array" value="bfNormalizeTitleStrReplace,bfNormalizeTitleStrTr,cdbShowHelp,codepointToUtf8,compare_point,cssfilter,escapeSingleString,getEscapedProfileUrl,hexSequenceToUtf8,mccGetHelp,mccShowUsage,mimeTypeMatch,moveToExternal,NothingFunction,NothingFunctionData,resolveStub,resolveStubs,showUsage,utf8ToCodepoint,utf8ToHexSequence" />
+		</properties>
+	</rule>
+	<rule ref="MediaWiki.NamingConventions.ValidGlobalName">
+		<properties>
+			<property name="ignoreList" type="array" value="$IP,$messageMemc,$parserMemc" />
+		</properties>
+	</rule>
+	<rule ref="Generic.Files.LineLength">
+		<exclude-pattern>*/languages/messages/Messages*.php</exclude-pattern>
+	</rule>
+	<rule ref="PSR2.Methods.MethodDeclaration.Underscore">
+		<exclude-pattern>*/includes/StubObject.php</exclude-pattern>
+	</rule>
+	<file>.</file>
+	<arg name="encoding" value="UTF-8"/>
+	<arg name="extensions" value="php,php5,inc,sample"/>
+	<exclude-pattern type="relative">^extensions/</exclude-pattern>
+	<exclude-pattern type="relative">^skins/</exclude-pattern>
+	<exclude-pattern>AdminSettings\.php</exclude-pattern>
+	<exclude-pattern>LocalSettings\.php</exclude-pattern>
+	<exclude-pattern>StartProfiler\.php</exclude-pattern>
+</ruleset>
diff --git a/composer.json b/composer.json
index 7364506713..a0fe9a2ef8 100644
--- a/composer.json
+++ b/composer.json
@@ -54,7 +54,7 @@
 		"jakub-onderka/php-parallel-lint": "0.9.2",
 		"jetbrains/phpstorm-stubs": "dev-master#1b9906084d6635456fcf3f3a01f0d7d5b99a578a",
 		"justinrainbow/json-schema": "~5.2",
-		"mediawiki/mediawiki-codesniffer": "13.0.0",
+		"mediawiki/mediawiki-codesniffer": "14.1.0",
 		"monolog/monolog": "~1.22.1",
 		"nikic/php-parser": "2.1.0",
 		"nmred/kafka-php": "0.1.5",
diff --git a/includes/widget/search/InterwikiSearchResultSetWidget.php b/includes/widget/search/InterwikiSearchResultSetWidget.php
index 81a1a43111..b4e3414857 100644
--- a/includes/widget/search/InterwikiSearchResultSetWidget.php
+++ b/includes/widget/search/InterwikiSearchResultSetWidget.php
@@ -168,7 +168,7 @@ class InterwikiSearchResultSetWidget implements SearchResultSetWidget {
 	 *
 	 * @param string $iwPrefix Interwiki prefix
 	 * @return OOUI\IconWidget
-	 **/
+	 */
 	protected function iwIcon( $iwPrefix ) {
 		$interwiki = $this->iwLookup->fetch( $iwPrefix );
 		$parsed = wfParseUrl( wfExpandUrl( $interwiki ? $interwiki->getURL() : '/' ) );
diff --git a/maintenance/language/transstat.php b/maintenance/language/transstat.php
index 720295234c..986fa62ba6 100644
--- a/maintenance/language/transstat.php
+++ b/maintenance/language/transstat.php
@@ -42,7 +42,7 @@ if ( !isset( $options['output'] ) ) {
 	$options['output'] = 'wiki';
 }
 
-/** Print a usage message*/
+/** Print a usage message */
 function showUsage() {
 	print <<<TEXT
 Usage: php transstat.php [--help] [--output=csv|text|wiki]
diff --git a/phpcs.xml b/phpcs.xml
deleted file mode 100644
index 4be45b13e7..0000000000
--- a/phpcs.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0"?>
-<ruleset name="MediaWiki">
-	<rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
-		<exclude name="Generic.ControlStructures.InlineControlStructure" />
-		<exclude name="MediaWiki.Commenting.FunctionComment.MissingParamComment" />
-		<exclude name="MediaWiki.Commenting.FunctionComment.MissingDocumentationProtected" />
-		<exclude name="MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic" />
-		<exclude name="MediaWiki.Commenting.FunctionComment.MissingParamTag" />
-		<exclude name="MediaWiki.Commenting.FunctionComment.MissingReturn" />
-		<exclude name="MediaWiki.Commenting.FunctionComment.ParamNameNoMatch" />
-		<exclude name="MediaWiki.Commenting.FunctionComment.ExtraParamComment" />
-		<exclude name="MediaWiki.Commenting.FunctionComment.WrongStyle" />
-		<exclude name="MediaWiki.Commenting.IllegalSingleLineComment.IllegalSingleLineCommentStart" />
-		<exclude name="MediaWiki.Commenting.IllegalSingleLineComment.IllegalSingleLineCommentEnd" />
-		<exclude name="MediaWiki.ControlStructures.AssignmentInControlStructures.AssignmentInControlStructures" />
-		<exclude name="MediaWiki.NamingConventions.LowerCamelFunctionsName.FunctionName" />
-		<exclude name="MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment" />
-		<exclude name="MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.SingleSpaceBeforeSingleLineComment" />
-		<exclude name="MediaWiki.Usage.DbrQueryUsage.DbrQueryFound" />
-		<exclude name="MediaWiki.Usage.ExtendClassUsage.FunctionVarUsage" />
-		<exclude name="MediaWiki.Usage.SuperGlobalsUsage.SuperGlobals" />
-		<exclude name="MediaWiki.Files.ClassMatchesFilename.WrongCase" />
-		<exclude name="MediaWiki.Files.ClassMatchesFilename.NotMatch" />
-		<exclude name="MediaWiki.Files.OneClassPerFile.MultipleFound" />
-		<exclude name="MediaWiki.VariableAnalysis.ForbiddenGlobalVariables.ForbiddenGlobal$wgTitle" />
-		<exclude name="MediaWiki.Usage.DeprecatedConstantUsage.NS_IMAGE" />
-		<exclude name="MediaWiki.Usage.DeprecatedConstantUsage.NS_IMAGE_TALK" />
-	</rule>
-	<rule ref="MediaWiki.NamingConventions.PrefixedGlobalFunctions">
-		<properties>
-			<!--
-			includes/compat/normal/UtfNormalUtil.php
-			* codepointToUtf8
-			* escapeSingleString
-			* hexSequenceToUtf8
-			* utf8ToCodepoint
-			* utf8ToHexSequence
-			includes/GlobalFunctions.php
-			* mimeTypeMatch
-			maintenance/benchmarks/bench_strtr_str_replace.php
-			* bfNormalizeTitleStrReplace
-			* bfNormalizeTitleStrTr
-			maintenance/cdb.php
-			* cdbShowHelp
-			maintenance/language/transstat.php
-			* showUsage
-			maintenance/mcc.php
-			* mccGetHelp
-			* mccShowUsage
-			maintenance/storage/moveToExternal.php
-			* moveToExternal
-			maintenance/storage/resolveStubs.php
-			* resolveStub
-			* resolveStubs
-			profileinfo.php
-			* compare_point
-			* getEscapedProfileUrl
-			tests/phpunit/includes/HooksTest.php
-			* NothingFunction
-			* NothingFunctionData
-			tests/qunit/data/styleTest.css.php
-			* cssfilter
-			-->
-			<property name="ignoreList" type="array" value="bfNormalizeTitleStrReplace,bfNormalizeTitleStrTr,cdbShowHelp,codepointToUtf8,compare_point,cssfilter,escapeSingleString,getEscapedProfileUrl,hexSequenceToUtf8,mccGetHelp,mccShowUsage,mimeTypeMatch,moveToExternal,NothingFunction,NothingFunctionData,resolveStub,resolveStubs,showUsage,utf8ToCodepoint,utf8ToHexSequence" />
-		</properties>
-	</rule>
-	<rule ref="MediaWiki.NamingConventions.ValidGlobalName">
-		<properties>
-			<property name="ignoreList" type="array" value="$IP,$messageMemc,$parserMemc" />
-		</properties>
-	</rule>
-	<rule ref="Generic.Files.LineLength">
-		<exclude-pattern>*/languages/messages/Messages*.php</exclude-pattern>
-	</rule>
-	<rule ref="PSR2.Methods.MethodDeclaration.Underscore">
-		<exclude-pattern>*/includes/StubObject.php</exclude-pattern>
-	</rule>
-	<file>.</file>
-	<arg name="encoding" value="UTF-8"/>
-	<arg name="extensions" value="php,php5,inc,sample"/>
-	<exclude-pattern type="relative">^extensions/</exclude-pattern>
-	<exclude-pattern type="relative">^skins/</exclude-pattern>
-	<exclude-pattern>AdminSettings\.php</exclude-pattern>
-	<exclude-pattern>LocalSettings\.php</exclude-pattern>
-	<exclude-pattern>StartProfiler\.php</exclude-pattern>
-</ruleset>