Update to PHP8 (#13)

Author: zloyuser

composer.json

@@ -5,13 +5,13 @@
     "keywords": ["command-bus", "command", "service-bus", "laravel"],
     "license": "MIT",
     "require": {
-        "php": "^7.2 || ^8.0",
+        "php": "^8.0",
         "ext-ctype": "*",
         "ext-posix": "*",
         "ext-pcntl": "*",
-        "illuminate/support": ">=5.8",
-        "illuminate/console": ">=5.8",
-        "onliner/command-bus": "^0.4"
+        "illuminate/support": ">=6.0",
+        "illuminate/console": ">=6.0",
+        "onliner/command-bus": "^1.0"
     },
     "autoload": {
         "psr-4": {

src/Console/CommandBusProcessCommand.php

@@ -19,10 +19,7 @@ class CommandBusProcessCommand extends Command
     protected $name = 'commands:process';
     protected $description = '';
 
-    /**
-     * @var Consumer|AMQPConsumer
-     */
-    private $consumer;
+    private ?Consumer $consumer = null;
 
     /**
      * @return array<array>
@@ -98,11 +95,7 @@ private function subscribeSignals(): void
 
         foreach ([SIGINT, SIGTERM] as $signal) {
             pcntl_signal($signal, function () {
-                if (!$this->consumer) {
-                    return;
-                }
-
-                $this->consumer->stop();
+                $this->consumer?->stop();
             });
         }
     }

src/Factory/SerializerFactory.php

@@ -19,11 +19,9 @@ class SerializerFactory
      */
     public static function create(string $type, array $options = []): Serializer
     {
-        switch ($type) {
-            case 'native':
-                return new Serializer\NativeSerializer();
-            default:
-                throw new Exception\UnknownSerializerException($type);
-        }
+        return match ($type) {
+            'native' => new Serializer\NativeSerializer(),
+            default => throw new Exception\UnknownSerializerException($type),
+        };
     }
 }

src/Factory/TransportFactory.php

@@ -14,17 +14,11 @@ class TransportFactory
 {
     public const DEFAULT = 'memory://memory';
 
-    /**
-     * @var Container
-     */
-    private $container;
-
     /**
      * @param Container $container
      */
-    public function __construct(Container $container)
+    public function __construct(private Container $container)
     {
-        $this->container = $container;
     }
 
     /**
@@ -41,7 +35,7 @@ public function default(): Transport
      *
      * @return Transport
      */
-    public function create(string $key, $config): Transport
+    public function create(string $key, string|array $config): Transport
     {
         if (is_array($config) && array_key_exists('url', $config)) {
             return $this->createFromUrl($config['url'], $config['options'] ?? []);
@@ -72,13 +66,10 @@ public function create(string $key, $config): Transport
      */
     private function createFromUrl(string $url, array $options = []): Transport
     {
-        switch (parse_url($url, PHP_URL_SCHEME)) {
-            case 'amqp':
-                return AMQPTransport::create($url, $options);
-            case 'memory':
-                return new Transport\MemoryTransport();
-            default:
-                throw new Exception\BadTransportException($url);
-        }
+        return match (parse_url($url, PHP_URL_SCHEME)) {
+            'amqp' => AMQPTransport::create($url, $options),
+            'memory' => new Transport\MemoryTransport(),
+            default => throw new Exception\BadTransportException($url),
+        };
     }
 }

src/Providers/CommandBusProvider.php

@@ -172,9 +172,7 @@ private function registerTransportConnection(string $key, $config): string
     {
         $name = sprintf('onliner.commandbus.transport.%s', $key);
 
-        $this->app->singleton($name, function (Container $app) use ($key, $config) {
-            return (new TransportFactory($app))->create($key, $config);
-        });
+        $this->app->singleton($name, fn(Container $app) => (new TransportFactory($app))->create($key, $config));
 
         return $name;
     }