add suport for query bus

spec/InFw/TacticianAdapter/ConfigProviderSpec.php

@@ -30,9 +30,17 @@ function it_should_have_dependencies()
 
     function it_should_have_command_bus()
     {
-        $commandBus = $this->config['command-bus'];
+        $commandBus = $this->config['command_bus'];
         $commandBus->shouldBeArray();
-        $commandBus['handler-map']->shouldBeArray();
+        $commandBus['handler_map']->shouldBeArray();
         $commandBus['locator']->shouldBe(HandlerLocator::class);
     }
+
+    function it_should_have_query_bus()
+    {
+        $commandBus = $this->config['query_bus'];
+        $commandBus->shouldBeArray();
+        $commandBus['handler_map']->shouldBeArray();
+        $commandBus['locator']->shouldBe('query_bus.handler_locator');
+    }
 }

spec/InFw/TacticianAdapter/Factory/HandlerLocatorFactorySpec.php

@@ -2,20 +2,18 @@
 
 namespace spec\InFw\TacticianAdapter\Factory;
 
-use InFw\TacticianAdapter\Factory\HandlerLocatorFactory;
-use Interop\Container\ContainerInterface;
 use League\Tactician\Container\ContainerLocator;
 use PhpSpec\ObjectBehavior;
-use Prophecy\Argument;
+use Psr\Container\ContainerInterface;
 
 class HandlerLocatorFactorySpec extends ObjectBehavior
 {
     function it_should_create_tactician_container_locator_instance(
         ContainerInterface $container
     ) {
         $container->get('config')->willReturn([
-            'command-bus' => [
-                'handler-map' => []
+            'command_bus' => [
+                'handler_map' => []
             ]
         ])->shouldBeCalled();
 

src/InFw/TacticianAdapter/ConfigProvider.php

@@ -5,6 +5,7 @@
 use InFw\TacticianAdapter\Factory\CommandBusFactory;
 use InFw\TacticianAdapter\Factory\HandlerLocatorFactory;
 use InFw\TacticianAdapter\Factory\LoggerMiddlewareFactory;
+use InFw\TacticianAdapter\Factory\QueryBusFactory;
 use League\Tactician\CommandBus;
 use League\Tactician\Handler\CommandNameExtractor\ClassNameExtractor;
 use League\Tactician\Handler\CommandNameExtractor\CommandNameExtractor;
@@ -21,7 +22,8 @@ class ConfigProvider
     public function __invoke()
     {
         return [
-            'command-bus' => $this->getBusConfig(),
+            'command_bus' => $this->getBusConfig(),
+            'query_bus' => $this->getQueryBusConfig(),
             'dependencies' => $this->getDependencies(),
         ];
     }
@@ -37,7 +39,19 @@ protected function getBusConfig(): array
                 LockingMiddleware::class => LockingMiddleware::class,
                 LoggerMiddleware::class => LoggerMiddleware::class,
             ],
-            'handler-map' => [],
+            'handler_map' => [],
+        ];
+    }
+
+    protected function getQueryBusConfig(): array
+    {
+        return [
+            'locator' => 'query_bus.handler_locator',
+            'inflector' => MethodNameInflector::class,
+            'extractor' => CommandNameExtractor::class,
+            'formatter' => Formatter::class,
+            'middleware' => [],
+            'handler_map' => [],
         ];
     }
 
@@ -52,7 +66,9 @@ protected function getDependencies(): array
             ],
             'factories' => [
                 CommandBus::class => CommandBusFactory::class,
-                HandlerLocator::class => HandlerLocatorFactory::class,
+                QueryBus::class => QueryBusFactory::class,
+                HandlerLocator::class => [HandlerLocatorFactory::class, 'command_bus'],
+                'query_bus.handler_locator' => [HandlerLocatorFactory::class, 'query_bus'],
                 LoggerMiddleware::class => LoggerMiddlewareFactory::class,
             ],
         ];

src/InFw/TacticianAdapter/Factory/CommandBusFactory.php

@@ -15,9 +15,9 @@ class CommandBusFactory
      *
      * @return CommandBus
      */
-    public function __invoke(ContainerInterface $container)
+    public function __invoke(ContainerInterface $container): CommandBus
     {
-        $config = $container->get('config')['command-bus'];
+        $config = $container->get('config')['command_bus'];
 
         $inflector = $container->get($config['inflector']);
         $locator = $container->get($config['locator']);

src/InFw/TacticianAdapter/Factory/HandlerLocatorFactory.php

@@ -7,9 +7,9 @@
 
 class HandlerLocatorFactory
 {
-    public function __invoke(ContainerInterface $container)
+    public function __invoke(ContainerInterface $container, string $bus = 'command_bus')
     {
-        $commandsMapping = $container->get('config')['command-bus']['handler-map'];
+        $commandsMapping = $container->get('config')[$bus]['handler_map'];
 
         return new ContainerLocator($container, $commandsMapping);
     }

src/InFw/TacticianAdapter/Factory/QueryBusFactory.php

@@ -0,0 +1,39 @@
+<?php
+
+declare(strict_types=1);
+
+namespace InFw\TacticianAdapter\Factory;
+
+use InFw\TacticianAdapter\QueryBus;
+use League\Tactician\Handler\CommandHandlerMiddleware;
+use Psr\Container\ContainerInterface;
+
+class QueryBusFactory
+{
+    /**
+     * @param ContainerInterface $container
+     *
+     * @return CommandBus
+     */
+    public function __invoke(ContainerInterface $container): QueryBus
+    {
+        $config = $container->get('config')['query_bus'];
+
+        $inflector = $container->get($config['inflector']);
+        $locator = $container->get($config['locator']);
+        $nameExtractor = $container->get($config['extractor']);
+
+        $commandHandlerMiddleware = new CommandHandlerMiddleware(
+            $nameExtractor,
+            $locator,
+            $inflector
+        );
+
+        return new QueryBus(array_merge(
+            array_map(function (string $middleware) use ($container) {
+                return $container->get($middleware);
+            }, $config['middleware']),
+            [$commandHandlerMiddleware]
+        ));
+    }
+}

src/InFw/TacticianAdapter/QueryBus.php

@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+namespace InFw\TacticianAdapter;
+
+use League\Tactician\CommandBus;
+
+class QueryBus extends CommandBus
+{
+}