From b5330b659b9ec7d17fb9d8bb97383c1b8ff98623 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Fri, 13 Dec 2019 10:33:52 +0100
Subject: v2.10.1

---
 composer.json | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'composer.json')

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",
-- 
cgit