From 65aeef8f0d28ee3eb4cf853aa4ba57f59e7dff57 Mon Sep 17 00:00:00 2001 From: pky Date: Fri, 21 Feb 2025 10:14:38 +0400 Subject: [PATCH] type hint for php 8.4 --- src/AmqpConsumer.php | 2 +- src/AmqpMessage.php | 14 +++++++------- src/AmqpQueue.php | 2 +- src/Impl/AmqpMessage.php | 24 ++++++++++++------------ src/Impl/AmqpQueue.php | 4 ++-- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/AmqpConsumer.php b/src/AmqpConsumer.php index 0dc8d3c..8367219 100644 --- a/src/AmqpConsumer.php +++ b/src/AmqpConsumer.php @@ -20,7 +20,7 @@ interface AmqpConsumer extends Consumer const FLAG_EXCLUSIVE = 4; const FLAG_NOWAIT = 8; - public function setConsumerTag(string $consumerTag = null): void; + public function setConsumerTag(?string $consumerTag = null): void; public function getConsumerTag(): ?string; diff --git a/src/AmqpMessage.php b/src/AmqpMessage.php index ee1b77d..e8ac908 100644 --- a/src/AmqpMessage.php +++ b/src/AmqpMessage.php @@ -14,11 +14,11 @@ interface AmqpMessage extends Message const FLAG_MANDATORY = 1; const FLAG_IMMEDIATE = 2; - public function setContentType(string $type = null): void; + public function setContentType(?string $type = null): void; public function getContentType(): ?string; - public function setContentEncoding(string $encoding = null): void; + public function setContentEncoding(?string $encoding = null): void; public function getContentEncoding(): ?string; @@ -26,15 +26,15 @@ public function setDeliveryMode(int $deliveryMode = null): void; public function getDeliveryMode(): ?int; - public function setPriority(int $priority = null): void; + public function setPriority(?int $priority = null): void; public function getPriority(): ?int; - public function setExpiration(int $expiration = null): void; + public function setExpiration(?int $expiration = null): void; public function getExpiration(): ?int; - public function setDeliveryTag(int $deliveryTag = null): void; + public function setDeliveryTag(?int $deliveryTag = null): void; /** * https://www.rabbitmq.com/amqp-0-9-1-reference.html#domain.delivery-tag @@ -43,7 +43,7 @@ public function getDeliveryTag(): ?int; public function getConsumerTag(): ?string; - public function setConsumerTag(string $consumerTag = null): void; + public function setConsumerTag(?string $consumerTag = null): void; public function clearFlags(): void; @@ -55,5 +55,5 @@ public function setFlags(int $flags): void; public function getRoutingKey(): ?string ; - public function setRoutingKey(string $routingKey = null): void; + public function setRoutingKey(?string $routingKey = null): void; } diff --git a/src/AmqpQueue.php b/src/AmqpQueue.php index 49b3f7d..dd98fb4 100644 --- a/src/AmqpQueue.php +++ b/src/AmqpQueue.php @@ -28,5 +28,5 @@ public function getArgument(string $key); public function getConsumerTag(): ?string; - public function setConsumerTag(string $consumerTag = null): void; + public function setConsumerTag(?string $consumerTag = null): void; } diff --git a/src/Impl/AmqpMessage.php b/src/Impl/AmqpMessage.php index d15c99a..9e64ab4 100644 --- a/src/Impl/AmqpMessage.php +++ b/src/Impl/AmqpMessage.php @@ -125,7 +125,7 @@ public function isRedelivered(): bool return $this->redelivered; } - public function setCorrelationId(string $correlationId = null): void + public function setCorrelationId(?string $correlationId = null): void { $this->setHeader('correlation_id', $correlationId); } @@ -135,7 +135,7 @@ public function getCorrelationId(): ?string return $this->getHeader('correlation_id'); } - public function setMessageId(string $messageId = null): void + public function setMessageId(?string $messageId = null): void { $this->setHeader('message_id', $messageId); } @@ -152,12 +152,12 @@ public function getTimestamp(): ?int return $value === null ? null : (int) $value; } - public function setTimestamp(int $timestamp = null): void + public function setTimestamp(?int $timestamp = null): void { $this->setHeader('timestamp', $timestamp); } - public function setReplyTo(string $replyTo = null): void + public function setReplyTo(?string $replyTo = null): void { $this->setHeader('reply_to', $replyTo); } @@ -167,7 +167,7 @@ public function getReplyTo(): ?string return $this->getHeader('reply_to'); } - public function setContentType(string $type = null): void + public function setContentType(?string $type = null): void { $this->setHeader('content_type', $type); } @@ -177,7 +177,7 @@ public function getContentType(): ?string return $this->getHeader('content_type'); } - public function setContentEncoding(string $encoding = null): void + public function setContentEncoding(?string $encoding = null): void { $this->setHeader('content_encoding', $encoding); } @@ -192,12 +192,12 @@ public function getPriority(): ?int return $this->getHeader('priority'); } - public function setPriority(int $priority = null): void + public function setPriority(?int $priority = null): void { $this->setHeader('priority', $priority); } - public function setDeliveryMode(int $deliveryMode = null): void + public function setDeliveryMode(?int $deliveryMode = null): void { $this->setHeader('delivery_mode', $deliveryMode); } @@ -207,7 +207,7 @@ public function getDeliveryMode(): ?int return $this->getHeader('delivery_mode'); } - public function setExpiration(int $expiration = null): void + public function setExpiration(?int $expiration = null): void { // expiration is a string // https://www.rabbitmq.com/amqp-0-9-1-reference.html#domain.shortstr @@ -227,7 +227,7 @@ public function getDeliveryTag(): ?int return $this->deliveryTag; } - public function setDeliveryTag(int $deliveryTag = null): void + public function setDeliveryTag(?int $deliveryTag = null): void { $this->deliveryTag = $deliveryTag; } @@ -237,7 +237,7 @@ public function getConsumerTag(): ?string return $this->consumerTag; } - public function setConsumerTag(string $consumerTag = null): void + public function setConsumerTag(?string $consumerTag = null): void { $this->consumerTag = $consumerTag; } @@ -267,7 +267,7 @@ public function getRoutingKey(): ?string return $this->routingKey; } - public function setRoutingKey(string $routingKey = null): void + public function setRoutingKey(?string $routingKey = null): void { $this->routingKey = $routingKey; } diff --git a/src/Impl/AmqpQueue.php b/src/Impl/AmqpQueue.php index d62dab9..5fe1f7e 100644 --- a/src/Impl/AmqpQueue.php +++ b/src/Impl/AmqpQueue.php @@ -45,7 +45,7 @@ public function getConsumerTag(): ?string return $this->consumerTag; } - public function setConsumerTag(string $consumerTag = null): void + public function setConsumerTag(?string $consumerTag = null): void { $this->consumerTag = $consumerTag; } @@ -85,7 +85,7 @@ public function setArgument(string $key, $value): void $this->arguments[$key] = $value; } - public function getArgument(string $key, $default = null) + public function getArgument(?string $key, $default = null) { return array_key_exists($key, $this->arguments) ? $this->arguments[$key] : $default; }