Merge pull request #24 from Jeckel-Lab/feature/upgrade-to-jeckel-lab-contract

Feature/upgrade to jeckel lab contract

Author: jeckel

composer.json

@@ -22,7 +22,8 @@
   "require": {
     "php": "^7.2",
     "psr/event-dispatcher": "^1.0",
-    "psr/container": "^1.0"
+    "psr/container": "^1.0",
+    "jeckel-lab/contract": "0.1"
   },
   "require-dev": {
     "phpunit/phpunit": "^8.4",

src/Command/CommandInterface.php

@@ -9,16 +9,16 @@
 
 namespace JeckelLab\CommandDispatcher\CommandBus;
 
-use JeckelLab\CommandDispatcher\Command\CommandInterface;
-use JeckelLab\CommandDispatcher\CommandHandler\CommandHandlerInterface;
-use JeckelLab\CommandDispatcher\CommandResponse\CommandResponseInterface;
 use JeckelLab\CommandDispatcher\Resolver\CommandHandlerResolverInterface;
+use JeckelLab\Contract\Core\CommandDispatcher\Command\Command;
+use JeckelLab\Contract\Core\CommandDispatcher\CommandBus\CommandBus;
+use JeckelLab\Contract\Core\CommandDispatcher\CommandResponse\CommandResponse;
 
 /**
  * Class CommandDispatcher
  * @package JeckelLab\CommandDispatcher\CommandBus
  */
-class CommandDispatcher implements CommandBusInterface
+class CommandDispatcher implements CommandBus
 {
     /**
      * @var CommandHandlerResolverInterface
@@ -36,18 +36,13 @@ public function __construct(
     }
 
     /**
-     * @param CommandInterface $command
-     * @return CommandResponseInterface
+     * @param Command $command
+     * @return CommandResponse
      * @SuppressWarnings(PHPMD.IfStatementAssignment)
      */
-    public function dispatch(CommandInterface $command): CommandResponseInterface
+    public function dispatch(Command $command): CommandResponse
     {
-        /** @var CommandHandlerInterface $handler */
         $handler = $this->resolver->resolve($command);
-
-        /** @var CommandResponseInterface $response */
-        $response = $handler($command);
-
-        return $response;
+        return $handler($command);
     }
 }

src/CommandBus/CommandBusInterface.php

@@ -9,38 +9,39 @@
 
 namespace JeckelLab\CommandDispatcher\CommandBus;
 
-use JeckelLab\CommandDispatcher\Command\CommandInterface;
-use JeckelLab\CommandDispatcher\CommandResponse\CommandResponseInterface;
+use JeckelLab\Contract\Core\CommandDispatcher\Command\Command;
+use JeckelLab\Contract\Core\CommandDispatcher\CommandBus\CommandBus;
+use JeckelLab\Contract\Core\CommandDispatcher\CommandResponse\CommandResponse;
 use Psr\EventDispatcher\EventDispatcherInterface;
 
 /**
  * Class EventDispatcherDecorator
  * @package JeckelLab\CommandDispatcher\CommandBus
  */
-class EventDispatcherDecorator implements CommandBusInterface
+class EventDispatcherDecorator implements CommandBus
 {
     /** @var EventDispatcherInterface */
     protected $eventDispatcher;
 
-    /** @var CommandBusInterface */
+    /** @var CommandBus */
     protected $next;
 
     /**
      * EventDispatcherDecorator constructor.
      * @param EventDispatcherInterface     $eventDispatcher
-     * @param CommandBusInterface $next
+     * @param CommandBus $next
      */
-    public function __construct(EventDispatcherInterface $eventDispatcher, CommandBusInterface $next)
+    public function __construct(EventDispatcherInterface $eventDispatcher, CommandBus $next)
     {
         $this->eventDispatcher = $eventDispatcher;
         $this->next = $next;
     }
 
     /**
-     * @param CommandInterface $command
-     * @return CommandResponseInterface
+     * @param Command $command
+     * @return CommandResponse
      */
-    public function dispatch(CommandInterface $command): CommandResponseInterface
+    public function dispatch(Command $command): CommandResponse
     {
         $response = $this->next->dispatch($command);
 

src/CommandBus/CommandDispatcher.php

@@ -1,23 +1,25 @@
 <?php
-declare(strict_types=1);
+
 /**
  * @author Julien Mercier-Rojas <julien@jeckel-lab.fr>
  * Created at : 27/10/2019
  */
 
+declare(strict_types=1);
+
 namespace JeckelLab\CommandDispatcher;
 
-use JeckelLab\CommandDispatcher\Command\CommandInterface;
-use JeckelLab\CommandDispatcher\CommandHandler\CommandHandlerInterface;
-use JeckelLab\CommandDispatcher\CommandResponse\CommandResponseInterface;
 use JeckelLab\CommandDispatcher\Resolver\CommandHandlerResolverInterface;
+use JeckelLab\Contract\Core\CommandDispatcher\Command\Command;
+use JeckelLab\Contract\Core\CommandDispatcher\CommandBus\CommandBus;
+use JeckelLab\Contract\Core\CommandDispatcher\CommandResponse\CommandResponse;
 use Psr\EventDispatcher\EventDispatcherInterface;
 
 /**
  * Class CommandDispatcher
  * @package JeckelLab\CommandDispatcher
  */
-class CommandDispatcher implements CommandDispatcherInterface
+class CommandDispatcher implements CommandBus
 {
     /**
      * @var CommandHandlerResolverInterface
@@ -43,16 +45,13 @@ public function __construct(
     }
 
     /**
-     * @param CommandInterface $command
-     * @return CommandResponseInterface
+     * @param Command $command
+     * @return CommandResponse
      * @SuppressWarnings(PHPMD.IfStatementAssignment)
      */
-    public function dispatch(CommandInterface $command): CommandResponseInterface
+    public function dispatch(Command $command): CommandResponse
     {
-        /** @var CommandHandlerInterface $handler */
         $handler = $this->resolver->resolve($command);
-
-        /** @var CommandResponseInterface $response */
         $response = $handler($command);
 
         if (null !== $this->eventDispatcher && null !== ($events = $response->getEvents())) {

src/CommandBus/EventDispatcherDecorator.php

@@ -1,28 +1,30 @@
 <?php
-declare(strict_types=1);
+
 /**
  * @author Julien Mercier-Rojas <julien@jeckel-lab.fr>
  * Created at : 14/11/2019
  */
 
+declare(strict_types=1);
+
 namespace JeckelLab\CommandDispatcher\CommandHandler;
 
-use JeckelLab\CommandDispatcher\Command\CommandInterface;
-use JeckelLab\CommandDispatcher\CommandResponse\CommandResponse;
-use JeckelLab\CommandDispatcher\CommandResponse\CommandResponseInterface;
 use JeckelLab\CommandDispatcher\Exception\InvalidCommandException;
+use JeckelLab\Contract\Core\CommandDispatcher\Command\Command;
+use JeckelLab\Contract\Core\CommandDispatcher\CommandHandler\CommandHandler;
+use JeckelLab\Contract\Core\CommandDispatcher\CommandResponse\CommandResponse;
 
 /**
  * Class CommandHandlerAbstract
  * @package JeckelLab\CommandDispatcher\CommandHandler
  */
-abstract class CommandHandlerAbstract implements CommandHandlerInterface
+abstract class CommandHandlerAbstract implements CommandHandler
 {
     /**
-     * @param CommandInterface $command
+     * @param Command $command
      * @throws InvalidCommandException
      */
-    protected function validateCommand(CommandInterface $command): void
+    protected function validateCommand(Command $command): void
     {
         foreach (static::getHandledCommands() as $handledCommand) {
             if ($command instanceof $handledCommand) {
@@ -36,23 +38,19 @@ protected function validateCommand(CommandInterface $command): void
     }
 
     /**
-     * @param CommandInterface $command
-     * @return CommandResponseInterface
+     * @param Command $command
+     * @return CommandResponse
      */
-    public function __invoke(CommandInterface $command): CommandResponseInterface
+    public function __invoke(Command $command): CommandResponse
     {
         $this->validateCommand($command);
 
-        return $this->process($command, new CommandResponse());
+        return $this->process($command);
     }
 
     /**
-     * @param CommandInterface         $command
-     * @param CommandResponseInterface $commandResponse
-     * @return CommandResponseInterface
+     * @param Command $command
+     * @return CommandResponse
      */
-    abstract protected function process(
-        CommandInterface $command,
-        CommandResponseInterface $commandResponse
-    ): CommandResponseInterface;
+    abstract protected function process(Command $command): CommandResponse;
 }

src/CommandDispatcher.php

@@ -7,9 +7,13 @@
 
 namespace JeckelLab\CommandDispatcher\CommandResponse;
 
+use JeckelLab\Contract\Core\CommandDispatcher\CommandResponse\CommandResponse as CommandResponseInterface;
+use JeckelLab\Contract\Domain\Event\Event;
+
 /**
  * Class CommandResponse
  * @package JeckelLab\CommandDispatcher\CommandResponse
+ * @psalm-immutable
  */
 class CommandResponse implements CommandResponseInterface
 {
@@ -19,7 +23,7 @@ class CommandResponse implements CommandResponseInterface
     /**
      * CommandResponseAbstract constructor.
      * @param bool                 $ack
-     * @param iterable<mixed>|null $events
+     * @param iterable<Event>|null $events
      *
      * @SuppressWarnings(PHPMD.BooleanArgumentFlag)
      */