From 4790cb9dae23ebb6e7b2b27a5b60c48d01dc2eef Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <siebrand@kitano.nl>
Date: Tue, 29 Sep 2015 00:25:03 +0200
Subject: [PATCH] Update mediawiki-codesniffer and parallel-lint settings

Change-Id: Id6aabab5599ee9e402bff00458afae91eb11c3e7
---
 composer.json | 4 ++--
 phpcs.xml     | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/composer.json b/composer.json
index df11b180..9efb27a7 100644
--- a/composer.json
+++ b/composer.json
@@ -22,8 +22,8 @@
 		"mediawiki/cldr": "Language names in all languages"
 	},
 	"require-dev": {
-		"jakub-onderka/php-parallel-lint": "0.9.*",
-		"mediawiki/mediawiki-codesniffer": "0.3.0"
+		"jakub-onderka/php-parallel-lint": "0.9",
+		"mediawiki/mediawiki-codesniffer": "0.4.0"
 	},
 	"scripts": {
 		"test": [
diff --git a/phpcs.xml b/phpcs.xml
index cb19440e..d81a2927 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -2,6 +2,7 @@
 <ruleset>
 	<rule ref="vendor/mediawiki/mediawiki-codesniffer/MediaWiki"/>
 	<file>.</file>
-	<arg name="extensions" value="php"/>
+	<arg name="extensions" value="php,php5,inc"/>
+	<arg name="encoding" value="utf8"/>
 	<exclude-pattern>vendor</exclude-pattern>
 </ruleset>