Merge branch 'feature/65' into develop

Close #65

Author: Xerkus

CHANGELOG.md

@@ -6,7 +6,8 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Added
 
-- Nothing.
+- [#65](https://github.com/zendframework/zend-expressive-zendviewrenderer/pull/65)
+  enables usage of any PSR-11 container with the view helper plugin manager
 
 ### Changed
 
@@ -18,7 +19,8 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Removed
 
-- Nothing.
+- [#65](https://github.com/zendframework/zend-expressive-zendviewrenderer/pull/65)
+  removes support for v2 releases of zendframework/zend-servicemanager
 
 ### Fixed
 

composer.json

@@ -26,17 +26,14 @@
         "zendframework/zend-expressive-helpers": "^5.0",
         "zendframework/zend-expressive-router": "^3.0",
         "zendframework/zend-expressive-template": "^2.0",
-        "zendframework/zend-servicemanager": "^2.7.8 || ^3.3",
+        "zendframework/zend-servicemanager": "^3.4",
         "zendframework/zend-view": "^2.11.1"
     },
     "require-dev": {
         "malukenho/docheader": "^0.1.5",
         "phpunit/phpunit": "^7.0.2",
         "zendframework/zend-coding-standard": "~1.0.0"
     },
-    "conflict": {
-        "container-interop/container-interop": "<1.2.0"
-    },
     "autoload": {
         "psr-4": {
             "Zend\\Expressive\\ZendView\\": "src/"