Merge branch 'Sam-Burns-psr-11' into 3.x

Closes slimphp#2146
akrabat · Mar 18, 2017 · 7aabd47 · 7aabd47
2 parents 484a16f + c1c2a3a
commit 7aabd47
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 9 deletions.
diff --git a/Slim/App.php b/Slim/App.php
@@ -17,7 +17,7 @@
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\ResponseInterface;
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use FastRoute\Dispatcher;
 use Slim\Exception\SlimException;
 use Slim\Exception\MethodNotAllowedException;

diff --git a/Slim/CallableResolver.php b/Slim/CallableResolver.php
@@ -9,7 +9,7 @@
 namespace Slim;
 
 use RuntimeException;
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use Slim\Interfaces\CallableResolverInterface;
 
 /**

diff --git a/Slim/CallableResolverAwareTrait.php b/Slim/CallableResolverAwareTrait.php
@@ -9,7 +9,7 @@
 namespace Slim;
 
 use RuntimeException;
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use Slim\Interfaces\CallableResolverInterface;
 
 /**

diff --git a/Slim/DeferredCallable.php b/Slim/DeferredCallable.php
@@ -10,7 +10,7 @@
 namespace Slim;
 
 use Closure;
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 
 class DeferredCallable
 {

diff --git a/Slim/Routable.php b/Slim/Routable.php
@@ -8,7 +8,7 @@
  */
 namespace Slim;
 
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 
 /**
  * A routable, middleware-aware object

diff --git a/Slim/Router.php b/Slim/Router.php
@@ -9,7 +9,7 @@
 namespace Slim;
 
 use FastRoute\Dispatcher;
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use InvalidArgumentException;
 use RuntimeException;
 use Psr\Http\Message\ServerRequestInterface;

diff --git a/composer.json b/composer.json
@@ -32,7 +32,8 @@
         "pimple/pimple": "^3.0",
         "psr/http-message": "^1.0",
         "nikic/fast-route": "^1.0",
-        "container-interop/container-interop": "^1.1"
+        "container-interop/container-interop": "^1.2",
+        "psr/container": "^1.0"
     },
     "require-dev": {
         "squizlabs/php_codesniffer": "^2.5",

diff --git a/tests/AppTest.php b/tests/AppTest.php
@@ -9,7 +9,6 @@
 
 namespace Slim\Tests;
 
-use Interop\Container\ContainerInterface;
 use Psr\Http\Message\ResponseInterface;
 use Slim\App;
 use Slim\Container;

diff --git a/tests/ContainerTest.php b/tests/ContainerTest.php
@@ -9,7 +9,7 @@
 namespace Slim\Tests;
 
 use Slim\Container;
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 
 class ContainerTest extends \PHPUnit_Framework_TestCase
 {