Added attempts and tries to exception handler callback.

ScriptFUSION · Jun 25, 2019 · 1ade9bf · 1ade9bf
1 parent 68633ae
commit 1ade9bf
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/src/retry.php b/src/retry.php
@@ -41,7 +41,7 @@ function retry($tries, callable $operation, callable $onError = null)
             }
 
             if ($onError) {
-                if (($result = $onError($exception)) instanceof Promise) {
+                if (($result = $onError($exception, $attempts, $tries)) instanceof Promise) {
                     $result = yield $result;
                 }
 

diff --git a/test/RetryAsyncTest.php b/test/RetryAsyncTest.php
@@ -104,14 +104,16 @@ public function testErrorCallbackAsync()
         $outerException = $innerException = null;
 
         try {
-            \ScriptFUSION\Retry\retryAsync($tries = 3, static function () use (&$invocations, &$innerException) {
+            \ScriptFUSION\Retry\retryAsync($tries = 2, static function () use (&$invocations, &$innerException) {
                 ++$invocations;
 
                 throw $innerException = new \RuntimeException;
-            }, function (\Exception $exception) use (&$innerException, &$errors) {
+            }, static function (\Exception $exception, int $attempts, int $tries) use (&$innerException, &$errors) {
                 ++$errors;
 
                 self::assertSame($innerException, $exception);
+                self::assertSame(1, $attempts);
+                self::assertSame(2, $tries);
             });
         } catch (FailingTooHardException $outerException) {
         }

diff --git a/test/RetryTest.php b/test/RetryTest.php
@@ -74,6 +74,10 @@ public function testFailingTooHard()
         self::assertSame($tries, $invocations);
     }
 
+    /**
+     * Tests that an error callback receives the exception thrown by the operation, the current attempt and maximum
+     * number of attempts.
+     */
     public function testErrorCallback()
     {
         $invocations = $errors = 0;
@@ -84,10 +88,12 @@ public function testErrorCallback()
                 ++$invocations;
 
                 throw $innerException = new \RuntimeException;
-            }, function (\Exception $exception) use (&$innerException, &$errors) {
+            }, static function (\Exception $exception, int $attempts, int $tries) use (&$innerException, &$errors) {
                 ++$errors;
 
                 self::assertSame($innerException, $exception);
+                self::assertSame(1, $attempts);
+                self::assertSame(2, $tries);
             });
         } catch (FailingTooHardException $outerException) {
         }