symfony
diff --git a/‎src/Symfony/Component/Messenger/EventListener/SendFailedMessageForRetryListener.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Messenger/EventListener/SendFailedMessageForRetryListener.php
+2-2Lines changed: 2 additions & 2 deletions b/‎src/Symfony/Component/Messenger/EventListener/SendFailedMessageForRetryListener.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Messenger/EventListener/SendFailedMessageForRetryListener.php
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎src/Symfony/Component/Messenger/Tests/EventListener/SendFailedMessageForRetryListenerTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Messenger/Tests/EventListener/SendFailedMessageForRetryListenerTest.php
+25-7Lines changed: 25 additions & 7 deletions b/‎src/Symfony/Component/Messenger/Tests/EventListener/SendFailedMessageForRetryListenerTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Messenger/Tests/EventListener/SendFailedMessageForRetryListenerTest.php
+25-7Lines changed: 25 additions & 7 deletions
@@ -158,8 +158,8 @@ private function getWaitingTime(Envelope $envelope, \Throwable $throwable, Retry
                 }
             }
 
-            if (\count($delays) > 0) {
-                $delay = min(array_filter($delays));
+            if ($delays = array_filter($delays, fn ($delay) => null !== $delay)) {
+                $delay = min($delays);
             }
         }
 
 
@@ -109,15 +109,18 @@ public function testRecoverableExceptionRetryDelayOverridesStrategy()
         $listener->onMessageFailed($event);
     }
 
-    public function testWrappedRecoverableExceptionRetryDelayOverridesStrategy()
+    /**
+     * @dataProvider provideRetryDelays
+     */
+    public function testWrappedRecoverableExceptionRetryDelayOverridesStrategy(array $retries, int $expectedDelay)
     {
         $sender = $this->createMock(SenderInterface::class);
-        $sender->expects($this->once())->method('send')->willReturnCallback(function (Envelope $envelope) {
+        $sender->expects($this->once())->method('send')->willReturnCallback(function (Envelope $envelope) use ($expectedDelay) {
             $delayStamp = $envelope->last(DelayStamp::class);
             $redeliveryStamp = $envelope->last(RedeliveryStamp::class);
 
             $this->assertInstanceOf(DelayStamp::class, $delayStamp);
-            $this->assertSame(1234, $delayStamp->getDelay());
+            $this->assertSame($expectedDelay, $delayStamp->getDelay());
 
             $this->assertInstanceOf(RedeliveryStamp::class, $redeliveryStamp);
             $this->assertSame(1, $redeliveryStamp->getRetryCount());
@@ -137,16 +140,31 @@ public function testWrappedRecoverableExceptionRetryDelayOverridesStrategy()
         $envelope = new Envelope(new \stdClass());
         $exception = new HandlerFailedException(
             $envelope,
-            [
-                new RecoverableMessageHandlingException('retry', retryDelay: 1235),
-                new RecoverableMessageHandlingException('retry', retryDelay: 1234),
-            ]
+            array_map(fn (int $retry) => new RecoverableMessageHandlingException('retry', retryDelay: $retry), $retries)
         );
         $event = new WorkerMessageFailedEvent($envelope, 'my_receiver', $exception);
 
         $listener->onMessageFailed($event);
     }
 
+    public static function provideRetryDelays(): iterable
+    {
+        yield 'one_exception' => [
+            [1235],
+            1235,
+        ];
+
+        yield 'multiple_exceptions' => [
+            [1235, 2000, 1000],
+            1000,
+        ];
+
+        yield 'zero_delay' => [
+            [0, 2000, 1000],
+            0,
+        ];
+    }
+
     public function testEnvelopeIsSentToTransportOnRetry()
     {
         $exception = new \Exception('no!');
Original file line number	Diff line number	Diff line change
`@@ -158,8 +158,8 @@ private function getWaitingTime(Envelope $envelope, \Throwable $throwable, Retry`
`158`	`158`	`}`
`159`	`159`	`}`
`160`	`160`
`161`		`- if (\count($delays) > 0) {`
`162`		`- $delay = min(array_filter($delays));`
	`161`	`+ if ($delays = array_filter($delays, fn ($delay) => null !== $delay)) {`
	`162`	`+ $delay = min($delays);`
`163`	`163`	`}`
`164`	`164`	`}`
`165`	`165`