From d97455ca21711e8493beada7c533ca73de3d790b Mon Sep 17 00:00:00 2001
From: Paladox <thomasmulhall410@yahoo.com>
Date: Sat, 21 Oct 2017 02:18:40 +0000
Subject: [PATCH] build: Updating mediawiki/mediawiki-codesniffer to 14.1.0

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

Change-Id: Idaa1fe006a528c25ce34abd0a857c657c26e8b0f
---
 phpcs.xml => .phpcs.xml                                   | 2 ++
 composer.json                                             | 2 +-
 includes/widget/search/InterwikiSearchResultSetWidget.php | 2 +-
 maintenance/language/transstat.php                        | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)
 rename phpcs.xml => .phpcs.xml (96%)

diff --git a/phpcs.xml b/.phpcs.xml
similarity index 96%
rename from phpcs.xml
rename to .phpcs.xml
index 4be45b13e7..3170381fda 100644
--- a/phpcs.xml
+++ b/.phpcs.xml
@@ -25,6 +25,8 @@
 		<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>
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]
-- 
2.20.1