diff options
Diffstat (limited to 'composer.json')
| -rw-r--r-- | composer.json | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/composer.json b/composer.json index 974cd3b..e22c399 100644 --- a/composer.json +++ b/composer.json @@ -13,22 +13,26 @@ ], "extra": { "branch-alias": { - "dev-master": "2.0-dev", - "dev-develop": "2.1-dev" + "dev-master": "2.1-dev", + "dev-develop": "2.2-dev" } }, "require": { "php": "^5.6 || ^7.0", - "nikic/fast-route": "^1.0.0", - "psr/http-message": "^1.0", - "zendframework/zend-expressive-router": "^2.0", - "fig/http-message-util": "^1.1", + "fig/http-message-util": "^1.1.2", + "nikic/fast-route": "^1.2", + "psr/container": "^1.0", + "psr/http-message": "^1.0.1", + "zendframework/zend-expressive-router": "^2.0.1", "zendframework/zend-stdlib": "^3.1" }, "require-dev": { - "phpunit/phpunit": "^4.7 || ^5.6", - "zendframework/zend-coding-standard": "~1.0.0", - "malukenho/docheader": "^0.1.5" + "malukenho/docheader": "^0.1.5", + "phpunit/phpunit": "^6.0.7 || ^5.7.14", + "zendframework/zend-coding-standard": "~1.0.0" + }, + "conflict": { + "container-interop/container-interop": "<1.2.0" }, "autoload": { "psr-4": { @@ -42,15 +46,15 @@ }, "scripts": { "check": [ - "@cs-check", "@license-check", + "@cs-check", "@test" ], - "coveralls": "coveralls", - "cs-check": "phpcs", - "cs-fix": "phpcbf", + "upload-coverage": "coveralls -v", + "cs-check": "phpcs --colors", + "cs-fix": "phpcbf --colors", "license-check": "docheader check src/ test/", - "test": "phpunit", + "test": "phpunit --colors=always", "test-coverage": "phpunit --coverage-clover clover.xml" } } |