From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Tue, 23 Aug 2016 21:33:56 +0000 (+0000)
Subject: Merge "Upgrade justinrainbow/json-schema to ~3.0"
X-Git-Tag: 1.31.0-rc.0~5925
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_aide%28?a=commitdiff_plain;h=2a26e0de27ca0b4bf2538bfa91327f1236553ee5;p=lhc%2Fweb%2Fwiklou.git

Merge "Upgrade justinrainbow/json-schema to ~3.0"
---

2a26e0de27ca0b4bf2538bfa91327f1236553ee5
diff --cc composer.json
index 956739dfc4,c8ed37e997..2243b7cadf
--- a/composer.json
+++ b/composer.json
@@@ -45,10 -45,10 +45,10 @@@
  	},
  	"require-dev": {
  		"jakub-onderka/php-parallel-lint": "0.9.2",
- 		"justinrainbow/json-schema": "~1.6",
+ 		"justinrainbow/json-schema": "~3.0",
  		"mediawiki/mediawiki-codesniffer": "0.7.2",
  		"monolog/monolog": "~1.18.2",
 -		"nikic/php-parser": "1.4.1",
 +		"nikic/php-parser": "2.1.0",
  		"nmred/kafka-php": "0.1.5",
  		"phpunit/phpunit": "4.8.24",
  		"wikimedia/avro": "1.7.7"