summaryrefslogtreecommitdiffstats
path: root/composer.json
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2019-08-20 10:48:13 +0200
committerRemi Collet <remi@remirepo.net>2019-08-20 10:48:13 +0200
commit61c8103668b1ce1b2ae9930a874afcc804920e2d (patch)
tree50739c7b02c3674af20fdf1ef3c185de8774a1de /composer.json
parent0467622e9080e687e6e25c627c116a55049d0679 (diff)
v2.8.6
Diffstat (limited to 'composer.json')
-rw-r--r--composer.json9
1 files changed, 3 insertions, 6 deletions
diff --git a/composer.json b/composer.json
index 37f3d21..94e77b8 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",
@@ -61,8 +58,8 @@
},
"extra": {
"branch-alias": {
- "dev-master": "2.8-dev",
- "dev-develop": "2.9-dev"
+ "dev-master": "2.8.x-dev",
+ "dev-develop": "2.9.x-dev"
},
"zf": {
"component": "Zend\\Session",