diff options
author | Remi Collet <remi@remirepo.net> | 2018-02-23 06:30:25 +0100 |
---|---|---|
committer | Remi Collet <remi@remirepo.net> | 2018-02-23 06:30:25 +0100 |
commit | 706a2e464ee7d09c940028a1877a1a9fb1efb1a2 (patch) | |
tree | becab82ec23b5ae54b0f0cc34189c4ba4669941b /composer.json | |
parent | e602ce069cf3ed5c78e5323044c03cb1c3832706 (diff) |
Update to 2.8.5 (no change)
use range dependencies
Diffstat (limited to 'composer.json')
-rw-r--r-- | composer.json | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/composer.json b/composer.json index 37f3d21..31d420b 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,7 @@ "container-interop/container-interop": "^1.1", "mongodb/mongodb": "^1.0.1", "php-mock/php-mock-phpunit": "^1.1.2 || ^2.0", - "phpunit/phpunit": "^5.7.5 || ^6.0.13", + "phpunit/phpunit": "^5.7.5 || >=6.0.13 <6.5.0", "zendframework/zend-cache": "^2.6.1", "zendframework/zend-coding-standard": "~1.0.0", "zendframework/zend-db": "^2.7", @@ -32,9 +32,6 @@ "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3", "zendframework/zend-validator": "^2.6" }, - "conflict": { - "phpunit/phpunit": ">=6.5.0" - }, "suggest": { "mongodb/mongodb": "If you want to use the MongoDB session save handler", "zendframework/zend-cache": "Zend\\Cache component", |