Fix retry sequence issue

lstrojny · lstrojny · commit dabe126a435e · 2021-03-05T16:44:49.000+01:00
Instead of using the number of retries as a limit, it was used as an
offset, cutting off the first n elements of the sequence instead of
limiting the sequence to n (where "n" is the number of retries).
diff --git a/src/Functional/Retry.php b/src/Functional/Retry.php
@@ -36,7 +36,7 @@ function retry(callable $callback, $retries, Traversable $delaySequence = null)
         $delays = new AppendIterator();
         $delays->append(new InfiniteIterator($delaySequence));
         $delays->append(new InfiniteIterator(new ArrayIterator([0])));
-        $delays = new LimitIterator($delays, $retries);
+        $delays = new LimitIterator($delays, 0, $retries);
     } else {
         $delays = \array_fill_keys(\range(0, $retries), 0);
     }
diff --git a/tests/Functional/RetryTest.php b/tests/Functional/RetryTest.php
@@ -139,17 +139,17 @@ public function testDelayerSmallerThanRetries()
         $this->retryer
             ->expects($this->at(2))
             ->method('retry')
-            ->with(2, 10)
+            ->with(2, 30)
             ->willThrowException(new Exception('third'));
         $this->retryer
             ->expects($this->at(3))
             ->method('retry')
-            ->with(3, 20)
+            ->with(3, 10)
             ->willThrowException(new Exception('four'));
 
         $this->expectException('Exception');
 
         $this->expectExceptionMessage('four');
-        retry([$this->retryer, 'retry'], 4, new ArrayIterator([1 => 10, 2 => 20]));
+        retry([$this->retryer, 'retry'], 4, new ArrayIterator([10, 20, 30]));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ function retry(callable $callback, $retries, Traversable $delaySequence = null)`
`36`	`36`	`$delays = new AppendIterator();`
`37`	`37`	`$delays->append(new InfiniteIterator($delaySequence));`
`38`	`38`	`$delays->append(new InfiniteIterator(new ArrayIterator([0])));`
`39`		`- $delays = new LimitIterator($delays, $retries);`
	`39`	`+ $delays = new LimitIterator($delays, 0, $retries);`
`40`	`40`	`} else {`
`41`	`41`	`$delays = \array_fill_keys(\range(0, $retries), 0);`
`42`	`42`	`}`