From 62d8ae19d330342e607602867eedf6655628dece Mon Sep 17 00:00:00 2001
From: Umherirrender <umherirrender_de.wp@web.de>
Date: Tue, 13 Jun 2017 12:20:31 +0200
Subject: [PATCH] Update mediawiki/codesniffer to 0.7.2

Short array syntax will be used in follow ups
to keep this patch set small


Change-Id: Ibfb09fb93a827d2c23060e79d287c963fe149770
---
 SyntaxHighlight.ace.php | 6 +++---
 composer.json           | 4 ++--
 phpcs.xml               | 7 +++++--
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/SyntaxHighlight.ace.php b/SyntaxHighlight.ace.php
index d01ca1ba..712153df 100644
--- a/SyntaxHighlight.ace.php
+++ b/SyntaxHighlight.ace.php
@@ -27,7 +27,7 @@ class SyntaxHighlightAce
 		'ABC'          => [],
 		'ActionScript' => [ 'actionscript', 'actionscript3' ],
 		'ADA'          => [ 'ada', 'ada2005', 'ada95' ],
-		'Apache_Conf'  => [ 'apache', 'apacheconf', 'aconf'],
+		'Apache_Conf'  => [ 'apache', 'apacheconf', 'aconf' ],
 		'AsciiDoc'     => [],
 		'Assembly_x86' => [ 'nasm' ],
 		'AutoHotKey'   => [ 'autohotkey', 'ah' ],
@@ -45,7 +45,7 @@ class SyntaxHighlightAce
 		'D'            => [ 'd' ],
 		'Dart'         => [ 'dart' ],
 		'Diff'         => [ 'diff', 'udiff' ],
-		'Django'       => [ 'django', 'html+django', 'html+jinja', 'htmldjango'],
+		'Django'       => [ 'django', 'html+django', 'html+jinja', 'htmldjango' ],
 		'Dockerfile'   => [ 'Dockerfile', 'docker' ],
 		'Dot'          => [],
 		'Dummy'        => [],
@@ -111,7 +111,7 @@ class SyntaxHighlightAce
 		'Perl'         => [ 'perl', 'pl', 'perl6', 'pl6' ],
 		'pgSQL'        => [ 'postgresql', 'postgres' ],
 		'PHP'          => [ 'php', 'php3', 'php4', 'php5', 'html+php' ],
-		'Powershell'   => [ 'powershell', 'posh', 'ps1', 'psm1'],
+		'Powershell'   => [ 'powershell', 'posh', 'ps1', 'psm1' ],
 		'Praat'        => [ 'praat' ],
 		'Prolog'       => [ 'prolog' ],
 		'Properties'   => [ 'properties', 'jproperties' ],
diff --git a/composer.json b/composer.json
index bc3fc910..a708409d 100644
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,7 @@
 	},
 	"require-dev": {
 		"jakub-onderka/php-parallel-lint": "0.9.2",
-		"mediawiki/mediawiki-codesniffer": "0.5.1",
+		"mediawiki/mediawiki-codesniffer": "0.7.2",
 		"jakub-onderka/php-console-highlighter": "0.3.2"
 	},
 	"license": "GPL-2.0+",
@@ -34,7 +34,7 @@
 	"scripts": {
 		"fix": "phpcbf",
 		"test": [
-			"parallel-lint . --exclude vendor",
+			"parallel-lint . --exclude vendor --exclude node_modules",
 			"phpcs -p -s"
 		]
 	}
diff --git a/phpcs.xml b/phpcs.xml
index d81a2927..74319c52 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0"?>
 <ruleset>
-	<rule ref="vendor/mediawiki/mediawiki-codesniffer/MediaWiki"/>
+	<rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
+		<exclude name="Generic.Arrays.DisallowLongArraySyntax.Found"/>
+	</rule>
 	<file>.</file>
 	<arg name="extensions" value="php,php5,inc"/>
-	<arg name="encoding" value="utf8"/>
+	<arg name="encoding" value="UTF-8"/>
 	<exclude-pattern>vendor</exclude-pattern>
+	<exclude-pattern>node_modules</exclude-pattern>
 </ruleset>