#11 Refactored and fixed naming

README.md

@@ -34,7 +34,7 @@
 ```php
 <?php
 
-use AwdStudio\Bus\Handler\InMemoryHandlers;
+use AwdStudio\Bus\Handler\InMemoryHandlerLocator;
 use AwdStudio\Bus\Middleware\MiddlewareChain;
 use AwdStudio\Command\CommandBus;
 
@@ -43,11 +43,11 @@ class MyCommand {
     // No any of implementation or extending required.
 }
 
-$handlers = new InMemoryHandlers();
-$handlers->add(MyCommand::class, function (MyCommand $command): void {});
+$handlers = new InMemoryHandlerLocator();
+$handlers->add(MyCommand::class, static function (MyCommand $command): void {});
 
-$middleware = new InMemoryHandlers();
-$middleware->add(MyCommand::class, function (MyCommand $command, callable $next): void {
+$middleware = new InMemoryHandlerLocator();
+$middleware->add(MyCommand::class, static function (MyCommand $command, callable $next): void {
     // Do whatever you need before the handler
     $next($command);
     // Or after...

src/Bus/Handler/HandlerRegistry.php

@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+namespace AwdStudio\Bus\Handler;
+
+use AwdStudio\Bus\HandlerLocator;
+
+/**
+ * @psalm-template   TCallback of callable
+ * @phpstan-template TCallback of callable
+ *
+ * @extends HandlerLocator<TCallback>
+ */
+interface HandlerRegistry extends HandlerLocator
+{
+    /**
+     * Registers a handler from a PSR-container as a message handler.
+     *
+     * @param string $messageId
+     * @param string $handlerId
+     *
+     * @throws \AwdStudio\Bus\Exception\InvalidHandler
+     *
+     * @psalm-param   class-string $messageId
+     * @phpstan-param class-string $messageId
+     */
+    public function register(string $messageId, string $handlerId): void;
+}

src/Bus/Handler/InMemoryHandlers.php → src/Bus/Handler/InMemoryHandlerLocator.php

@@ -4,12 +4,14 @@
 
 namespace AwdStudio\Bus\Handler;
 
+use AwdStudio\Bus\HandlerLocator;
+
 /**
  * @psalm-external-mutation-free
  *
- * @implements ExternalHandlers<callable(object $message, mixed ...$extraParams): mixed>
+ * @implements HandlerLocator<callable(object $message, mixed ...$extraParams): mixed>
  */
-final class InMemoryHandlers implements ExternalHandlers
+final class InMemoryHandlerLocator implements HandlerLocator
 {
     /**
      * @var array
@@ -43,7 +45,7 @@ public function has(string $messageId): bool
     /**
      * {@inheritdoc}
      */
-    public function get(string $messageId): iterable
+    public function get(string $messageId): \Traversable
     {
         yield from $this->handlers[$messageId] ?? [];
     }

src/Bus/Handler/PsrContainerHandlerRegistry.php

@@ -4,18 +4,92 @@
 
 namespace AwdStudio\Bus\Handler;
 
-interface PsrContainerHandlerRegistry
+use AwdStudio\Bus\Exception\InvalidHandler;
+use AwdStudio\Bus\HandlerLocator;
+use Psr\Container\ContainerInterface;
+
+/**
+ * @implements HandlerRegistry<callable(object $message, mixed ...$extraParams): mixed>
+ */
+final class PsrContainerHandlerRegistry implements HandlerRegistry
 {
+    /** @var \Psr\Container\ContainerInterface */
+    private $serviceLocator;
+
     /**
-     * Registers a handler from a PSR-container as a message handler.
+     * @var \AwdStudio\Bus\HandlerLocator
      *
-     * @param string $messageId
-     * @param string $handlerId
+     * @psalm-var   HandlerLocator<callable(object $message, mixed ...$extraParams): mixed>
+     * @phpstan-var HandlerLocator<callable(object $message, mixed ...$extraParams): mixed>
+     */
+    private $dynamicHandlers;
+
+    /**
+     * @var array
      *
-     * @throws \AwdStudio\Bus\Exception\InvalidHandler
+     * @psalm-var   array<class-string, array<array-key, string>>
+     * @phpstan-var array<class-string, array<array-key, string>>
+     */
+    private $containerHandlers;
+
+    /**
+     * @param \Psr\Container\ContainerInterface  $serviceLocator
+     * @param \AwdStudio\Bus\HandlerLocator|null $dynamicHandlers
      *
-     * @psalm-param   class-string $messageId
-     * @phpstan-param class-string $messageId
+     * @psalm-param   HandlerLocator<callable(object $message, mixed ...$extraParams): mixed>|null $dynamicHandlers
+     * @phpstan-param HandlerLocator<callable(object $message, mixed ...$extraParams): mixed>|null $dynamicHandlers
+     */
+    public function __construct(ContainerInterface $serviceLocator, ?HandlerLocator $dynamicHandlers = null)
+    {
+        $this->serviceLocator = $serviceLocator;
+        $this->dynamicHandlers = $dynamicHandlers ?? new InMemoryHandlerLocator();
+        $this->containerHandlers = [];
+    }
+
+    /**
+     * {@inheritdoc}
      */
-    public function register(string $messageId, string $handlerId): void;
+    public function register(string $messageId, string $handlerId): void
+    {
+        if (false === $this->serviceLocator->has($handlerId)) {
+            throw new InvalidHandler(
+                \sprintf('There is no registered services such a "%s" to handle a "%s" message', $handlerId, $messageId)
+            );
+        }
+
+        $this->containerHandlers[$messageId][] = $handlerId;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function add(string $messageId, callable $handler): void
+    {
+        $this->dynamicHandlers->add($messageId, $handler);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function has(string $messageId): bool
+    {
+        return $this->dynamicHandlers->has($messageId) || !empty($this->containerHandlers[$messageId]);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function get(string $messageId): \Traversable
+    {
+        if (true === $this->dynamicHandlers->has($messageId)) {
+            yield from $this->dynamicHandlers->get($messageId);
+        }
+
+        if (false === empty($this->containerHandlers[$messageId])) {
+            $array_unique = \array_unique($this->containerHandlers[$messageId]);
+            foreach ($array_unique as $handlerId) {
+                yield $this->serviceLocator->get($handlerId);
+            }
+        }
+    }
 }

src/Bus/Handlers.php → src/Bus/HandlerLocator.php

@@ -8,8 +8,22 @@
  * @psalm-template   TCallback of callable
  * @phpstan-template TCallback of callable
  */
-interface Handlers
+interface HandlerLocator
 {
+    /**
+     * Assigns a handler to a particular message.
+     *
+     * @param string   $messageId
+     * @param callable $handler
+     *
+     * @psalm-param   class-string $messageId
+     * @phpstan-param class-string $messageId
+     *
+     * @psalm-param   TCallback $handler
+     * @phpstan-param TCallback $handler
+     */
+    public function add(string $messageId, callable $handler): void;
+
     /**
      * Checks if there are handlers for particular message.
      *
@@ -27,13 +41,13 @@ public function has(string $messageId): bool;
      *
      * @param string $messageId
      *
-     * @return iterable<callable>|callable[]
+     * @return \Traversable<callable>|callable[]
      *
      * @psalm-param    class-string $messageId
      * @phpstan-param  class-string $messageId
      *
-     * @psalm-return   iterable<array-key, TCallback>
-     * @phpstan-return iterable<array-key, TCallback>
+     * @psalm-return   \Traversable<array-key, TCallback>
+     * @phpstan-return \Traversable<array-key, TCallback>
      */
-    public function get(string $messageId): iterable;
+    public function get(string $messageId): \Traversable;
 }

src/Bus/Middleware/MiddlewareChain.php

@@ -4,26 +4,26 @@
 
 namespace AwdStudio\Bus\Middleware;
 
-use AwdStudio\Bus\Handlers;
+use AwdStudio\Bus\HandlerLocator;
 use AwdStudio\Bus\Middleware;
 
 final class MiddlewareChain implements Middleware
 {
     /**
-     * @var \AwdStudio\Bus\Handlers
+     * @var \AwdStudio\Bus\HandlerLocator
      *
-     * @psalm-var   Handlers<callable(callable $next, object $message, mixed ...$extraParams): mixed>
-     * @phpstan-var Handlers<callable(callable $next, object $message, mixed ...$extraParams): mixed>
+     * @psalm-var   HandlerLocator<callable(callable $next, object $message, mixed ...$extraParams): mixed>
+     * @phpstan-var HandlerLocator<callable(callable $next, object $message, mixed ...$extraParams): mixed>
      */
     private $middleware;
 
     /**
-     * @param \AwdStudio\Bus\Handlers $handlers
+     * @param \AwdStudio\Bus\HandlerLocator $handlers
      *
-     * @psalm-param   Handlers<callable(callable $next, object $message, mixed ...$extraParams): mixed> $handlers
-     * @phpstan-param Handlers<callable(callable $next, object $message, mixed ...$extraParams): mixed> $handlers
+     * @psalm-param   HandlerLocator<callable(callable $next, object $message, mixed ...$extraParams): mixed> $handlers
+     * @phpstan-param HandlerLocator<callable(callable $next, object $message, mixed ...$extraParams): mixed> $handlers
      */
-    public function __construct(Handlers $handlers)
+    public function __construct(HandlerLocator $handlers)
     {
         $this->middleware = $handlers;
     }