Allow users with 'viewsuppressed' to view when limitTitle()d

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

diff --git a/composer.json b/composer.json
index bc0dacb..9222aa4 100644 (file)
--- a/composer.json
+++ b/composer.json
@@ -20,18 +20,19 @@
                "ext-iconv": "*",
                "leafo/lessphp": "0.5.0",
                "liuggio/statsd-php-client": "1.0.12",
-               "oojs/oojs-ui": "0.11.2",
+               "oojs/oojs-ui": "0.11.3",
                "php": ">=5.3.3",
                "psr/log": "1.0.0",
                "wikimedia/cdb": "1.0.1",
-               "wikimedia/composer-merge-plugin": "1.0.0",
+               "wikimedia/assert": "0.2.2",
+               "wikimedia/composer-merge-plugin": "1.1.0",
                "wikimedia/utfnormal": "1.0.2",
-               "zordius/lightncandy": "0.18"
+               "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": {
@@ -49,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"