From 4a6ec8554e475f2ae219e1467d7622e35fc19e5e Mon Sep 17 00:00:00 2001
From: Tobias Schultze <webmaster@tubo-world.de>
Date: Thu, 24 Oct 2019 23:51:16 +0200
Subject: [PATCH] [Messenger] remove nullable max retries

---
 .../Messenger/Retry/MultiplierRetryStrategy.php        |  8 ++------
 .../Tests/Retry/MultiplierRetryStrategyTest.php        | 10 ----------
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/src/Symfony/Component/Messenger/Retry/MultiplierRetryStrategy.php b/src/Symfony/Component/Messenger/Retry/MultiplierRetryStrategy.php
index c5ddebb787..5a4ec9a6b8 100644
--- a/src/Symfony/Component/Messenger/Retry/MultiplierRetryStrategy.php
+++ b/src/Symfony/Component/Messenger/Retry/MultiplierRetryStrategy.php
@@ -38,12 +38,12 @@ class MultiplierRetryStrategy implements RetryStrategyInterface
     private $maxDelayMilliseconds;
 
     /**
-     * @param int   $maxRetries           The maximum number of time to retry (null means indefinitely)
+     * @param int   $maxRetries           The maximum number of times to retry
      * @param int   $delayMilliseconds    Amount of time to delay (or the initial value when multiplier is used)
      * @param float $multiplier           Multiplier to apply to the delay each time a retry occurs
      * @param int   $maxDelayMilliseconds Maximum delay to allow (0 means no maximum)
      */
-    public function __construct(?int $maxRetries = 3, int $delayMilliseconds = 1000, float $multiplier = 1, int $maxDelayMilliseconds = 0)
+    public function __construct(int $maxRetries = 3, int $delayMilliseconds = 1000, float $multiplier = 1, int $maxDelayMilliseconds = 0)
     {
         $this->maxRetries = $maxRetries;
 
@@ -65,10 +65,6 @@ class MultiplierRetryStrategy implements RetryStrategyInterface
 
     public function isRetryable(Envelope $message): bool
     {
-        if (null === $this->maxRetries) {
-            return true;
-        }
-
         $retries = RedeliveryStamp::getRetryCountFromEnvelope($message);
 
         return $retries < $this->maxRetries;
diff --git a/src/Symfony/Component/Messenger/Tests/Retry/MultiplierRetryStrategyTest.php b/src/Symfony/Component/Messenger/Tests/Retry/MultiplierRetryStrategyTest.php
index 433590d7fc..e9c6c0bc75 100644
--- a/src/Symfony/Component/Messenger/Tests/Retry/MultiplierRetryStrategyTest.php
+++ b/src/Symfony/Component/Messenger/Tests/Retry/MultiplierRetryStrategyTest.php
@@ -26,16 +26,6 @@ class MultiplierRetryStrategyTest extends TestCase
         $this->assertTrue($strategy->isRetryable($envelope));
     }
 
-    public function testIsRetryableWithNullMax()
-    {
-        $strategy = new MultiplierRetryStrategy(null);
-        $envelope = new Envelope(new \stdClass(), [new RedeliveryStamp(0, 'sender_alias')]);
-        $this->assertTrue($strategy->isRetryable($envelope));
-
-        $envelope = new Envelope(new \stdClass(), [new RedeliveryStamp(1, 'sender_alias')]);
-        $this->assertTrue($strategy->isRetryable($envelope));
-    }
-
     public function testIsNotRetryable()
     {
         $strategy = new MultiplierRetryStrategy(3);