[Messenger] remove nullable max retries

This commit is contained in:
Tobias Schultze 2019-10-24 23:51:16 +02:00
parent c5024bdbd0
commit 4a6ec8554e
2 changed files with 2 additions and 16 deletions

View File

@ -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;

View File

@ -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);