Merge branch 'feature/33' into develop

Close #33
zendframework · Aug 11, 2017 · 84284eb · 84284eb
2 parents 51d8f75 + b90e035
commit 84284eb
Show file tree

Hide file tree

Showing 4 changed files with 190 additions and 90 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,7 +6,8 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Added
 
-- Nothing.
+- [#33](https://github.com/zendframework/zend-expressive-fastroute/pull/33)
+  adds PSR-11 Container Interface support.
 
 ### Changed
 

diff --git a/composer.json b/composer.json
@@ -21,6 +21,7 @@
         "php": "^5.6 || ^7.0",
         "fig/http-message-util": "^1.1.2",
         "nikic/fast-route": "^1.2",
+        "psr/container": "^1.0",
         "psr/http-message": "^1.0.1",
         "zendframework/zend-expressive-router": "^2.0.1",
         "zendframework/zend-stdlib": "^3.1"
@@ -30,6 +31,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\\Router\\": "src/"