From b7b59bdfa957f074b95a726b99a5c7cd8e0b8f85 Mon Sep 17 00:00:00 2001 From: Leonardo Lemos Date: Mon, 13 Jan 2025 10:51:38 -0300 Subject: [PATCH] add explicit nullables --- src/Drivers/DriverContract.php | 4 ++-- src/Drivers/RabbitDriver.php | 2 +- src/Exceptions/Driver/NullDriverException.php | 2 +- src/Exceptions/Events/EmptyEventException.php | 2 +- src/Facade/Pigeon.php | 2 +- src/MessageProcessor/MessageProcessor.php | 2 +- src/MessageProcessor/MessageProcessorContract.php | 2 +- src/Publisher/Publisher.php | 2 +- src/Resolver/Resolver.php | 2 +- src/Resolver/ResolverContract.php | 2 +- src/Support/Testing/PigeonFake.php | 8 ++++---- 11 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/Drivers/DriverContract.php b/src/Drivers/DriverContract.php index 009b6b1..d8425ed 100644 --- a/src/Drivers/DriverContract.php +++ b/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); } diff --git a/src/Drivers/RabbitDriver.php b/src/Drivers/RabbitDriver.php index 291146e..fa23cc1 100644 --- a/src/Drivers/RabbitDriver.php +++ b/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); } diff --git a/src/Exceptions/Driver/NullDriverException.php b/src/Exceptions/Driver/NullDriverException.php index 3aa7b79..fa0b3fc 100644 --- a/src/Exceptions/Driver/NullDriverException.php +++ b/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); } diff --git a/src/Exceptions/Events/EmptyEventException.php b/src/Exceptions/Events/EmptyEventException.php index 2a444b7..89d36cf 100644 --- a/src/Exceptions/Events/EmptyEventException.php +++ b/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); } diff --git a/src/Facade/Pigeon.php b/src/Facade/Pigeon.php index 83edd6e..1623624 100644 --- a/src/Facade/Pigeon.php +++ b/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 = []) diff --git a/src/MessageProcessor/MessageProcessor.php b/src/MessageProcessor/MessageProcessor.php index 981adbb..e5596f3 100644 --- a/src/MessageProcessor/MessageProcessor.php +++ b/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; diff --git a/src/MessageProcessor/MessageProcessorContract.php b/src/MessageProcessor/MessageProcessorContract.php index 797d0ff..8902e3a 100644 --- a/src/MessageProcessor/MessageProcessorContract.php +++ b/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); } diff --git a/src/Publisher/Publisher.php b/src/Publisher/Publisher.php index d51d216..b31f9d9 100644 --- a/src/Publisher/Publisher.php +++ b/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( diff --git a/src/Resolver/Resolver.php b/src/Resolver/Resolver.php index 8539104..e8d08d2 100644 --- a/src/Resolver/Resolver.php +++ b/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() diff --git a/src/Resolver/ResolverContract.php b/src/Resolver/ResolverContract.php index c08b2ac..3687b86 100644 --- a/src/Resolver/ResolverContract.php +++ b/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); } diff --git a/src/Support/Testing/PigeonFake.php b/src/Support/Testing/PigeonFake.php index a88fc9b..87dd9bc 100644 --- a/src/Support/Testing/PigeonFake.php +++ b/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; }