Merge pull request #9 from kler/php7ErrorSupport

Handle PHP 7 Error / Throwable
stechstudio · May 12, 2020 · 9509275 · 9509275
2 parents 88b9a4a + 0ec1e78
commit 9509275
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git a/src/Backoff.php b/src/Backoff.php
@@ -239,6 +239,12 @@ public function run($callback)
             $this->wait($attempt);
             try {
                 $result = call_user_func($callback);
+            } catch (\Throwable $e) {
+                if ($e instanceof \Error) {
+                    $e = new Exception($e->getMessage(), $e->getCode(), $e);
+                }
+                $this->exceptions[] = $e;
+                $exception = $e;
             } catch (Exception $e) {
                 $this->exceptions[] = $e;
                 $exception = $e;

diff --git a/tests/BackoffTest.php b/tests/BackoffTest.php
@@ -1,6 +1,7 @@
 <?php
 namespace STS\Backoff;
 
+use Exception;
 use PHPUnit\Framework\TestCase;
 use STS\Backoff\Strategies\ConstantStrategy;
 use STS\Backoff\Strategies\ExponentialStrategy;
@@ -189,6 +190,23 @@ public function testFailedWorkReThrowsException()
         });
     }
 
+    public function testHandleErrorsPhp7()
+    {
+        $b = new Backoff(2, new ConstantStrategy(0));
+
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage("Modulo by zero");
+
+        $b->run(function () {
+            if (version_compare(PHP_VERSION, '7.0.0') >= 0) {
+                return 1 % 0;
+            } else {
+                // Handle version < 7
+                throw new Exception("Modulo by zero");
+            }
+        });
+    }
+
     public function testAttempts()
     {
         $b = new Backoff(10, new ConstantStrategy(0));