Added getFromContainer to client, small command bus optimization, added test for missing command bus

Author: WyriHaximus

src/Client.php

@@ -4,7 +4,6 @@
 
 use ApiClients\Tools\CommandBus\CommandBus;
 use Interop\Container\ContainerInterface;
-use InvalidArgumentException;
 use React\Promise\CancellablePromiseInterface;
 
 final class Client
@@ -14,16 +13,18 @@ final class Client
      */
     private $container;
 
+    /**
+     * @var CommandBus
+     */
+    private $commandBus;
+
     /**
      * @param ContainerInterface $container
      */
     public function __construct(ContainerInterface $container)
     {
         $this->container = $container;
-
-        if (!$this->container->has(CommandBus::class)) {
-            throw new InvalidArgumentException();
-        }
+        $this->commandBus = $this->container->get(CommandBus::class);
     }
 
     /**
@@ -34,8 +35,20 @@ public function getContainer(): ContainerInterface
         return $this->container;
     }
 
+    /**
+     * @return mixed
+     */
+    public function getFromContainer(string $id)
+    {
+        return $this->container->get($id);
+    }
+
+    /**
+     * @param $command
+     * @return CancellablePromiseInterface
+     */
     public function handle($command): CancellablePromiseInterface
     {
-        return $this->container->get(CommandBus::class)->handle($command);
+        return $this->commandBus->handle($command);
     }
 }

tests/ClientTest.php

@@ -45,6 +45,15 @@ public function handle($command)
         $client = new Client($container);
 
         $this->assertSame($container, $client->getContainer());
+        $this->assertSame($commandBus, $client->getFromContainer(CommandBus::class));
         $this->assertSame($command, await($client->handle($command), $loop));
     }
+
+    /**
+     * @expectedException \DI\Definition\Exception\DefinitionException
+     */
+    public function testCommandBusMissing()
+    {
+        new Client(ContainerBuilder::buildDevContainer());
+    }
 }