X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=composer.json;h=257c1951321b2e6cccd9c65e480ab1cd20887021;hb=207dfd2adf815fee446bc096952472279a588aaa;hp=2f6cc424676b474daa19c2adbc0bd463a2cc990a;hpb=c5c5a901148edc3acccc70b73917637dfa7ae250;p=lhc%2Fweb%2Fwiklou.git

diff --git a/composer.json b/composer.json
index 2f6cc42467..257c195132 100644
--- a/composer.json
+++ b/composer.json
@@ -20,20 +20,21 @@
 		"ext-iconv": "*",
 		"leafo/lessphp": "0.5.0",
 		"liuggio/statsd-php-client": "1.0.12",
-		"oojs/oojs-ui": "0.11.3",
+		"mediawiki/at-ease": "1.0.0",
+		"oojs/oojs-ui": "0.11.5",
 		"php": ">=5.3.3",
 		"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",
-		"mediawiki/mediawiki-codesniffer": "0.1.0"
+		"phpunit/phpunit": "3.7.37",
+		"mediawiki/mediawiki-codesniffer": "0.2.0"
 	},
 	"suggest": {
 		"ext-fileinfo": "*",
@@ -50,7 +51,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"
@@ -59,6 +60,7 @@
 		"pre-install-cmd": "ComposerHookHandler::onPreInstall"
 	},
 	"config": {
+		"classmap-authoritative": true,
 		"prepend-autoloader": false,
 		"optimize-autoloader": true
 	},