From 7d73fe42f2d225461305beeb8fd05796d9b16fa2 Mon Sep 17 00:00:00 2001
From: libraryupgrader <tools.libraryupgrader@tools.wmflabs.org>
Date: Wed, 4 Nov 2020 03:44:27 +0000
Subject: [PATCH] build: Updating mediawiki/mediawiki-codesniffer to 33.0.0

The following sniffs are failing and were disabled:
* MediaWiki.Commenting.FunctionComment.ObjectTypeHintParam
* MediaWiki.Commenting.PropertyDocumentation.MissingDocumentationPrivate

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

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

diff --git a/.eslintrc.json b/.eslintrc.json
index c47c6ae..c498c3d 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -2,10 +2,7 @@
 	"root": true,
 	"extends": [
 		"wikimedia/client",
-		"wikimedia/jquery"
-	],
-	"globals": {
-		"mw": false,
-		"OO": false
-	}
+		"wikimedia/jquery",
+		"wikimedia/mediawiki"
+	]
 }
diff --git a/.phpcs.xml b/.phpcs.xml
index 5b7a568..eaa0e73 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0"?>
 <ruleset>
-	<rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki" />
+	<rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
+		<exclude name="MediaWiki.Commenting.FunctionComment.ObjectTypeHintParam" />
+		<exclude name="MediaWiki.Commenting.PropertyDocumentation.MissingDocumentationPrivate" />
+	</rule>
 	<file>.</file>
-	<arg name="extensions" value="php,inc" />
+	<arg name="extensions" value="php" />
 	<arg name="encoding" value="UTF-8" />
 </ruleset>
diff --git a/composer.json b/composer.json
index 2da1a1f..f0168a0 100644
--- a/composer.json
+++ b/composer.json
@@ -5,7 +5,7 @@
 	"type": "mediawiki-extension",
 	"description": "MediaWiki extension to notify users if someone tries to login to their account",
 	"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",