Merge pull request #108 from Koopzington/allow-phpunit-65

Allow PHPunit 6.5+ when zend-session gets installed as dependency
zendframework · Feb 22, 2018 · d34655a · d34655a
2 parents 41a7584 + 2f0fd8e
commit d34655a
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -24,17 +24,14 @@
         "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",
         "zendframework/zend-http": "^2.5.4",
         "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",