Use PSR-11 Container Interface

composer.json

@@ -18,7 +18,7 @@
     },
     "require": {
         "php": "^5.6 || ^7.0",
-        "container-interop/container-interop": "^1.2",
+        "psr/container": "^1.0",
         "psr/http-message": "^1.0.1",
         "zendframework/zend-expressive-router": "^2.1"
     },

src/Exception/MissingHelperException.php

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

src/Exception/MissingRouterException.php

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

src/ServerUrlMiddlewareFactory.php

@@ -7,7 +7,7 @@
 
 namespace Zend\Expressive\Helper;
 
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 
 class ServerUrlMiddlewareFactory
 {

src/UrlHelperFactory.php

@@ -7,7 +7,7 @@
 
 namespace Zend\Expressive\Helper;
 
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use Zend\Expressive\Router\RouterInterface;
 
 class UrlHelperFactory

src/UrlHelperMiddlewareFactory.php

@@ -7,7 +7,7 @@
 
 namespace Zend\Expressive\Helper;
 
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 
 class UrlHelperMiddlewareFactory
 {

test/ServerUrlMiddlewareFactoryTest.php

@@ -7,8 +7,8 @@
 
 namespace ZendTest\Expressive\Helper;
 
-use Interop\Container\ContainerInterface;
 use PHPUnit\Framework\TestCase;
+use Psr\Container\ContainerInterface;
 use Zend\Expressive\Helper\Exception\MissingHelperException;
 use Zend\Expressive\Helper\ServerUrlHelper;
 use Zend\Expressive\Helper\ServerUrlMiddleware;

test/UrlHelperFactoryTest.php

@@ -7,9 +7,9 @@
 
 namespace ZendTest\Expressive\Helper;
 
-use Interop\Container\ContainerInterface;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Prophecy\ObjectProphecy;
+use Psr\Container\ContainerInterface;
 use Zend\Expressive\Helper\Exception\MissingRouterException;
 use Zend\Expressive\Helper\UrlHelper;
 use Zend\Expressive\Helper\UrlHelperFactory;

test/UrlHelperMiddlewareFactoryTest.php

@@ -7,9 +7,9 @@
 
 namespace ZendTest\Expressive\Helper;
 
-use Interop\Container\ContainerInterface;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Prophecy\ObjectProphecy;
+use Psr\Container\ContainerInterface;
 use Zend\Expressive\Helper\Exception\MissingHelperException;
 use Zend\Expressive\Helper\UrlHelper;
 use Zend\Expressive\Helper\UrlHelperMiddleware;