Added PHP 8 support.

Dropped PHP <7.2 support.

Author: Bilge

.travis.yml

@@ -1,14 +1,13 @@
 notifications:
   email: false
 
-sudo: false
-
 language: php
 
 php:
-  - 7.0
-  - 7.1
   - 7.2
+  - 7.3
+  - 7.4
+  - 8.0
 
 env:
   matrix:
@@ -23,12 +22,11 @@ cache:
     - vendor
 
 install:
-  - alias composer=composer\ -n && composer selfupdate
   - composer validate
   - composer update --no-progress --no-suggest $DEPENDENCIES
 
 script:
-  - composer test -- --coverage-clover=build/logs/clover.xml
+  - XDEBUG_MODE=coverage composer test -- --coverage-clover=build/logs/clover.xml
 
 after_success:
   - composer require php-coveralls/php-coveralls:^2

composer.json

@@ -13,10 +13,10 @@
     }
   ],
   "require": {
-    "php": "^7"
+    "php": "^7.2|^8"
   },
   "require-dev": {
-    "phpunit/phpunit": "^4.8",
+    "phpunit/phpunit": "^8.5|^9",
     "amphp/amp": "^2.1"
   },
   "autoload": {

test/RetryAsyncTest.php

@@ -4,9 +4,12 @@
 use Amp\Delayed;
 use Amp\Promise;
 use Amp\Success;
+use PHPUnit\Framework\TestCase;
 use ScriptFUSION\Retry\FailingTooHardException;
+use function Amp\Promise\wait;
+use function ScriptFUSION\Retry\retryAsync;
 
-final class RetryAsyncTest extends \PHPUnit_Framework_TestCase
+final class RetryAsyncTest extends TestCase
 {
     /**
      * Tests that a successful promise is returned without retrying.
@@ -15,8 +18,8 @@ public function testWithoutFailingAsync()
     {
         $invocations = 0;
 
-        $value = \Amp\Promise\wait(
-            \ScriptFUSION\Retry\retryAsync($tries = 1, static function () use (&$invocations) {
+        $value = wait(
+            retryAsync($tries = 1, static function () use (&$invocations) {
                 ++$invocations;
 
                 return new Delayed(0, 'foo');
@@ -35,8 +38,8 @@ public function testFailingOnceAsync()
         $invocations = 0;
         $failed = false;
 
-        $value = \Amp\Promise\wait(
-            \ScriptFUSION\Retry\retryAsync($tries = 2, static function () use (&$invocations, &$failed) {
+        $value = wait(
+            retryAsync($tries = 2, static function () use (&$invocations, &$failed) {
                 ++$invocations;
 
                 if (!$failed) {
@@ -61,8 +64,8 @@ public function testZeroTriesAsync()
     {
         $invocations = 0;
 
-        $value = \Amp\Promise\wait(
-            \ScriptFUSION\Retry\retryAsync($tries = 0, static function () use (&$invocations) {
+        $value = wait(
+            retryAsync($tries = 0, static function () use (&$invocations) {
                 ++$invocations;
 
                 return new Delayed(0, 'foo');
@@ -82,7 +85,7 @@ public function testFailingTooHardAsync()
         $outerException = $innerException = null;
 
         try {
-            \ScriptFUSION\Retry\retryAsync($tries = 3, static function () use (&$invocations, &$innerException) {
+            retryAsync($tries = 3, static function () use (&$invocations, &$innerException) {
                 ++$invocations;
 
                 throw $innerException = new \RuntimeException;
@@ -104,7 +107,7 @@ public function testErrorCallbackAsync()
         $outerException = $innerException = null;
 
         try {
-            \ScriptFUSION\Retry\retryAsync($tries = 2, static function () use (&$invocations, &$innerException) {
+            retryAsync($tries = 2, static function () use (&$invocations, &$innerException) {
                 ++$invocations;
 
                 throw $innerException = new \RuntimeException;
@@ -132,8 +135,8 @@ public function testPromiseErrorCallback()
         $start = microtime(true);
 
         try {
-            \Amp\Promise\wait(
-                \ScriptFUSION\Retry\retryAsync($tries = 3, static function () {
+            wait(
+                retryAsync($tries = 3, static function () {
                     throw new \DomainException;
                 }, static function () use ($delay): Promise {
                     return new Delayed($delay);
@@ -154,7 +157,7 @@ public function testErrorCallbackHaltAsync()
     {
         $invocations = 0;
 
-        \ScriptFUSION\Retry\retryAsync(2, static function () use (&$invocations) {
+        retryAsync(2, static function () use (&$invocations) {
             ++$invocations;
 
             throw new \RuntimeException;
@@ -172,7 +175,7 @@ public function testPromiseErrorCallbackHaltAsync()
     {
         $invocations = 0;
 
-        \ScriptFUSION\Retry\retryAsync(2, static function () use (&$invocations) {
+        retryAsync(2, static function () use (&$invocations) {
             ++$invocations;
 
             throw new \RuntimeException;
@@ -188,9 +191,9 @@ public function testPromiseErrorCallbackHaltAsync()
      */
     public function testErrorCallbackCanThrow()
     {
-        $this->setExpectedException(\LogicException::class);
+        $this->expectException(\LogicException::class);
 
-        \ScriptFUSION\Retry\retryAsync(2, static function () {
+        retryAsync(2, static function () {
             throw new \RuntimeException;
         }, static function () {
             throw new \LogicException;

test/RetryTest.php

@@ -1,15 +1,17 @@
 <?php
 namespace ScriptFUSIONTest\Retry;
 
+use PHPUnit\Framework\TestCase;
 use ScriptFUSION\Retry\FailingTooHardException;
+use function ScriptFUSION\Retry\retry;
 
-final class RetryTest extends \PHPUnit_Framework_TestCase
+final class RetryTest extends TestCase
 {
     public function testWithoutFailing()
     {
         $invocations = 0;
 
-        $value = \ScriptFUSION\Retry\retry($tries = 1, static function () use (&$invocations) {
+        $value = retry($tries = 1, static function () use (&$invocations) {
             ++$invocations;
 
             return 5;
@@ -24,7 +26,7 @@ public function testFailingOnce()
         $invocations = 0;
         $failed = false;
 
-        $value = \ScriptFUSION\Retry\retry($tries = 2, static function () use (&$invocations, &$failed) {
+        $value = retry($tries = 2, static function () use (&$invocations, &$failed) {
             ++$invocations;
 
             if (!$failed) {
@@ -45,7 +47,7 @@ public function testZeroTries()
     {
         $invocations = 0;
 
-        $value = \ScriptFUSION\Retry\retry($tries = 0, static function () use (&$invocations) {
+        $value = retry($tries = 0, static function () use (&$invocations) {
             ++$invocations;
 
             return 5;
@@ -61,7 +63,7 @@ public function testFailingTooHard()
         $outerException = $innerException = null;
 
         try {
-            \ScriptFUSION\Retry\retry($tries = 2, static function () use (&$invocations, &$innerException) {
+            retry($tries = 2, static function () use (&$invocations, &$innerException) {
                 ++$invocations;
 
                 throw $innerException = new \RuntimeException;
@@ -84,7 +86,7 @@ public function testErrorCallback()
         $outerException = $innerException = null;
 
         try {
-            \ScriptFUSION\Retry\retry($tries = 2, static function () use (&$invocations, &$innerException) {
+            retry($tries = 2, static function () use (&$invocations, &$innerException) {
                 ++$invocations;
 
                 throw $innerException = new \RuntimeException;
@@ -110,7 +112,7 @@ public function testErrorCallbackHalt()
     {
         $invocations = 0;
 
-        \ScriptFUSION\Retry\retry($tries = 2, static function () use (&$invocations) {
+        retry($tries = 2, static function () use (&$invocations) {
             ++$invocations;
 
             throw new \RuntimeException;