From fab259540f19926c294f5a33a26ce9cb87b54ac0 Mon Sep 17 00:00:00 2001
From: libraryupgrader <tools.libraryupgrader@tools.wmflabs.org>
Date: Sat, 30 Dec 2017 01:21:11 +0000
Subject: [PATCH] build: Updating mediawiki/mediawiki-codesniffer to 15.0.0

The following sniffs are failing and were disabled:
* Generic.Files.OneObjectStructurePerFile.MultipleFound
* Squiz.Scope.MethodScope.Missing

The following sniffs now pass and were enabled:
* MediaWiki.Files.OneClassPerFile.MultipleFound

Change-Id: Ib51d7ec178a897cc62fd4d0143874b7bf8082f92
---
 .phpcs.xml                    | 3 ++-
 MathChemSymbolsDataModule.php | 3 +--
 MathMathSymbolsDataModule.php | 3 +--
 composer.json                 | 4 ++--
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.phpcs.xml b/.phpcs.xml
index 11d3dea..4d2316f 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -1,13 +1,14 @@
 <?xml version="1.0"?>
 <ruleset>
 	<rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
+		<exclude name="Generic.Files.OneObjectStructurePerFile.MultipleFound" />
 		<exclude name="MediaWiki.Commenting.FunctionComment.MissingParamComment" />
 		<exclude name="MediaWiki.Commenting.FunctionComment.WrongStyle" />
 		<exclude name="MediaWiki.Files.ClassMatchesFilename.NotMatch" />
-		<exclude name="MediaWiki.Files.OneClassPerFile.MultipleFound" />
 		<exclude name="MediaWiki.Commenting.FunctionComment.MissingDocumentationProtected" />
 		<exclude name="MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic" />
 		<exclude name="MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment" />
+		<exclude name="Squiz.Scope.MethodScope.Missing" />
 	</rule>
 	<file>.</file>
 	<arg name="extensions" value="php,php5,inc" />
diff --git a/MathChemSymbolsDataModule.php b/MathChemSymbolsDataModule.php
index 2369a29..60735f2 100644
--- a/MathChemSymbolsDataModule.php
+++ b/MathChemSymbolsDataModule.php
@@ -18,8 +18,7 @@ class MathChemSymbolsDataModule extends ResourceLoaderModule {
 	/* Methods */
 
 	public function getScript( ResourceLoaderContext $context ) {
-		return
-			've.ui.MWChemDialog.static.setSymbols(' .
+		return 've.ui.MWChemDialog.static.setSymbols(' .
 				file_get_contents( __DIR__ . '/modules/ve-math/chemSymbols.json' ) .
 			');';
 	}
diff --git a/MathMathSymbolsDataModule.php b/MathMathSymbolsDataModule.php
index 5d8c498..bcb5f3e 100644
--- a/MathMathSymbolsDataModule.php
+++ b/MathMathSymbolsDataModule.php
@@ -18,8 +18,7 @@ class MathMathSymbolsDataModule extends ResourceLoaderModule {
 	/* Methods */
 
 	public function getScript( ResourceLoaderContext $context ) {
-		return
-			've.ui.MWMathDialog.static.setSymbols(' .
+		return 've.ui.MWMathDialog.static.setSymbols(' .
 				file_get_contents( __DIR__ . '/modules/ve-math/mathSymbols.json' ) .
 			');';
 	}
diff --git a/composer.json b/composer.json
index c183256..35cfa63 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
 	"require-dev": {
 		"jakub-onderka/php-parallel-lint": "0.9.2",
-		"mediawiki/mediawiki-codesniffer": "14.1.0",
+		"mediawiki/mediawiki-codesniffer": "15.0.0",
 		"jakub-onderka/php-console-highlighter": "0.3.2",
 		"mediawiki/minus-x": "0.2.1"
 	},
@@ -12,7 +12,7 @@
 			"minus-x check ."
 		],
 		"fix": [
-			"phpcbf -p",
+			"phpcbf",
 			"minus-x fix ."
 		]
 	}