summaryrefslogtreecommitdiffstats
path: root/composer.json
diff options
context:
space:
mode:
Diffstat (limited to 'composer.json')
-rw-r--r--composer.json8
1 files changed, 6 insertions, 2 deletions
diff --git a/composer.json b/composer.json
index cb500dd..0d16521 100644
--- a/composer.json
+++ b/composer.json
@@ -21,11 +21,14 @@
},
"require-dev": {
"ext-phar": "*",
- "doctrine/annotations": "^1.0",
+ "doctrine/annotations": "^1.7",
"phpunit/phpunit": "^7.5.16 || ^8.4",
"zendframework/zend-coding-standard": "^1.0",
"zendframework/zend-stdlib": "^2.7 || ^3.0"
},
+ "conflict": {
+ "phpspec/prophecy": "<1.9.0"
+ },
"suggest": {
"doctrine/annotations": "Doctrine\\Common\\Annotations >=1.0 for annotation features",
"zendframework/zend-stdlib": "Zend\\Stdlib component"
@@ -46,7 +49,8 @@
"extra": {
"branch-alias": {
"dev-master": "3.4.x-dev",
- "dev-develop": "3.5.x-dev"
+ "dev-develop": "3.5.x-dev",
+ "dev-dev-4.0": "4.0.x-dev"
}
},
"scripts": {