Rework PHP and vendor check

[lhc/web/wiklou.git] / composer.json

diff --git a/composer.json b/composer.json
index f72e7e4..c40b802 100644 (file)
--- 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.6",
+               "oojs/oojs-ui": "0.12.0",
                "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"