From ca3cd97d050cdd7f2a767b2e64003df46ae67632 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 11 Dec 2018 10:01:36 +0100
Subject: update to 2.11.1 add mandatory dependency on zendframework/zend-json
 add optional dependency on zendframework/zend-mvc-plugin-flashmessenger raise
 dependency on zendframework/zend-mvc 2.7.14 use range dependencies

---
 composer.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'composer.json')

diff --git a/composer.json b/composer.json
index a8da6d8..b9eaf23 100644
--- a/composer.json
+++ b/composer.json
@@ -15,6 +15,7 @@
     "require": {
         "php": "^5.6 || ^7.0",
         "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
+        "zendframework/zend-json": "^2.6.1 || ^3.0",
         "zendframework/zend-loader": "^2.5",
         "zendframework/zend-stdlib": "^2.7 || ^3.0"
     },
@@ -30,10 +31,9 @@
         "zendframework/zend-filter": "^2.6.1",
         "zendframework/zend-http": "^2.5.4",
         "zendframework/zend-i18n": "^2.6",
-        "zendframework/zend-json": "^2.6.1",
         "zendframework/zend-log": "^2.7",
         "zendframework/zend-modulemanager": "^2.7.1",
-        "zendframework/zend-mvc": "^2.7 || ^3.0",
+        "zendframework/zend-mvc": "^2.7.14 || ^3.0",
         "zendframework/zend-navigation": "^2.5",
         "zendframework/zend-paginator": "^2.5",
         "zendframework/zend-permissions-acl": "^2.6",
@@ -50,8 +50,8 @@
         "zendframework/zend-filter": "Zend\\Filter component",
         "zendframework/zend-http": "Zend\\Http component",
         "zendframework/zend-i18n": "Zend\\I18n component",
-        "zendframework/zend-json": "Zend\\Json component",
         "zendframework/zend-mvc": "Zend\\Mvc component",
+        "zendframework/zend-mvc-plugin-flashmessenger": "zend-mvc-plugin-flashmessenger component, if you want to use the FlashMessenger view helper with zend-mvc versions 3 and up",
         "zendframework/zend-navigation": "Zend\\Navigation component",
         "zendframework/zend-paginator": "Zend\\Paginator component",
         "zendframework/zend-permissions-acl": "Zend\\Permissions\\Acl component",
@@ -65,8 +65,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.10.x-dev",
-            "dev-develop": "2.11.x-dev"
+            "dev-master": "2.11.x-dev",
+            "dev-develop": "2.12.x-dev"
         }
     },
     "autoload-dev": {
-- 
cgit