Added Fiber support in lieu of coroutines.

Author: Bilge

.github/workflows/CI.yml .github/workflows/Tests.yaml

@@ -1,8 +1,9 @@
-name: CI
+name: Tests
 
 on:
   push:
   pull_request:
+  workflow_dispatch:
   schedule:
     - cron: 0 6 * * *
 
@@ -14,9 +15,8 @@ jobs:
       fail-fast: false
       matrix:
         php:
-          - 7.4
-          - 8.0
           - 8.1
+          - 8.2
         dependencies:
           - hi
           - lo
@@ -49,7 +49,7 @@ jobs:
 
       - name: Upload test coverage
         run: |
-          composer global require php-coveralls/php-coveralls:^2
+          composer global require php-coveralls/php-coveralls
           php-coveralls -v
         env:
           COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}

README.md

@@ -12,16 +12,16 @@ Provides exception handlers for [Retry][Retry].
 Requirements
 ------------
 
-- [PHP 5.5](http://php.net/)
+- [PHP 8.1](http://php.net/)
 - [Composer](https://getcomposer.org/)
 
 
   [Releases]: https://github.com/ScriptFUSION/Retry-exception-handlers/releases
   [Version image]: https://poser.pugx.org/scriptfusion/retry-exception-handlers/v/stable "Latest version"
   [Downloads]: https://packagist.org/packages/scriptfusion/retry-exception-handlers
   [Downloads image]: https://poser.pugx.org/scriptfusion/retry-exception-handlers/downloads "Total downloads"
-  [Build]: http://travis-ci.org/ScriptFUSION/Retry-exception-handlers
-  [Build image]: https://travis-ci.org/ScriptFUSION/Retry-exception-handlers.svg "Build status"
+  [Build]: https://github.com/ScriptFUSION/Retry-exception-handlers/actions/workflows/Tests.yaml
+  [Build image]: https://github.com/ScriptFUSION/Retry-exception-handlers/actions/workflows/Tests.yaml/badge.svg "Build status"
   [Coverage]: https://coveralls.io/github/ScriptFUSION/Retry-exception-handlers
   [Coverage image]: https://coveralls.io/repos/ScriptFUSION/Retry-exception-handlers/badge.svg "Test coverage"
   [Style]: https://styleci.io/repos/76198855

composer.json

@@ -8,12 +8,13 @@
     }
   ],
   "require": {
-    "php": "^7.2|^8",
-    "scriptfusion/retry": "^1|^2|^3"
+    "php": "^8.1",
+    "scriptfusion/retry": "^1|^2|^3|^4"
   },
   "require-dev": {
-    "phpunit/phpunit": "^9.5",
-    "amphp/amp": "^2.1"
+    "amphp/amp": "^3-beta.9",
+    "phpunit/phpunit": "^9.5.23",
+    "revolt/event-loop": "^0.2"
   },
   "autoload": {
     "psr-4": {
@@ -27,5 +28,8 @@
   },
   "scripts": {
     "test": "phpunit -c test"
+  },
+  "config": {
+    "sort-packages": true
   }
 }

src/AsyncExponentialBackoffExceptionHandler.php

@@ -12,13 +12,11 @@
  */
 class AsyncExponentialBackoffExceptionHandler extends AsyncMilliSleepExceptionHandler
 {
-    const DEFAULT_COEFFICIENT = 102;
+    public const DEFAULT_COEFFICIENT = 102;
 
-    private $millisecondCoefficient;
-
-    public function __construct(int $millisecondCoefficient = self::DEFAULT_COEFFICIENT)
+    public function __construct(private readonly int $millisecondCoefficient = self::DEFAULT_COEFFICIENT)
     {
-        parent::__construct($this->generateSequence($this->millisecondCoefficient = $millisecondCoefficient));
+        parent::__construct($this->generateSequence($this->millisecondCoefficient));
     }
 
     private function generateSequence($coefficient): \Generator

src/AsyncMilliSleepExceptionHandler.php

@@ -3,27 +3,24 @@
 
 namespace ScriptFUSION\Retry\ExceptionHandler;
 
-use Amp\Delayed;
+use function Amp\delay;
 
 /**
  * Delays the current asynchronous execution context for a series of millisecond delays on each invocation.
  */
 class AsyncMilliSleepExceptionHandler
 {
-    private $delays;
-
-    public function __construct(\Iterator $delays)
+    public function __construct(private readonly \Iterator $delays)
     {
-        $this->delays = $delays;
     }
 
-    public function __invoke()
+    public function __invoke(): void
     {
         // TODO: Iterator validation. i.e. What happens when the iterator is no longer valid?
         $delay = $this->delays->current();
 
         $this->delays->next();
 
-        return new Delayed($delay);
+        delay($delay / 1000);
     }
 }

src/ExponentialBackoffExceptionHandler.php

@@ -12,18 +12,14 @@
  */
 class ExponentialBackoffExceptionHandler extends MicroSleepExceptionHandler
 {
-    const DEFAULT_COEFFICIENT = 102000;
+    public const DEFAULT_COEFFICIENT = 102000;
 
-    private $microTimeCoefficient;
-
-    public function __construct($microTimeCoefficient = self::DEFAULT_COEFFICIENT)
+    public function __construct(private readonly int $microTimeCoefficient = self::DEFAULT_COEFFICIENT)
     {
-        parent::__construct($this->generateSequence(
-            $this->microTimeCoefficient = $microTimeCoefficient | 0
-        ));
+        parent::__construct($this->generateSequence($this->microTimeCoefficient));
     }
 
-    private function generateSequence($coefficient): \Generator
+    private function generateSequence(int $coefficient): \Generator
     {
         foreach (new PowersOfTwoSequence as $base) {
             yield $base * $coefficient;

src/MicroSleepExceptionHandler.php

@@ -8,14 +8,11 @@
  */
 class MicroSleepExceptionHandler
 {
-    private $delays;
-
-    public function __construct(\Iterator $delays)
+    public function __construct(private readonly \Iterator $delays)
     {
-        $this->delays = $delays;
     }
 
-    public function __invoke()
+    public function __invoke(): void
     {
         usleep($this->delays->current());
 

src/Sequence/PowersOfTwoSequence.php

@@ -10,7 +10,7 @@
  */
 final class PowersOfTwoSequence implements \IteratorAggregate
 {
-    private $power = 0;
+    private int $power = 0;
 
     public function getIterator(): \Traversable
     {

test/Unit/AsyncExponentialBackoffExceptionHandlerTest.php

@@ -5,23 +5,24 @@
 
 use PHPUnit\Framework\TestCase;
 use ScriptFUSION\Retry\ExceptionHandler\AsyncExponentialBackoffExceptionHandler;
+use function Amp\async;
 
 /**
  * @see AsyncExponentialBackoffExceptionHandler
  */
 final class AsyncExponentialBackoffExceptionHandlerTest extends TestCase
 {
-    public function test()
+    public function test(): void
     {
         $handler = new AsyncExponentialBackoffExceptionHandler;
 
         $start = microtime(true);
 
-        \Amp\Loop::run(static function () use ($handler): \Generator {
+        async(static function () use ($handler): void {
             for ($counter = 0; $counter < 4; ++$counter) {
-                yield $handler();
+                $handler();
             }
-        });
+        })->await();
 
         self::assertGreaterThan($start + 1.499, microtime(true));
     }

test/Unit/AsyncMilliSleepExceptionHandlerTest.php

@@ -5,38 +5,37 @@
 
 use PHPUnit\Framework\TestCase;
 use ScriptFUSION\Retry\ExceptionHandler\AsyncMilliSleepExceptionHandler;
+use function Amp\async;
 
 /**
  * @see AsyncMilliSleepExceptionHandler
  */
 final class AsyncMilliSleepExceptionHandlerTest extends TestCase
 {
-    public function testValue()
+    public function testValue(): void
     {
         $handler = new AsyncMilliSleepExceptionHandler(new \ArrayIterator([1000]));
 
         $start = microtime(true);
 
-        \Amp\Loop::run(static function () use ($handler): \Generator {
-            yield $handler();
-        });
+        async(fn () => $handler())->await();
 
         self::assertGreaterThan($start + .999, microtime(true));
     }
 
-    public function testSeries()
+    public function testSeries(): void
     {
         $handler = new AsyncMilliSleepExceptionHandler(
-            new \ArrayIterator($delays = array_fill(0, $limit = 10, 100))
+            new \ArrayIterator(array_fill(0, $limit = 10, 100))
         );
 
         $start = microtime(true);
 
-        \Amp\Loop::run(static function () use ($handler, $limit): \Generator {
+        async(static function () use ($handler, $limit): void {
             for ($counter = 0; $counter < $limit; ++$counter) {
-                yield $handler();
+                $handler();
             }
-        });
+        })->await();
 
         self::assertGreaterThan($start + .999, microtime(true));
     }

test/Unit/ExponentialBackoffExceptionHandlerTest.php

@@ -11,7 +11,7 @@
  */
 final class ExponentialBackoffExceptionHandlerTest extends TestCase
 {
-    public function test()
+    public function test(): void
     {
         $handler = new ExponentialBackoffExceptionHandler;
 

test/Unit/MicroSleepExceptionHandlerTest.php

@@ -8,7 +8,7 @@
 
 final class MicroSleepExceptionHandlerTest extends TestCase
 {
-    public function testValue()
+    public function testValue(): void
     {
         $handler = new MicroSleepExceptionHandler(new \ArrayIterator([1000000]));
 
@@ -18,7 +18,7 @@ public function testValue()
         self::assertGreaterThan($start + 1, microtime(true));
     }
 
-    public function testSeries()
+    public function testSeries(): void
     {
         $handler = new MicroSleepExceptionHandler(new \ArrayIterator($delays = array_fill(0, $limit = 10, 100000)));
 

test/Unit/Sequence/PowersOfTwoSequenceTest.php

@@ -14,7 +14,7 @@ final class PowersOfTwoSequenceTest extends TestCase
     /**
      * Tests that the iterator yields the expected sequence values.
      */
-    public function testSequence()
+    public function testSequence(): void
     {
         $powers = new \LimitIterator((new PowersOfTwoSequence)->getIterator(), 0, 6);
 
@@ -24,7 +24,7 @@ public function testSequence()
     /**
      * Tests that the iterator will not yield values forever.
      */
-    public function testIsFiniteSequence()
+    public function testIsFiniteSequence(): void
     {
         $counter = 0;
         foreach (new \LimitIterator((new PowersOfTwoSequence)->getIterator(), 0, $limit = 100) as $_) {