Merge remote-tracking branch 'origin/master'

Author: WyriHaximus

composer.json

@@ -17,9 +17,9 @@
     "api-clients/service": "dev-master",
     "clue/block-react": "^1.1",
     "clue/buzz-react": "^1.1",
-    "container-interop/container-interop": "^1.1",
     "daverandom/exceptional-json": "^1.0.1",
     "doctrine/annotations": "^1.2",
+    "psr/container": "^1.0",
     "react/http-client": "^0.4.15",
     "react/promise": "^2.4",
     "wyrihaximus/ticking-promise": "^1.6"

composer.lock

@@ -6,7 +6,6 @@
 use ApiClients\Foundation\Middleware\MiddlewareRunner;
 use ApiClients\Foundation\Transport\CommandBus;
 use Clue\React\Buzz\Browser;
-use Interop\Container\ContainerInterface;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 use React\EventLoop\LoopInterface;
@@ -31,7 +30,7 @@ final class Client implements ClientInterface
     protected $loop;
 
     /**
-     * @var ContainerInterface
+     * @var Locator
      */
     protected $locator;
 
@@ -52,7 +51,7 @@ final class Client implements ClientInterface
 
     /**
      * @param LoopInterface $loop
-     * @param Locator|ContainerInterface $locator
+     * @param Locator $locator
      * @param Browser $buzz
      * @param array $options
      */

src/Client.php

@@ -6,7 +6,6 @@
 use ApiClients\Foundation\Middleware\MiddlewareRunner;
 use ApiClients\Foundation\Transport\CommandBus;
 use Clue\React\Buzz\Browser;
-use Interop\Container\ContainerInterface;
 use InvalidArgumentException;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;

src/ClientInterface.php

@@ -5,8 +5,8 @@
 use ApiClients\Foundation\Middleware\Locator\Locator;
 use Clue\React\Buzz\Browser;
 use Clue\React\Buzz\Io\Sender;
-use Interop\Container\ContainerInterface;
 use InvalidArgumentException;
+use Psr\Container\ContainerInterface;
 use React\Dns\Resolver\Factory as ResolverFactory;
 use React\Dns\Resolver\Resolver;
 use React\EventLoop\LoopInterface;

src/Factory.php

@@ -10,7 +10,6 @@
 use ApiClients\Foundation\Transport\Options;
 use ApiClients\Tools\TestUtilities\TestCase;
 use DI\ContainerBuilder;
-use Interop\Container\ContainerInterface;
 use League\Event\Emitter;
 use League\Event\EmitterInterface;
 use React\EventLoop\Factory as LoopFactory;