From: James D. Forrester <jforrester@wikimedia.org>
Date: Sat, 2 Jun 2018 22:38:38 +0000 (-0700)
Subject: build: Updating mediawiki/mediawiki-codesniffer to 20.0.0
X-Git-Tag: 1.34.0-rc.0~5202^2
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/operations/?a=commitdiff_plain;h=4d5b2473a41208816001c6d20fa5c093e9d7615b;p=lhc%2Fweb%2Fwiklou.git

build: Updating mediawiki/mediawiki-codesniffer to 20.0.0

Disable MediaWiki.Commenting.FunctionComment.DefaultNullTypeParam and
MediaWiki.Commenting.PhpunitAnnotations.NotClassTrait for now, and
whitelist all failing files MediaWiki.Usage.ForbiddenFunctions.*.

Change-Id: Ib55ba3a70a1f922662c94895ab59eb02830faf3e
---

diff --git a/.phpcs.xml b/.phpcs.xml
index 7d8bec6440..e15eca089e 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -7,7 +7,9 @@
 		<exclude name="MediaWiki.Commenting.FunctionComment.MissingParamTag" />
 		<exclude name="MediaWiki.Commenting.FunctionComment.MissingReturn" />
 		<exclude name="MediaWiki.Commenting.FunctionComment.ExtraParamComment" />
+		<exclude name="MediaWiki.Commenting.FunctionComment.DefaultNullTypeParam" />
 		<exclude name="MediaWiki.Commenting.FunctionComment.WrongStyle" />
+		<exclude name="MediaWiki.Commenting.PhpunitAnnotations.NotClassTrait" />
 		<exclude name="MediaWiki.Commenting.IllegalSingleLineComment.IllegalSingleLineCommentStart" />
 		<exclude name="MediaWiki.Commenting.IllegalSingleLineComment.IllegalSingleLineCommentEnd" />
 		<exclude name="MediaWiki.ControlStructures.AssignmentInControlStructures.AssignmentInControlStructures" />
@@ -284,6 +286,62 @@
 	<rule ref="MediaWiki.Usage.AssignmentInReturn.AssignmentInReturn">
 		<exclude-pattern>*/tests/phpunit/*\.php</exclude-pattern>
 	</rule>
+	<rule ref="MediaWiki.Usage.ForbiddenFunctions.escapeshellarg">
+		<!--
+			Whitelist existing violations, but enable the sniff to prevent
+			any new occurrences.
+		-->
+		<exclude-pattern>*/includes/libs/filebackend/FSFileBackend\.php</exclude-pattern>
+		<exclude-pattern>*/includes/shell/Command\.php</exclude-pattern>
+		<exclude-pattern>*/includes/shell/Shell\.php</exclude-pattern>
+		<exclude-pattern>*/tests/phpunit/structure/StructureTest\.php</exclude-pattern>
+	</rule>
+	<rule ref="MediaWiki.Usage.ForbiddenFunctions.exec">
+		<!--
+			Whitelist existing violations, but enable the sniff to prevent
+			any new occurrences.
+		-->
+		<exclude-pattern>*/tests/phpunit/structure/StructureTest\.php</exclude-pattern>
+	</rule>
+	<rule ref="MediaWiki.Usage.ForbiddenFunctions.popen">
+		<!--
+			Whitelist existing violations, but enable the sniff to prevent
+			any new occurrences.
+		-->
+		<exclude-pattern>*/includes/GlobalFunctions\.php</exclude-pattern>
+		<exclude-pattern>*/includes/libs/filebackend/FSFileBackend\.php</exclude-pattern>
+		<exclude-pattern>*/maintenance/7zip\.inc</exclude-pattern>
+		<exclude-pattern>*/maintenance/populateImageSha1\.php</exclude-pattern>
+	</rule>
+	<rule ref="MediaWiki.Usage.ForbiddenFunctions.proc_open">
+		<!--
+			Whitelist existing violations, but enable the sniff to prevent
+			any new occurrences.
+		-->
+		<exclude-pattern>includes/export/DumpPipeOutput\.php</exclude-pattern>
+		<exclude-pattern>includes/resourceloader/ResourceLoaderImage\.php</exclude-pattern>
+		<exclude-pattern>includes/shell/Command\.php</exclude-pattern>
+		<exclude-pattern>includes/tidy/RaggettExternal\.php</exclude-pattern>
+		<exclude-pattern>maintenance/dumpTextPass\.php</exclude-pattern>
+		<exclude-pattern>maintenance/mysql\.php</exclude-pattern>
+		<exclude-pattern>maintenance/storage/recompressTracked\.php</exclude-pattern>
+		<exclude-pattern>tests/parser/editTests\.php</exclude-pattern>
+	</rule>
+	<rule ref="MediaWiki.Usage.ForbiddenFunctions.shell_exec">
+		<!--
+			Whitelist existing violations, but enable the sniff to prevent
+			any new occurrences.
+		-->
+		<exclude-pattern>*/maintenance/mwdocgen\.php</exclude-pattern>
+		<exclude-pattern>*/maintenance/updateCredits\.php</exclude-pattern>
+	</rule>
+	<rule ref="MediaWiki.Usage.ForbiddenFunctions.system">
+		<!--
+			Whitelist existing violations, but enable the sniff to prevent
+			any new occurrences.
+		-->
+		<exclude-pattern>*/maintenance/mwdocgen\.php</exclude-pattern>
+	</rule>
 	<file>.</file>
 	<arg name="encoding" value="UTF-8"/>
 	<arg name="extensions" value="php,php5,inc,sample"/>
diff --git a/composer.json b/composer.json
index 3ed41cf6a6..669007cdb4 100644
--- a/composer.json
+++ b/composer.json
@@ -60,7 +60,7 @@
 		"jakub-onderka/php-parallel-lint": "0.9.2",
 		"jetbrains/phpstorm-stubs": "dev-master#1b9906084d6635456fcf3f3a01f0d7d5b99a578a",
 		"justinrainbow/json-schema": "~5.2",
-		"mediawiki/mediawiki-codesniffer": "18.0.0",
+		"mediawiki/mediawiki-codesniffer": "20.0.0",
 		"monolog/monolog": "~1.22.1",
 		"nikic/php-parser": "3.1.3",
 		"nmred/kafka-php": "0.1.5",