[Messenger] Add types to private properties

Signed-off-by: Alexander M. Turek <[email protected]>

Author: derrabus

Transport/AmqpReceivedStamp.php

@@ -18,8 +18,8 @@
  */
 class AmqpReceivedStamp implements NonSendableStampInterface
 {
-    private $amqpEnvelope;
-    private $queueName;
+    private \AMQPEnvelope $amqpEnvelope;
+    private string $queueName;
 
     public function __construct(\AMQPEnvelope $amqpEnvelope, string $queueName)
     {

Transport/AmqpReceiver.php

@@ -27,8 +27,8 @@
  */
 class AmqpReceiver implements QueueReceiverInterface, MessageCountAwareInterface
 {
-    private $serializer;
-    private $connection;
+    private SerializerInterface $serializer;
+    private Connection $connection;
 
     public function __construct(Connection $connection, SerializerInterface $serializer = null)
     {

Transport/AmqpSender.php

@@ -26,8 +26,8 @@
  */
 class AmqpSender implements SenderInterface
 {
-    private $serializer;
-    private $connection;
+    private SerializerInterface $serializer;
+    private Connection $connection;
 
     public function __construct(Connection $connection, SerializerInterface $serializer = null)
     {

Transport/AmqpStamp.php

@@ -19,10 +19,10 @@
  */
 final class AmqpStamp implements NonSendableStampInterface
 {
-    private $routingKey;
-    private $flags;
-    private $attributes;
-    private $isRetryAttempt = false;
+    private ?string $routingKey;
+    private int $flags;
+    private array $attributes;
+    private bool $isRetryAttempt = false;
 
     public function __construct(string $routingKey = null, int $flags = \AMQP_NOPARAM, array $attributes = [])
     {

Transport/AmqpTransport.php

@@ -24,10 +24,10 @@
  */
 class AmqpTransport implements QueueReceiverInterface, TransportInterface, SetupableTransportInterface, MessageCountAwareInterface
 {
-    private $serializer;
-    private $connection;
-    private $receiver;
-    private $sender;
+    private SerializerInterface $serializer;
+    private Connection $connection;
+    private AmqpReceiver $receiver;
+    private AmqpSender $sender;
 
     public function __construct(Connection $connection, SerializerInterface $serializer = null)
     {

Transport/Connection.php

@@ -74,32 +74,21 @@ class Connection
         'arguments',
     ];
 
-    private $connectionOptions;
-    private $exchangeOptions;
-    private $queuesOptions;
-    private $amqpFactory;
-    private $autoSetupExchange;
-    private $autoSetupDelayExchange;
+    private array $connectionOptions;
+    private array $exchangeOptions;
+    private array $queuesOptions;
+    private AmqpFactory $amqpFactory;
+    private mixed $autoSetupExchange;
+    private mixed $autoSetupDelayExchange;
+    private \AMQPChannel $amqpChannel;
+    private \AMQPExchange $amqpExchange;
 
     /**
-     * @var \AMQPChannel|null
+     * @var \AMQPQueue[]
      */
-    private $amqpChannel;
+    private array $amqpQueues = [];
 
-    /**
-     * @var \AMQPExchange|null
-     */
-    private $amqpExchange;
-
-    /**
-     * @var \AMQPQueue[]|null
-     */
-    private $amqpQueues = [];
-
-    /**
-     * @var \AMQPExchange|null
-     */
-    private $amqpDelayExchange;
+    private \AMQPExchange $amqpDelayExchange;
 
     public function __construct(array $connectionOptions, array $exchangeOptions, array $queuesOptions, AmqpFactory $amqpFactory = null)
     {
@@ -367,7 +356,7 @@ private function setupDelay(int $delay, ?string $routingKey, bool $isRetryAttemp
 
     private function getDelayExchange(): \AMQPExchange
     {
-        if (null === $this->amqpDelayExchange) {
+        if (!isset($this->amqpDelayExchange)) {
             $this->amqpDelayExchange = $this->amqpFactory->createExchange($this->channel());
             $this->amqpDelayExchange->setName($this->connectionOptions['delay']['exchange_name']);
             $this->amqpDelayExchange->setType(\AMQP_EX_TYPE_DIRECT);
@@ -483,7 +472,7 @@ public function getQueueNames(): array
 
     public function channel(): \AMQPChannel
     {
-        if (null === $this->amqpChannel) {
+        if (!isset($this->amqpChannel)) {
             $connection = $this->amqpFactory->createConnection($this->connectionOptions);
             $connectMethod = 'true' === ($this->connectionOptions['persistent'] ?? 'false') ? 'pconnect' : 'connect';
 
@@ -531,7 +520,7 @@ public function queue(string $queueName): \AMQPQueue
 
     public function exchange(): \AMQPExchange
     {
-        if (null === $this->amqpExchange) {
+        if (!isset($this->amqpExchange)) {
             $this->amqpExchange = $this->amqpFactory->createExchange($this->channel());
             $this->amqpExchange->setName($this->exchangeOptions['name']);
             $this->amqpExchange->setType($this->exchangeOptions['type'] ?? \AMQP_EX_TYPE_FANOUT);
@@ -548,10 +537,8 @@ public function exchange(): \AMQPExchange
     private function clearWhenDisconnected(): void
     {
         if (!$this->channel()->isConnected()) {
-            $this->amqpChannel = null;
+            unset($this->amqpChannel, $this->amqpExchange, $this->amqpDelayExchange);
             $this->amqpQueues = [];
-            $this->amqpExchange = null;
-            $this->amqpDelayExchange = null;
         }
     }