Merge branch '5.4' into 6.2

* 5.4: [Validator] Add missing validator translations in Polish language [HttpClient] Fix encoding some characters in query strings [FrameworkBundle] Ignore missing directories in about command Revert "[Messenger] Respect `isRetryable` decision of the retry strategy when deciding if failed message should be re-delivered"
symfony · Jun 21, 2023 · 32cfe1e · 32cfe1e
2 parents 6e74955 + e3ba2b2
commit 32cfe1e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 26 deletions.
diff --git a/EventListener/SendFailedMessageForRetryListener.php b/EventListener/SendFailedMessageForRetryListener.php
@@ -117,8 +117,7 @@ public static function getSubscribedEvents(): array
 
     private function shouldRetry(\Throwable $e, Envelope $envelope, RetryStrategyInterface $retryStrategy): bool
     {
-        $isRetryable = $retryStrategy->isRetryable($envelope, $e);
-        if ($isRetryable && $e instanceof RecoverableExceptionInterface) {
+        if ($e instanceof RecoverableExceptionInterface) {
             return true;
         }
 
@@ -127,7 +126,7 @@ private function shouldRetry(\Throwable $e, Envelope $envelope, RetryStrategyInt
         if ($e instanceof HandlerFailedException) {
             $shouldNotRetry = true;
             foreach ($e->getNestedExceptions() as $nestedException) {
-                if ($isRetryable && $nestedException instanceof RecoverableExceptionInterface) {
+                if ($nestedException instanceof RecoverableExceptionInterface) {
                     return true;
                 }
 
@@ -145,7 +144,7 @@ private function shouldRetry(\Throwable $e, Envelope $envelope, RetryStrategyInt
             return false;
         }
 
-        return $isRetryable;
+        return $retryStrategy->isRetryable($envelope, $e);
     }
 
     private function getRetryStrategyForTransport(string $alias): ?RetryStrategyInterface

diff --git a/Tests/EventListener/SendFailedMessageForRetryListenerTest.php b/Tests/EventListener/SendFailedMessageForRetryListenerTest.php
@@ -63,7 +63,7 @@ public function testRecoverableStrategyCausesRetry()
         $senderLocator->expects($this->once())->method('has')->willReturn(true);
         $senderLocator->expects($this->once())->method('get')->willReturn($sender);
         $retryStategy = $this->createMock(RetryStrategyInterface::class);
-        $retryStategy->expects($this->once())->method('isRetryable')->willReturn(true);
+        $retryStategy->expects($this->never())->method('isRetryable');
         $retryStategy->expects($this->once())->method('getWaitingTime')->willReturn(1000);
         $retryStrategyLocator = $this->createMock(ContainerInterface::class);
         $retryStrategyLocator->expects($this->once())->method('has')->willReturn(true);
@@ -78,27 +78,6 @@ public function testRecoverableStrategyCausesRetry()
         $listener->onMessageFailed($event);
     }
 
-    public function testRetryIsOnlyAllowedWhenPermittedByRetryStrategy()
-    {
-        $senderLocator = $this->createMock(ContainerInterface::class);
-        $senderLocator->expects($this->never())->method('has');
-        $senderLocator->expects($this->never())->method('get');
-        $retryStrategy = $this->createMock(RetryStrategyInterface::class);
-        $retryStrategy->expects($this->once())->method('isRetryable')->willReturn(false);
-        $retryStrategy->expects($this->never())->method('getWaitingTime');
-        $retryStrategyLocator = $this->createMock(ContainerInterface::class);
-        $retryStrategyLocator->expects($this->once())->method('has')->willReturn(true);
-        $retryStrategyLocator->expects($this->once())->method('get')->willReturn($retryStrategy);
-
-        $listener = new SendFailedMessageForRetryListener($senderLocator, $retryStrategyLocator);
-
-        $exception = new RecoverableMessageHandlingException('retry');
-        $envelope = new Envelope(new \stdClass());
-        $event = new WorkerMessageFailedEvent($envelope, 'my_receiver', $exception);
-
-        $listener->onMessageFailed($event);
-    }
-
     public function testEnvelopeIsSentToTransportOnRetry()
     {
         $exception = new \Exception('no!');