From 749e94def536d2fb8bf9e77ce873cad2980f9cc8 Mon Sep 17 00:00:00 2001
From: libraryupgrader <tools.libraryupgrader@tools.wmflabs.org>
Date: Wed, 4 Nov 2020 10:10:26 +0000
Subject: [PATCH] build: Updating mediawiki/mediawiki-codesniffer to 33.0.0

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

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

diff --git a/.eslintrc.json b/.eslintrc.json
index 1a49e0a..14ba6ed 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -1,11 +1,11 @@
 {
 	"root": true,
-	"extends": "wikimedia",
+	"extends": [
+		"wikimedia",
+		"wikimedia/mediawiki",
+		"wikimedia/jquery"
+	],
 	"env": {
 		"browser": true
-	},
-	"globals": {
-		"mw": false,
-		"$": false
 	}
 }
diff --git a/.phpcs.xml b/.phpcs.xml
index 03ebb1c..9d79e19 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -2,7 +2,7 @@
 <ruleset>
 	<rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki" />
 	<file>.</file>
-	<arg name="extensions" value="php,inc" />
+	<arg name="extensions" value="php" />
 	<arg name="encoding" value="UTF-8" />
 	<exclude-pattern>domains\.php</exclude-pattern>
 	<exclude-pattern>vendor</exclude-pattern>
diff --git a/composer.json b/composer.json
index aa4eb67..f1926c4 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,6 @@
 {
 	"require-dev": {
-		"mediawiki/mediawiki-codesniffer": "31.0.0",
+		"mediawiki/mediawiki-codesniffer": "33.0.0",
 		"mediawiki/mediawiki-phan-config": "0.10.3",
 		"mediawiki/minus-x": "1.1.0",
 		"php-parallel-lint/php-console-highlighter": "0.5.0",