From f97802e4e2965c23f489e4cb281eefb445292b63 Mon Sep 17 00:00:00 2001
From: libraryupgrader <tools.libraryupgrader@tools.wmflabs.org>
Date: Sat, 14 Apr 2018 07:39:31 +0000
Subject: [PATCH] build: Updating mediawiki/mediawiki-codesniffer to 18.0.0

The following sniffs are failing and were disabled:
* MediaWiki.VariableAnalysis.UnusedGlobalVariables.UnusedGlobal$wgWBClientSettings

Change-Id: Ia5423c3d7ea419b3f073f35736de7a9379d4429a
---
 .phpcs.xml                           | 1 +
 UniversalLanguageSelector.hooks.php  | 2 +-
 api/ApiLanguageSearch.php            | 2 +-
 api/ApiULSLocalization.php           | 2 +-
 composer.json                        | 2 +-
 data/LanguageNameIndexer.php         | 2 +-
 data/LanguageNameSearch.php          | 2 +-
 includes/ResourceLoaderULSModule.php | 2 +-
 includes/ULSJsonMessageLoader.php    | 2 +-
 tests/phpunit/LanguageSearchTest.php | 2 +-
 10 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/.phpcs.xml b/.phpcs.xml
index c78cd9ff..541fb4d1 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -2,6 +2,7 @@
 <ruleset>
 	<rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
 		<exclude name="MediaWiki.Files.ClassMatchesFilename.NotMatch" />
+		<exclude name="MediaWiki.VariableAnalysis.UnusedGlobalVariables.UnusedGlobal$wgWBClientSettings" />
 		<exclude name="MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic" />
 		<exclude name="MediaWiki.Commenting.LicenseComment.InvalidLicenseTag" />
 	</rule>
diff --git a/UniversalLanguageSelector.hooks.php b/UniversalLanguageSelector.hooks.php
index 6bdc9450..ed2f38ca 100644
--- a/UniversalLanguageSelector.hooks.php
+++ b/UniversalLanguageSelector.hooks.php
@@ -14,7 +14,7 @@
  *
  * @file
  * @ingroup Extensions
- * @license GNU General Public Licence 2.0 or later
+ * @license GPL-2.0-or-later
  * @license MIT License
  */
 
diff --git a/api/ApiLanguageSearch.php b/api/ApiLanguageSearch.php
index 7f5374f2..acd2f226 100644
--- a/api/ApiLanguageSearch.php
+++ b/api/ApiLanguageSearch.php
@@ -14,7 +14,7 @@
  *
  * @file
  * @ingroup Extensions
- * @license GNU General Public Licence 2.0 or later
+ * @license GPL-2.0-or-later
  * @license MIT License
  */
 
diff --git a/api/ApiULSLocalization.php b/api/ApiULSLocalization.php
index 674aa283..8fe16857 100644
--- a/api/ApiULSLocalization.php
+++ b/api/ApiULSLocalization.php
@@ -14,7 +14,7 @@
  *
  * @file
  * @ingroup Extensions
- * @license GNU General Public Licence 2.0 or later
+ * @license GPL-2.0-or-later
  * @license MIT License
  */
 
diff --git a/composer.json b/composer.json
index 69436166..5b2b9b64 100644
--- a/composer.json
+++ b/composer.json
@@ -26,7 +26,7 @@
 	},
 	"require-dev": {
 		"jakub-onderka/php-parallel-lint": "1.0.0",
-		"mediawiki/mediawiki-codesniffer": "17.0.0",
+		"mediawiki/mediawiki-codesniffer": "18.0.0",
 		"jakub-onderka/php-console-highlighter": "0.3.2",
 		"mediawiki/minus-x": "0.3.1"
 	},
diff --git a/data/LanguageNameIndexer.php b/data/LanguageNameIndexer.php
index e852ccf2..19b2e11a 100644
--- a/data/LanguageNameIndexer.php
+++ b/data/LanguageNameIndexer.php
@@ -14,7 +14,7 @@
  *
  * @file
  * @ingroup Extensions
- * @license GNU General Public Licence 2.0 or later
+ * @license GPL-2.0-or-later
  * @license MIT License
  */
 
diff --git a/data/LanguageNameSearch.php b/data/LanguageNameSearch.php
index f4510971..97d6b476 100644
--- a/data/LanguageNameSearch.php
+++ b/data/LanguageNameSearch.php
@@ -14,7 +14,7 @@
  *
  * @file
  * @ingroup Extensions
- * @license GNU General Public Licence 2.0 or later
+ * @license GPL-2.0-or-later
  * @license MIT License
  */
 class LanguageNameSearch {
diff --git a/includes/ResourceLoaderULSModule.php b/includes/ResourceLoaderULSModule.php
index 1bd2b4dc..b51fe07e 100644
--- a/includes/ResourceLoaderULSModule.php
+++ b/includes/ResourceLoaderULSModule.php
@@ -15,7 +15,7 @@
  * @file
  * @author Niklas Laxström
  * @ingroup Extensions
- * @license GNU General Public Licence 2.0 or later
+ * @license GPL-2.0-or-later
  * @license MIT License
  */
 
diff --git a/includes/ULSJsonMessageLoader.php b/includes/ULSJsonMessageLoader.php
index 3d99ce52..18db38fb 100644
--- a/includes/ULSJsonMessageLoader.php
+++ b/includes/ULSJsonMessageLoader.php
@@ -14,7 +14,7 @@
  *
  * @file
  * @ingroup Extensions
- * @license GNU General Public Licence 2.0 or later
+ * @license GPL-2.0-or-later
  * @license MIT License
  * @since 2013.11
  */
diff --git a/tests/phpunit/LanguageSearchTest.php b/tests/phpunit/LanguageSearchTest.php
index 2884224e..928ae24e 100644
--- a/tests/phpunit/LanguageSearchTest.php
+++ b/tests/phpunit/LanguageSearchTest.php
@@ -14,7 +14,7 @@
  *
  * @file
  * @ingroup Extensions
- * @license GNU General Public Licence 2.0 or later
+ * @license GPL-2.0-or-later
  * @license MIT License
  */