X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22articles_versions%22%2C%22id_article=%24id_article%22%29%20.%20%22?a=blobdiff_plain;f=composer.json;h=fda64fdb631cee9e4e53252b500fa043a5bc4d8c;hb=536a06e64303f1cc8f44b197d8dc7423cda959a6;hp=929b3e50b6b16fc294287eab03df8e0a9a60f32a;hpb=dfbbf90b249a3d80ff91a2b52d002812e42991a1;p=lhc%2Fweb%2Fwiklou.git

diff --git a/composer.json b/composer.json
index 929b3e50b6..fda64fdb63 100644
--- a/composer.json
+++ b/composer.json
@@ -21,12 +21,12 @@
 		"leafo/lessphp": "0.5.0",
 		"liuggio/statsd-php-client": "1.0.12",
 		"mediawiki/at-ease": "1.0.0",
-		"oojs/oojs-ui": "0.11.7",
+		"oojs/oojs-ui": "0.11.8",
 		"php": ">=5.3.3",
 		"psr/log": "1.0.0",
 		"wikimedia/cdb": "1.0.1",
 		"wikimedia/assert": "0.2.2",
-		"wikimedia/composer-merge-plugin": "1.2.0",
+		"wikimedia/composer-merge-plugin": "1.2.1",
 		"wikimedia/utfnormal": "1.0.2",
 		"zordius/lightncandy": "0.21"
 	},
@@ -51,7 +51,7 @@
 	},
 	"scripts": {
 		"lint": "parallel-lint --exclude vendor",
-		"phpcs": "phpcs $PHPCS_ARGS -s --standard=vendor/mediawiki/mediawiki-codesniffer/MediaWiki --ignore=vendor,node_modules --encoding=utf-8 --extensions=php,php5,inc,sample",
+		"phpcs": "phpcs -p $PHPCS_ARGS",
 		"test": [
 			"composer lint",
 			"composer phpcs"