From 8218fabb6187e7562462fd89e5b76c5f72a0d26d Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Sun, 13 Aug 2017 07:07:34 +0200
Subject: v1.5.0

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

(limited to 'composer.json')

diff --git a/composer.json b/composer.json
index 6dea406..964c063 100644
--- a/composer.json
+++ b/composer.json
@@ -13,13 +13,13 @@
     ],
     "extra": {
         "branch-alias": {
-            "dev-master": "1.4-dev",
-            "dev-develop": "1.5-dev"
+            "dev-master": "1.5-dev",
+            "dev-develop": "1.6-dev"
         }
     },
     "require": {
         "php": "^5.6 || ^7.0",
-        "container-interop/container-interop": "^1.2",
+        "psr/container": "^1.0",
         "twig/twig": "^1.32 || ^2.1",
         "zendframework/zend-expressive-helpers": "^1.4 || ^2.2 || ^3.0.1 || ^4.0",
         "zendframework/zend-expressive-router": "^1.3.2 || ^2.1",
@@ -30,6 +30,9 @@
         "phpunit/phpunit": "^6.0.7 || ^5.7.14",
         "zendframework/zend-coding-standard": "~1.0.0"
     },
+    "conflict": {
+        "container-interop/container-interop": "<1.2.0"
+    },
     "autoload": {
       "psr-4": {
         "Zend\\Expressive\\Twig\\": "src/"
-- 
cgit