Merge pull request #6 from mdrost/psr-container

WyriHaximus · web-flow · commit 3677a06d12c3 · 2017-04-10T15:58:38.000+02:00
Replace Interop\Container with Psr\Container
diff --git a/README.md b/README.md
@@ -20,7 +20,7 @@ implementation does not require all the methods defined in the
 The locator can be used by your application to fetch middleware instances.
 It will check whether the created instance implements the `MiddlewareInterface`.
 Currently the only provided locator is the `ContainerLocator` which accepts a
-`Interop\Container\ContainerInterface` to fetch your middleware instances.
+`Psr\Container\ContainerInterface` to fetch your middleware instances.
 
 ## Example
 ```php
diff --git a/composer.json b/composer.json
@@ -17,15 +17,15 @@
   },
   "require-dev": {
     "api-clients/test-utilities": "^3.0",
-    "container-interop/container-interop": "^1.1",
-    "guzzlehttp/psr7": "^1.3"
+    "guzzlehttp/psr7": "^1.3",
+    "psr/container": "^1.0"
   },
   "suggest": {
     "api-clients/middleware-cache": "Cache requests with different strategies",
     "api-clients/middleware-log": "Log requests and their context",
     "api-clients/middleware-oauth1": "Sign requests with oauth1",
     "api-clients/middleware-pool": "Pool the maximum concurrent requests",
-    "container-interop/container-interop": "Add a ContainerInterface implementation to use the ContainerLocator"
+    "psr/container": "Add a ContainerInterface implementation to use the ContainerLocator"
   },
   "autoload": {
     "psr-4": {
diff --git a/composer.lock b/composer.lock
diff --git a/src/Locator/ContainerLocator.php b/src/Locator/ContainerLocator.php
@@ -3,7 +3,7 @@
 namespace ApiClients\Foundation\Middleware\Locator;
 
 use ApiClients\Foundation\Middleware\MiddlewareInterface;
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 
 final class ContainerLocator implements Locator
 {
diff --git a/tests/Locator/ContainerLocatorTest.php b/tests/Locator/ContainerLocatorTest.php
@@ -5,7 +5,7 @@
 use ApiClients\Foundation\Middleware\Locator\ContainerLocator;
 use ApiClients\Tests\Foundation\Middleware\DummyMiddleware;
 use ApiClients\Tools\TestUtilities\TestCase;
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 
 class ContainerLocatorTest extends TestCase
 {

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`namespace ApiClients\Foundation\Middleware\Locator;`
`4`	`4`
`5`	`5`	`use ApiClients\Foundation\Middleware\MiddlewareInterface;`
`6`		`-use Interop\Container\ContainerInterface;`
	`6`	`+use Psr\Container\ContainerInterface;`
`7`	`7`
`8`	`8`	`final class ContainerLocator implements Locator`
`9`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`use ApiClients\Foundation\Middleware\Locator\ContainerLocator;`
`6`	`6`	`use ApiClients\Tests\Foundation\Middleware\DummyMiddleware;`
`7`	`7`	`use ApiClients\Tools\TestUtilities\TestCase;`
`8`		`-use Interop\Container\ContainerInterface;`
	`8`	`+use Psr\Container\ContainerInterface;`
`9`	`9`
`10`	`10`	`class ContainerLocatorTest extends TestCase`
`11`	`11`	`{`