X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=composer.json;h=9222aa4d356cd0ce46f56ec955fa89a2b94a89c2;hp=2f6cc424676b474daa19c2adbc0bd463a2cc990a;hb=519f901c2fb3e6a625b840daab7220212d0866da;hpb=dfebe411507425b6756da4f0b715b60bb1a8039e

diff --git a/composer.json b/composer.json
index 2f6cc42467..9222aa4d35 100644
--- a/composer.json
+++ b/composer.json
@@ -25,14 +25,14 @@
 		"psr/log": "1.0.0",
 		"wikimedia/cdb": "1.0.1",
 		"wikimedia/assert": "0.2.2",
-		"wikimedia/composer-merge-plugin": "1.0.0",
+		"wikimedia/composer-merge-plugin": "1.1.0",
 		"wikimedia/utfnormal": "1.0.2",
 		"zordius/lightncandy": "0.21"
 	},
 	"require-dev": {
 		"jakub-onderka/php-parallel-lint": "~0.8",
 		"justinrainbow/json-schema": "~1.3",
-		"phpunit/phpunit": "~4.5",
+		"phpunit/phpunit": "3.7.37",
 		"mediawiki/mediawiki-codesniffer": "0.1.0"
 	},
 	"suggest": {
@@ -50,7 +50,7 @@
 	},
 	"scripts": {
 		"lint": "parallel-lint --exclude vendor",
-		"phpcs": "phpcs $PHPCS_ARGS -s --standard=vendor/mediawiki/mediawiki-codesniffer/MediaWiki --ignore=vendor --encoding=utf-8 --extensions=php,php5,inc,sample",
+		"phpcs": "phpcs $PHPCS_ARGS -s --standard=vendor/mediawiki/mediawiki-codesniffer/MediaWiki --ignore=vendor,node_modules --encoding=utf-8 --extensions=php,php5,inc,sample",
 		"test": [
 			"composer lint",
 			"composer phpcs"