summaryrefslogtreecommitdiffstats
path: root/composer.json
diff options
context:
space:
mode:
Diffstat (limited to 'composer.json')
-rw-r--r--composer.json9
1 files changed, 6 insertions, 3 deletions
diff --git a/composer.json b/composer.json
index 3597ff0..2e63518 100644
--- a/composer.json
+++ b/composer.json
@@ -17,6 +17,7 @@
},
"require": {
"php": "^5.6 || ^7.0",
+ "ext-intl": "*",
"zendframework/zend-stdlib": "^2.7 || ^3.0"
},
"require-dev": {
@@ -30,8 +31,10 @@
"zendframework/zend-validator": "^2.6",
"zendframework/zend-view": "^2.6.3"
},
+ "conflict": {
+ "phpspec/prophecy": "<1.9.0"
+ },
"suggest": {
- "ext-intl": "Required for most features of Zend\\I18n; included in default builds of PHP",
"zendframework/zend-cache": "Zend\\Cache component",
"zendframework/zend-config": "Zend\\Config component",
"zendframework/zend-eventmanager": "You should install this package to use the events in the translator",
@@ -56,8 +59,8 @@
},
"extra": {
"branch-alias": {
- "dev-master": "2.9.x-dev",
- "dev-develop": "2.10.x-dev"
+ "dev-master": "2.10.x-dev",
+ "dev-develop": "2.11.x-dev"
},
"zf": {
"component": "Zend\\I18n",