From a131b2a47bd50c32bafdac618f071464f24025cd Mon Sep 17 00:00:00 2001
From: libraryupgrader <tools.libraryupgrader@tools.wmflabs.org>
Date: Thu, 29 Oct 2020 09:17:27 +0000
Subject: [PATCH] build: Updating mediawiki/mediawiki-codesniffer to 32.0.0

The following sniffs are failing and were disabled:
* MediaWiki.Usage.ExtendClassUsage.FunctionConfigUsage

Additional changes:
* Dropped .php5 and .inc files from .phpcs.xml (T200956).
* Added the `wikimedia/mediawiki` profile in .eslintrc.json (T262222).
* Removed global `mw`, included via `wikimedia/mediawiki` profile (T262222).
* Dropped the emtpy global definition in .eslintrc.json.

Change-Id: I9a87a358cb5336c9d18261985209c1f845337160
---
 .eslintrc.json | 8 +++-----
 .phpcs.xml     | 3 ++-
 composer.json  | 2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index 2c3c2d3..c498c3d 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -2,9 +2,7 @@
 	"root": true,
 	"extends": [
 		"wikimedia/client",
-		"wikimedia/jquery"
-	],
-	"globals": {
-		"mw": false
-	}
+		"wikimedia/jquery",
+		"wikimedia/mediawiki"
+	]
 }
diff --git a/.phpcs.xml b/.phpcs.xml
index a21944f..bea60bd 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -2,11 +2,12 @@
 <ruleset>
 	<rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
 		<exclude name="MediaWiki.Files.ClassMatchesFilename.NotMatch" />
+		<exclude name="MediaWiki.Usage.ExtendClassUsage.FunctionConfigUsage" />
 		<exclude name="MediaWiki.Commenting.FunctionComment.MissingDocumentationProtected" />
 		<exclude name="MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic" />
 		<exclude name="Squiz.Scope.MethodScope.Missing" />
 	</rule>
 	<file>.</file>
-	<arg name="extensions" value="php,php5,inc" />
+	<arg name="extensions" value="php" />
 	<arg name="encoding" value="UTF-8" />
 </ruleset>
diff --git a/composer.json b/composer.json
index cd336a8..7d46199 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,6 @@
 {
 	"require-dev": {
-		"mediawiki/mediawiki-codesniffer": "31.0.0",
+		"mediawiki/mediawiki-codesniffer": "32.0.0",
 		"mediawiki/minus-x": "1.1.0",
 		"php-parallel-lint/php-console-highlighter": "0.5.0",
 		"php-parallel-lint/php-parallel-lint": "1.2.0"