Merge branch 'feature/37-psr-11-support' into release-2.0.0

Close #37

Author: weierophinney

CHANGELOG.md

@@ -2,6 +2,31 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
+## 2.0.0alpha1 - TBD
+
+### Added
+
+- Nothing.
+
+### Changed
+
+- [#37](https://github.com/zendframework/zend-expressive-zendviewrenderer/pull/37)
+  adds support for PSR-11. All exception types that previously extended from
+  container-interop exceptions now extend from PSR-11 exception interfaces,
+  and factories typehint against the PSR-11 `ContainerInterface`.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- Nothing.
+
 ## 1.5.0 - TBD
 
 ### Added

composer.json

@@ -21,7 +21,8 @@
     },
     "require": {
         "php": "^5.6 || ^7.0",
-        "container-interop/container-interop": "^1.2",
+        "container-interop/container-interop": "^1.2.0",
+        "psr/container": "^1.0",
         "psr/http-message": "^1.0.1",
         "zendframework/zend-expressive-helpers": "^1.4 || ^2.2 || ^3.0.1 || ^4.0",
         "zendframework/zend-expressive-router": "^1.3.2 || ^2.1",
@@ -34,6 +35,9 @@
         "phpunit/phpunit": "^5.7.23 || ^6.4.3",
         "zendframework/zend-coding-standard": "~1.0.0"
     },
+    "conflict": {
+        "container-interop/container-interop": "<1.2.0"
+    },
     "autoload": {
         "psr-4": {
             "Zend\\Expressive\\ZendView\\": "src/"