Swapped wrapper tactician into a loop scheduled command bus package

Author: WyriHaximus

composer.json

@@ -11,12 +11,12 @@
   ],
   "require": {
     "php": "^7.0",
+    "api-clients/command-bus": "dev-master",
     "api-clients/events": "dev-master",
     "api-clients/hydrator": "dev-master",
     "api-clients/transport": "dev-master",
     "league/container": "^2.2",
     "league/event": "^2.1",
-    "league/tactician": "^1.0",
     "league/tactician-container": "^1.0",
     "wyrihaximus/tactician-command-handler-mapper": "^1.0"
   },

composer.lock

@@ -4,7 +4,8 @@
 
 use InvalidArgumentException;
 use League\Container\ContainerInterface;
-use League\Tactician\CommandBus;
+use ApiClients\Tools\CommandBus\CommandBus;
+use React\Promise\CancellablePromiseInterface;
 
 final class Client
 {
@@ -33,7 +34,7 @@ public function getContainer(): ContainerInterface
         return $this->container;
     }
 
-    public function handle($command)
+    public function handle($command): CancellablePromiseInterface
     {
         return $this->container->get(CommandBus::class)->handle($command);
     }

src/Client.php

@@ -7,12 +7,12 @@
 use ApiClients\Foundation\Hydrator\Hydrator;
 use ApiClients\Foundation\Transport\Client as TransportClient;
 use ApiClients\Foundation\Transport\Factory as TransportFactory;
+use ApiClients\Tools\CommandBus\CommandBus;
 use Interop\Container\ContainerInterface;
 use League\Container\Container;
 use League\Container\ReflectionContainer;
 use League\Event\Emitter;
 use League\Event\EmitterInterface;
-use League\Tactician\CommandBus;
 use League\Tactician\Container\ContainerLocator;
 use League\Tactician\Handler\CommandHandlerMiddleware;
 use League\Tactician\Handler\CommandNameExtractor\ClassNameExtractor;
@@ -67,12 +67,13 @@ private static function createCommandBus(ContainerInterface $container): Command
             new HandleInflector()
         );
 
-        return new CommandBus([
-            $commandHandlerMiddleware,
-        ]);
+        return new CommandBus(
+            $container->get(LoopInterface::class),
+            $commandHandlerMiddleware
+        );
     }
 
-    private static function mapCommandsToHandlers(Emitter $emitter): array
+    private static function mapCommandsToHandlers(EmitterInterface $emitter): array
     {
         return $emitter->emit(CommandLocatorEvent::create())->getMap();
     }

src/Factory.php

@@ -3,11 +3,17 @@
 namespace ApiClients\Tests\Foundation;
 
 use ApiClients\Foundation\Client;
+use ApiClients\Tools\CommandBus\CommandBus;
 use ApiClients\Tools\TestUtilities\TestCase;
 use InvalidArgumentException;
 use League\Container\Container;
-use League\Tactician\CommandBus;
-use League\Tactician\Setup\QuickStart;
+use League\Tactician\Handler\CommandHandlerMiddleware;
+use League\Tactician\Handler\CommandNameExtractor\ClassNameExtractor;
+use League\Tactician\Handler\Locator\InMemoryLocator;
+use League\Tactician\Handler\MethodNameInflector\HandleInflector;
+use function Clue\React\Block\await;
+use React\EventLoop\Factory;
+use function React\Promise\resolve;
 
 final class ClientTest extends TestCase
 {
@@ -17,19 +23,30 @@ public function testClient()
         $handler = new class() {
             public function handle($command)
             {
-                return $command;
+                return resolve($command);
             }
         };
 
-        $commandBus = QuickStart::create([
+        $loop = Factory::create();
+
+        $commandToHandlerMap = [
             get_class($command) => $handler,
-        ]);
+        ];
+
+        $handlerMiddleware = new CommandHandlerMiddleware(
+            new ClassNameExtractor(),
+            new InMemoryLocator($commandToHandlerMap),
+            new HandleInflector()
+        );
+
+        $commandBus = new CommandBus($loop, $handlerMiddleware);
+
         $container = new Container();
         $container->share(CommandBus::class, $commandBus);
         $client = new Client($container);
 
         $this->assertSame($container, $client->getContainer());
-        $this->assertSame($command, $client->handle($command));
+        $this->assertSame($command, await($client->handle($command), $loop));
     }
 
     /**

tests/ClientTest.php

@@ -11,16 +11,18 @@
 use League\Event\CallbackListener;
 use League\Event\EmitterInterface;
 use League\Tactician\Exception\MissingHandlerException;
-use React\EventLoop\LoopInterface;
+use React\EventLoop\Factory as LoopFactory;
+use Throwable;
+use function Clue\React\Block\await;
 
 final class FactoryTest extends TestCase
 {
     public function testCreate()
     {
-        $loop = $this->prophesize(LoopInterface::class);
+        $loop = LoopFactory::create();
 
         $client = Factory::create(
-            $loop->reveal(),
+            $loop,
             new Container(),
             [
                 Options::HYDRATOR_OPTIONS => [],
@@ -44,8 +46,8 @@ function (CommandLocatorEvent $event) use (&$called) {
         $this->assertFalse($called);
 
         try {
-            $client->handle(new class() {});
-        } catch (\Throwable $exception) {
+            await($client->handle(new class() {}), $loop);
+        } catch (Throwable $exception) {
 
         }