Client only accepts container and expects container to contain the command bus

Author: WyriHaximus

src/Client.php

@@ -2,6 +2,7 @@
 
 namespace ApiClients\Foundation;
 
+use InvalidArgumentException;
 use League\Container\ContainerInterface;
 use League\Tactician\CommandBus;
 
@@ -12,20 +13,17 @@ final class Client
      */
     private $container;
 
-    /**
-     * @var CommandBus
-     */
-    private $commandBus;
-
     /**
      * Client constructor.
      * @param ContainerInterface $container
-     * @param CommandBus $commandBus
      */
-    public function __construct(ContainerInterface $container, CommandBus $commandBus)
+    public function __construct(ContainerInterface $container)
     {
         $this->container = $container;
-        $this->commandBus = $commandBus;
+
+        if (!$this->container->has(CommandBus::class)) {
+            throw new InvalidArgumentException();
+        }
     }
 
     /**
@@ -38,6 +36,6 @@ public function getContainer(): ContainerInterface
 
     public function handle($command)
     {
-        return $this->commandBus->handle($command);
+        return $this->container->get(CommandBus::class)->handle($command);
     }
 }

tests/ClientTest.php

@@ -4,7 +4,9 @@
 
 use ApiClients\Foundation\Client;
 use ApiClients\Tools\TestUtilities\TestCase;
-use League\Container\ContainerInterface;
+use InvalidArgumentException;
+use League\Container\Container;
+use League\Tactician\CommandBus;
 use League\Tactician\Setup\QuickStart;
 
 final class ClientTest extends TestCase
@@ -19,13 +21,22 @@ public function handle($command)
             }
         };
 
-        $container = $this->prophesize(ContainerInterface::class)->reveal();
         $commandBus = QuickStart::create([
             get_class($command) => $handler,
         ]);
-        $client = new Client($container, $commandBus);
+        $container = new Container();
+        $container->share(CommandBus::class, $commandBus);
+        $client = new Client($container);
 
         $this->assertSame($container, $client->getContainer());
         $this->assertSame($command, $client->handle($command));
     }
+
+    /**
+     * @expectedException InvalidArgumentException
+     */
+    public function testMissingCommandBus()
+    {
+        new Client(new Container());
+    }
 }