fix: handle undefined message in Retryable catch blocks

Add defensive checks for message existence before attempting retry logic to prevent undefined variable errors if Retryable is thrown before Message object creation.

Author: ChiragAgg5k

src/Queue/Broker/AMQP.php

@@ -97,22 +97,27 @@ public function consume(Queue $queue, callable $messageCallback, callable $succe
                 /**
                  * Re-queue the job if max retries not exceeded.
                  */
-                $shouldRetry = $this->maxRetries === null || $message->getRetries() < $this->maxRetries;
-
-                if ($shouldRetry) {
-                    // Increment retry count and re-publish
-                    $messageData = $message->asArray();
-                    $messageData['retries'] = $message->getRetries() + 1;
-
-                    $newMessage = new AMQPMessage(
-                        json_encode($messageData),
-                        ['content_type' => 'application/json', 'delivery_mode' => AMQPMessage::DELIVERY_MODE_PERSISTENT]
-                    );
-
-                    $amqpMessage->getChannel()->basic_publish($newMessage, $queue->namespace, routing_key: $queue->name);
-                    $amqpMessage->ack();
+                if (isset($message)) {
+                    $shouldRetry = $this->maxRetries === null || $message->getRetries() < $this->maxRetries;
+
+                    if ($shouldRetry) {
+                        // Increment retry count and re-publish
+                        $messageData = $message->asArray();
+                        $messageData['retries'] = $message->getRetries() + 1;
+
+                        $newMessage = new AMQPMessage(
+                            json_encode($messageData),
+                            ['content_type' => 'application/json', 'delivery_mode' => AMQPMessage::DELIVERY_MODE_PERSISTENT]
+                        );
+
+                        $amqpMessage->getChannel()->basic_publish($newMessage, $queue->namespace, routing_key: $queue->name);
+                        $amqpMessage->ack();
+                    } else {
+                        // Max retries exceeded, send to dead-letter-exchange (failed queue)
+                        $amqpMessage->nack();
+                    }
                 } else {
-                    // Max retries exceeded, send to dead-letter-exchange (failed queue)
+                    // Message wasn't created yet, treat as non-retryable
                     $amqpMessage->nack();
                 }
 

src/Queue/Broker/Redis.php

@@ -70,23 +70,25 @@ public function consume(Queue $queue, callable $messageCallback, callable $succe
                 /**
                  * Re-queue the job if max retries not exceeded.
                  */
-                $shouldRetry = $this->maxRetries === null || $message->getRetries() < $this->maxRetries;
-
-                if ($shouldRetry) {
-                    // Increment retry count and re-queue
-                    $messageData = $message->asArray();
-                    $messageData['retries'] = $message->getRetries() + 1;
-                    $this->connection->leftPushArray("{$queue->namespace}.queue.{$queue->name}", $messageData);
-                } else {
-                    // Max retries exceeded, move to failed queue
-                    $this->connection->leftPush("{$queue->namespace}.failed.{$queue->name}", $message->getPid());
-                    $this->connection->increment("{$queue->namespace}.stats.{$queue->name}.failed");
+                if (isset($message)) {
+                    $shouldRetry = $this->maxRetries === null || $message->getRetries() < $this->maxRetries;
+
+                    if ($shouldRetry) {
+                        // Increment retry count and re-queue
+                        $messageData = $message->asArray();
+                        $messageData['retries'] = $message->getRetries() + 1;
+                        $this->connection->leftPushArray("{$queue->namespace}.queue.{$queue->name}", $messageData);
+                    } else {
+                        // Max retries exceeded, move to failed queue
+                        $this->connection->leftPush("{$queue->namespace}.failed.{$queue->name}", $message->getPid());
+                        $this->connection->increment("{$queue->namespace}.stats.{$queue->name}.failed");
+                    }
+
+                    // Remove job from jobs list in either case
+                    $this->connection->remove("{$queue->namespace}.jobs.{$queue->name}.{$message->getPid()}");
                 }
 
-                // Remove job from jobs list in either case
-                $this->connection->remove("{$queue->namespace}.jobs.{$queue->name}.{$message->getPid()}");
-
-                $errorCallback($message, $e);
+                $errorCallback($message ?? null, $e);
             } catch (\Throwable $th) {
                 /**
                  * Move failed Job to Failed list.