Upgrade/php8.4 (#324)

* upgrade PHP version to 8.4

* try ubuntu 24 on CI/CD

* add explicit nullables

.github/workflows/continous-integration.yml

@@ -11,7 +11,7 @@ jobs:
         ports:
           - 5672:5672
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     strategy:
       matrix:
         php-versions: ['7.3', '7.4', '8.0']
@@ -56,10 +56,10 @@ jobs:
         ports:
           - 5672:5672
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     strategy:
       matrix:
-        php-versions: ['8.1', '8.2', '8.3']
+        php-versions: ['8.1', '8.2', '8.3', '8.4']
 
     steps:
     - uses: actions/checkout@v4

CHANGELOG.md

@@ -5,6 +5,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+## [v2.5.0]
+### Added
+- Support PHP 8.4
+
 ## [v2.4.0]
 ### Added
 - Support for Laravel 11

Dockerfile

@@ -1,4 +1,4 @@
-FROM php:8.3-fpm-alpine
+FROM php:8.4-fpm-alpine
 
 COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
 RUN apk --no-cache --update add libmemcached-dev zlib-dev libpng-dev libjpeg-turbo-dev freetype-dev libxml2-dev

src/Drivers/Driver.php

@@ -49,7 +49,7 @@ public function exchange(string $name, string $type = 'direct'): PublisherContra
         return new Publisher($this->app, $this, $name);
     }
 
-    public function routing(string $name = null): PublisherContract
+    public function routing(?string $name = null): PublisherContract
     {
         $exchange = $this->app['config']['pigeon.exchange'];
         $type = $this->app['config']['pigeon.exchange_type'];

src/Drivers/DriverContract.php

@@ -15,9 +15,9 @@ public function events(string $event = '*'): ConsumerContract;
 
     public function dispatch(string $eventName, array $event, array $meta = []): void;
 
-    public function routing(string $name): PublisherContract;
+    public function routing(?string $name): PublisherContract;
 
     public function getConnection();
 
-    public function getChannel(int $id = null);
+    public function getChannel(?int $id = null);
 }

src/Drivers/RabbitDriver.php

@@ -25,7 +25,7 @@ public function getConnection()
         return $this->connection;
     }
 
-    public function getChannel(int $id = null): AMQPChannel
+    public function getChannel(?int $id = null): AMQPChannel
     {
         return $this->getConnection()->channel($id);
     }

src/Exceptions/Driver/NullDriverException.php

@@ -7,7 +7,7 @@
 
 class NullDriverException extends Exception
 {
-    public function __construct($message = 'Cannot use [NULL] driver', $code = 0, Throwable $previous = null)
+    public function __construct($message = 'Cannot use [NULL] driver', $code = 0, ?Throwable $previous = null)
     {
         parent::__construct($message, $code, $previous);
     }

src/Exceptions/Events/EmptyEventException.php

@@ -7,7 +7,7 @@
 
 class EmptyEventException extends Exception
 {
-    public function __construct($message = 'Cannot dispatch empty event', $code = 0, Throwable $previous = null)
+    public function __construct($message = 'Cannot dispatch empty event', $code = 0, ?Throwable $previous = null)
     {
         parent::__construct($message, $code, $previous);
     }

src/Facade/Pigeon.php

@@ -9,7 +9,7 @@
  * Class Pigeon.
  *
  * @method static \Convenia\Pigeon\Drivers\Driver driver(string $driver)
- * @method static \Convenia\Pigeon\Publisher\PublisherContract routing(string $name = null)
+ * @method static \Convenia\Pigeon\Publisher\PublisherContract routing(?string $name = null)
  * @method static \Convenia\Pigeon\Publisher\PublisherContract exchange(string $name, string $type = 'direct')
  * @method static \Convenia\Pigeon\Publisher\PublisherContract dispatch(string $eventName, array $event, array $meta = [])
  * @method static \Convenia\Pigeon\Consumer\ConsumerContract queue(string $name, array $properties = [])

src/MessageProcessor/MessageProcessor.php

@@ -15,7 +15,7 @@ class MessageProcessor implements MessageProcessorContract
     protected $fallback;
     protected $driver;
 
-    public function __construct(DriverContract $driver, Closure $callback, Closure $fallback = null)
+    public function __construct(DriverContract $driver, Closure $callback, ?Closure $fallback = null)
     {
         $this->driver = $driver;
         $this->callback = $callback;

src/MessageProcessor/MessageProcessorContract.php

@@ -8,7 +8,7 @@
 
 interface MessageProcessorContract
 {
-    public function __construct(DriverContract $driver, Closure $callback, Closure $fallback = null);
+    public function __construct(DriverContract $driver, Closure $callback, ?Closure $fallback = null);
 
     public function process(AMQPMessage $message);
 }

src/Publisher/Publisher.php

@@ -38,7 +38,7 @@ public function bind(string $queue): PublisherContract
         return $this;
     }
 
-    public function publish(array $message, array $properties = [], int $channelId = null)
+    public function publish(array $message, array $properties = [], ?int $channelId = null)
     {
         $msg = $this->makeMessage($message, $properties);
         $this->driver->getChannel($channelId)->basic_publish(

src/Resolver/Resolver.php

@@ -25,7 +25,7 @@ public function reject(bool $requeue = true)
             ->basic_nack($this->message->delivery_info['delivery_tag'], false, $requeue);
     }
 
-    public function headers(string $key = null)
+    public function headers(?string $key = null)
     {
         return is_null($key)
             ? $this->message->get_properties()

src/Resolver/ResolverContract.php

@@ -8,5 +8,5 @@ public function ack();
 
     public function reject(bool $requeue = true);
 
-    public function headers(string $key = null);
+    public function headers(?string $key = null);
 }

src/Support/Testing/PigeonFake.php

@@ -31,7 +31,7 @@ public function __construct($app)
         $this->events = new Collection();
     }
 
-    public function assertConsuming(string $queue, int $timeout = null, bool $multiple = null)
+    public function assertConsuming(string $queue, ?int $timeout = null, ?bool $multiple = null)
     {
         $comsumer = $this->consumers->get($queue);
 
@@ -57,7 +57,7 @@ public function assertConsuming(string $queue, int $timeout = null, bool $multip
         }
     }
 
-    public function assertConsumingEvent(string $event, int $timeout = null, bool $multiple = null)
+    public function assertConsumingEvent(string $event, ?int $timeout = null, ?bool $multiple = null)
     {
         $comsumer = $this->consumers->get($event);
 
@@ -191,7 +191,7 @@ public function exchange(string $name, string $type = 'direct'): PublisherContra
         return new Publisher($this->app, $this, $name);
     }
 
-    public function routing(string $name): PublisherContract
+    public function routing(?string $name = null): PublisherContract
     {
         $exchange = $this->app['config']['pigeon.exchange'];
         $publisher = (new Publisher($this->app, $this, $exchange))->routing($name);
@@ -274,7 +274,7 @@ public function getConnection()
     /**
      * @codeCoverageIgnore
      */
-    public function getChannel(int $id = null)
+    public function getChannel(?int $id = null)
     {
         return $this;
     }