Forward compatibility with react/promise 3

Author: WyriHaximus

composer.json

@@ -7,9 +7,15 @@
         "php": ">=5.3.0",
         "react/cache": "^1.0 || ^0.6 || ^0.5",
         "react/event-loop": "^1.0 || ^0.5",
-        "react/promise": "^2.7 || ^1.2.1",
-        "react/promise-timer": "^1.2"
+        "react/promise": "dev-master as 2.999.999",
+        "react/promise-timer": "dev-promise-3 as 1.6.0"
     },
+    "repositories": [
+        {
+            "type": "vcs",
+            "url": "https://github.com/WyriHaximus-labs/promise-timer"
+        }
+    ],
     "require-dev": {
         "clue/block-react": "^1.2",
         "phpunit/phpunit": "^7.0 || ^6.4 || ^5.7 || ^4.8.35"

src/Query/RetryExecutor.php

@@ -4,6 +4,7 @@
 
 use React\Promise\CancellablePromiseInterface;
 use React\Promise\Deferred;
+use React\Promise\PromiseInterface;
 
 final class RetryExecutor implements ExecutorInterface
 {
@@ -24,7 +25,7 @@ public function query(Query $query)
     public function tryQuery(Query $query, $retries)
     {
         $deferred = new Deferred(function () use (&$promise) {
-            if ($promise instanceof CancellablePromiseInterface) {
+            if ($promise instanceof CancellablePromiseInterface || (method_exists($promise, 'cancel') && $promise instanceof PromiseInterface)) {
                 $promise->cancel();
             }
         });

src/Query/TimeoutExecutor.php

@@ -3,8 +3,6 @@
 namespace React\Dns\Query;
 
 use React\EventLoop\LoopInterface;
-use React\Promise\Deferred;
-use React\Promise\CancellablePromiseInterface;
 use React\Promise\Timer;
 
 final class TimeoutExecutor implements ExecutorInterface

tests/Query/RetryExecutorTest.php

@@ -321,7 +321,7 @@ protected function expectPromiseOnce($return = null)
         $mock
             ->expects($this->once())
             ->method('then')
-            ->will($this->returnValue($return));
+            ->will($this->returnValue(Promise\resolve($return)));
 
         return $mock;
     }