Merge pull request #28 from onliner/php8-update

Bump min PHP version to 8.0
onliner · Dec 20, 2023 · 0772d37 · 0772d37
2 parents 295f49a + fc6f659
commit 0772d37
Show file tree

Hide file tree

Showing 39 changed files with 290 additions and 413 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -8,7 +8,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        php: ['7.2', '7.3', '7.4', '8.0']
+        php: ['8.0', '8.1', '8.2', '8.3']
     name: PHP ${{ matrix.php }} Test on ${{ matrix.os }}
     steps:
       - name: Checkout
@@ -18,7 +18,6 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
-          extensions: curl
           coverage: none
 
       - name: Install dependencies

diff --git a/composer.json b/composer.json
@@ -5,14 +5,14 @@
     "keywords": ["command-bus", "command", "service-bus"],
     "license": "MIT",
     "require": {
-        "php": "^7.2 || ^8.0",
+        "php": "^8.0",
         "psr/container": "^1.0 || ^2.0",
         "psr/log": "^1.1 || ^2.0",
         "php-amqplib/php-amqplib": "^2.12 || ^3.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^8.5|^9.0",
-        "phpstan/phpstan": "^0.12.14"
+        "phpstan/phpstan": "^1.10"
     },
     "autoload": {
         "psr-4": {

diff --git a/src/Builder.php b/src/Builder.php
@@ -12,17 +12,17 @@ final class Builder
     /**
      * @var array<string, callable>
      */
-    private $handlers = [];
+    private array $handlers = [];
 
     /**
      * @var array<string, Middleware>
      */
-    private $middleware = [];
+    private array $middleware = [];
 
     /**
      * @var array<string, Extension>
      */
-    private $extensions = [];
+    private array $extensions = [];
 
     /**
      * @param string   $command

diff --git a/src/Context.php b/src/Context.php
@@ -4,53 +4,50 @@
 
 namespace Onliner\CommandBus;
 
-use Onliner\CommandBus\Message\MessageIterator;
+use Onliner\CommandBus\Message\DeferredIterator;
 
 final class Context
 {
-    /**
-     * @var Dispatcher
-     */
-    private $dispatcher;
-
-    /**
-     * @var MessageIterator
-     */
-    private $deferred;
+    private const OPTION_LOCAL = 'local';
 
     /**
-     * @var array<mixed>
+     * @param Dispatcher           $dispatcher
+     * @param DeferredIterator     $deferred
+     * @param array<string, mixed> $options
      */
-    private $options;
+    public function __construct(
+        private Dispatcher $dispatcher,
+        private DeferredIterator $deferred,
+        private array $options = []
+    ) {
+    }
 
     /**
-     * @internal
+     * @param object               $message
+     * @param array<string, mixed> $options
      *
-     * @param Dispatcher             $dispatcher
-     * @param MessageIterator<array> $deferred
-     * @param array<mixed>           $options
+     * @return void
      */
-    public function __construct(Dispatcher $dispatcher, MessageIterator $deferred, array $options = [])
+    public function dispatch(object $message, array $options = []): void
     {
-        $this->dispatcher = $dispatcher;
-        $this->deferred = $deferred;
-        $this->options = $options;
+        $this->dispatcher->dispatch($message, $options);
     }
 
     /**
-     * @param object       $message
-     * @param array<mixed> $options
-     *
+     * @param object               $message
+     * @param array<string, mixed> $options
      * @return void
      */
-    public function dispatch(object $message, array $options = []): void
+    public function execute(object $message, array $options = []): void
     {
-        $this->dispatcher->dispatch($message, $options);
+        $this->dispatcher->dispatch($message, array_replace($options, [
+            self::OPTION_LOCAL => true,
+        ]));
     }
 
     /**
-     * @param object       $message
-     * @param array<mixed> $options
+     * @param object               $message
+     * @param array<string, mixed> $options
      *
      * @return self
      */
@@ -62,7 +59,7 @@ public function defer(object $message, array $options = []): self
     }
 
     /**
-     * @return array<mixed>
+     * @return array<string, mixed>
      */
     public function all(): array
     {
@@ -85,7 +82,7 @@ public function has(string $option): bool
      *
      * @return mixed
      */
-    public function get(string $option, $default = null)
+    public function get(string $option, mixed $default = null): mixed
     {
         return $this->options[$option] ?? $default;
     }
@@ -96,7 +93,7 @@ public function get(string $option, $default = null)
      *
      * @return self
      */
-    public function set(string $option, $value): self
+    public function set(string $option, mixed $value): self
     {
         $this->options[$option] = $value;
 
@@ -114,4 +111,12 @@ public function del(string $option): self
 
         return $this;
     }
+
+    /**
+     * @return bool
+     */
+    public function isLocal(): bool
+    {
+        return $this->has(self::OPTION_LOCAL);
+    }
 }
diff --git a/src/Dispatcher.php b/src/Dispatcher.php
@@ -4,41 +4,33 @@
 
 namespace Onliner\CommandBus;
 
-use Onliner\CommandBus\Message\MessageIterator;
+use Onliner\CommandBus\Message\DeferredIterator;
 
 final class Dispatcher
 {
-    /**
-     * @var Resolver
-     */
-    private $resolver;
-
     /**
      * @param Resolver $resolver
      */
-    public function __construct(Resolver $resolver)
+    public function __construct(private Resolver $resolver)
     {
-        $this->resolver = $resolver;
     }
 
     /**
-     * @param object       $message
-     * @param array<mixed> $options
+     * @param object               $message
+     * @param array<string, mixed> $options
      *
      * @return void
      */
     public function dispatch(object $message, array $options = []): void
     {
         $handler = $this->resolver->resolve($message);
-        $deferred = new MessageIterator();
-        $context = new Context($this, $deferred, $options);
+        $iterator = new DeferredIterator();
+        $context = new Context($this, $iterator, $options);
 
         $handler($message, $context);
 
-        foreach ($deferred as $item) {
-            [$deferredMessage, $deferredOptions] = $item;
-
-            $this->dispatch($deferredMessage, $deferredOptions);
+        foreach ($iterator as $deferred) {
+            $this->dispatch($deferred->message, $deferred->options);
         }
     }
 }
diff --git a/src/Exception/InvalidHandlerException.php b/src/Exception/InvalidHandlerException.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Onliner\CommandBus\Exception;
+
+final class InvalidHandlerException extends CommandBusException
+{
+    public function __construct(string $class)
+    {
+        parent::__construct(sprintf('Handler for command "%s" must be callable.', $class));
+    }
+}
diff --git a/src/Exception/InvalidMessageException.php b/src/Exception/InvalidMessageException.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Onliner\CommandBus\Exception;
+
+final class InvalidMessageException extends CommandBusException
+{
+    public function __construct(string $class)
+    {
+        parent::__construct(sprintf('Invalid message for class "%s".', $class));
+    }
+}
diff --git a/src/Exception/UnknownHandlerException.php b/src/Exception/UnknownHandlerException.php
@@ -6,8 +6,8 @@
 
 final class UnknownHandlerException extends CommandBusException
 {
-    public static function forCommand(object $command): self
+    public function __construct(string $class)
     {
-        return new self(sprintf('Handler for command "%s" not found.', get_class($command)));
+        parent::__construct(sprintf('Handler for command "%s" not found.', $class));
     }
 }
diff --git a/src/Message/Deferred.php b/src/Message/Deferred.php
@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Onliner\CommandBus\Message;
+
+class Deferred
+{
+    /**
+     * @param object               $message
+     * @param array<string, mixed> $options
+     */
+    public function __construct(
+        public object $message,
+        public array $options,
+    ) {
+    }
+}
diff --git a/src/Message/MessageIterator.php → src/Message/DeferredIterator.php b/src/Message/MessageIterator.php → src/Message/DeferredIterator.php
@@ -8,30 +8,30 @@
 use IteratorAggregate;
 
 /**
- * @implements IteratorAggregate<array>
+ * @implements IteratorAggregate<Deferred>
  */
-class MessageIterator implements IteratorAggregate
+class DeferredIterator implements IteratorAggregate
 {
     /**
-     * @var array<array>
+     * @var array<Deferred>
      */
-    private $messages = [];
+    private array $messages = [];
 
     /**
-     * @param object       $message
-     * @param array<mixed> $options
+     * @param object               $message
+     * @param array<string, mixed> $options
      *
-     * @return self<array>
+     * @return self
      */
     public function append(object $message, array $options): self
     {
-        $this->messages[] = [$message, $options];
+        $this->messages[] = new Deferred($message, $options);
 
         return $this;
     }
 
     /**
-     * @return Generator<array>
+     * @return Generator<Deferred>
      */
     public function getIterator(): Generator
     {

diff --git a/src/Middleware/LoggerMiddleware.php b/src/Middleware/LoggerMiddleware.php
@@ -12,24 +12,12 @@
 
 final class LoggerMiddleware implements Middleware
 {
-    /**
-     * @var LoggerInterface
-     */
-    private $logger;
-
-    /**
-     * @var string
-     */
-    private $level;
-
     /**
      * @param LoggerInterface $logger
      * @param string          $level
      */
-    public function __construct(LoggerInterface $logger, string $level = LogLevel::ERROR)
+    public function __construct(private LoggerInterface $logger, private string $level = LogLevel::ERROR)
     {
-        $this->logger = $logger;
-        $this->level  = $level;
     }
 
     /**