From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Sat, 2 Jan 2016 10:21:08 +0000 (+0000)
Subject: Merge "build: Update mediawiki/mediawiki-codesniffer to 0.5.1"
X-Git-Tag: 1.31.0-rc.0~8493
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22brouteur%22%2C%28%24id_rubrique%20?a=commitdiff_plain;h=d6668812dc888e84aa54024558ecaf1cc95ee340;p=lhc%2Fweb%2Fwiklou.git

Merge "build: Update mediawiki/mediawiki-codesniffer to 0.5.1"
---

d6668812dc888e84aa54024558ecaf1cc95ee340
diff --cc composer.json
index fd23f1a0fe,210c23e27c..1ec6f6cf6b
--- a/composer.json
+++ b/composer.json
@@@ -40,10 -40,10 +40,10 @@@
  	"require-dev": {
  		"jakub-onderka/php-parallel-lint": "0.9",
  		"justinrainbow/json-schema": "~1.3",
- 		"mediawiki/mediawiki-codesniffer": "0.4.0",
+ 		"mediawiki/mediawiki-codesniffer": "0.5.1",
  		"monolog/monolog": "~1.17.2",
  		"nikic/php-parser": "1.4.1",
 -		"nmred/kafka-php": "0.1.4",
 +		"nmred/kafka-php": "0.1.5",
  		"phpunit/phpunit": "3.7.37",
  		"wikimedia/avro": "1.7.7"
  	},