Use PSR-11 Container Interface

Author: geerteltink

composer.json

@@ -19,7 +19,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",
@@ -32,6 +33,9 @@
         "phpunit/phpunit": "^6.0.8 || ^5.7.15",
         "zendframework/zend-coding-standard": "~1.0.0"
     },
+    "conflict": {
+        "container-interop/container-interop": "<1.2.0"
+    },
     "autoload": {
       "psr-4": {
         "Zend\\Expressive\\ZendView\\": "src/"

composer.lock

@@ -8,10 +8,10 @@
 namespace Zend\Expressive\ZendView\Exception;
 
 use DomainException;
-use Interop\Container\Exception\ContainerException;
+use Psr\Container\ContainerExceptionInterface;
 
 class MissingHelperException extends DomainException implements
-    ContainerException,
+    ContainerExceptionInterface,
     ExceptionInterface
 {
 }

src/Exception/MissingHelperException.php

@@ -7,7 +7,7 @@
 
 namespace Zend\Expressive\ZendView;
 
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use Zend\ServiceManager\Config;
 use Zend\View\HelperPluginManager;
 

src/HelperPluginManagerFactory.php

@@ -7,7 +7,7 @@
 
 namespace Zend\Expressive\ZendView;
 
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use Zend\Expressive\Helper\ServerUrlHelper as BaseServerUrlHelper;
 use Zend\Expressive\Helper\UrlHelper as BaseUrlHelper;
 use Zend\View\HelperPluginManager;