From 3810053f4de4631b06961f431ef35b821a05facc Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@qossmic.com>
Date: Sun, 22 Oct 2023 10:38:08 +0200
Subject: [PATCH] declare constructor argument as optional for backwards
 compatibility

---
 .../Messenger/Exception/DelayedMessageHandlingException.php | 6 +++---
 src/Symfony/Component/Messenger/Worker.php                  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Symfony/Component/Messenger/Exception/DelayedMessageHandlingException.php b/src/Symfony/Component/Messenger/Exception/DelayedMessageHandlingException.php
index 3baafda76e3b..5ca6408c1eb4 100644
--- a/src/Symfony/Component/Messenger/Exception/DelayedMessageHandlingException.php
+++ b/src/Symfony/Component/Messenger/Exception/DelayedMessageHandlingException.php
@@ -22,9 +22,9 @@
 class DelayedMessageHandlingException extends RuntimeException
 {
     private array $exceptions;
-    private Envelope $envelope;
+    private ?Envelope $envelope;
 
-    public function __construct(array $exceptions, Envelope $envelope)
+    public function __construct(array $exceptions, Envelope $envelope = null)
     {
         $this->envelope = $envelope;
 
@@ -49,7 +49,7 @@ public function getExceptions(): array
         return $this->exceptions;
     }
 
-    public function getEnvelope(): Envelope
+    public function getEnvelope(): ?Envelope
     {
         return $this->envelope;
     }
diff --git a/src/Symfony/Component/Messenger/Worker.php b/src/Symfony/Component/Messenger/Worker.php
index 103dbf5d93e7..25d57d5954ab 100644
--- a/src/Symfony/Component/Messenger/Worker.php
+++ b/src/Symfony/Component/Messenger/Worker.php
@@ -187,7 +187,7 @@ private function ack(): bool
                     $receiver->reject($envelope);
                 }
 
-                if ($e instanceof HandlerFailedException || $e instanceof DelayedMessageHandlingException) {
+                if ($e instanceof HandlerFailedException || ($e instanceof DelayedMessageHandlingException && null !== $e->getEnvelope())) {
                     $envelope = $e->getEnvelope();
                 }