Merge pull request #34 from clue-labs/promise-v3

Forward compatibility with upcoming Promise v3
clue · Aug 30, 2022 · 4b263ac · 4b263ac
2 parents cff1c7b + e6bcf6f
commit 4b263ac
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 12 deletions.
diff --git a/composer.json b/composer.json
@@ -18,10 +18,10 @@
     },
     "require": {
         "php": ">=5.3",
-        "react/socket": "^1.9",
         "react/event-loop": "^1.2",
-        "react/promise": "^2.1 || ^1.2.1",
-        "react/promise-timer": "^1.1"
+        "react/promise": "^3 || ^2.1 || ^1.2.1",
+        "react/promise-timer": "^1.9",
+        "react/socket": "^1.12"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.3 || ^5.7 || ^4.8"

diff --git a/src/ConnectionManagerRepeat.php b/src/ConnectionManagerRepeat.php
@@ -6,7 +6,7 @@
 use InvalidArgumentException;
 use Exception;
 use React\Promise\Promise;
-use React\Promise\CancellablePromiseInterface;
+use React\Promise\PromiseInterface;
 
 class ConnectionManagerRepeat implements ConnectorInterface
 {
@@ -44,7 +44,7 @@ public function connect($uri)
             $tries = 0;
             $reject(new \RuntimeException('Cancelled'));
 
-            if ($pending instanceof CancellablePromiseInterface) {
+            if ($pending instanceof PromiseInterface && \method_exists($pending, 'cancel')) {
                 $pending->cancel();
             }
         });

diff --git a/src/Multiple/ConnectionManagerConcurrent.php b/src/Multiple/ConnectionManagerConcurrent.php
@@ -2,24 +2,22 @@
 
 namespace ConnectionManager\Extra\Multiple;
 
-use ConnectionManager\Extra\Multiple\ConnectionManagerConsecutive;
 use React\Promise;
-use React\Promise\CancellablePromiseInterface;
+use React\Promise\PromiseInterface;
 
 class ConnectionManagerConcurrent extends ConnectionManagerConsecutive
 {
     public function connect($uri)
     {
         $all = array();
         foreach ($this->managers as $connector) {
-            /* @var $connection Connector */
             $all []= $connector->connect($uri);
         }
         return Promise\any($all)->then(function ($conn) use ($all) {
             // a connection attempt succeeded
             // => cancel all pending connection attempts
             foreach ($all as $promise) {
-                if ($promise instanceof CancellablePromiseInterface) {
+                if ($promise instanceof PromiseInterface && \method_exists($promise, 'cancel')) {
                     $promise->cancel();
                 }
 

diff --git a/src/Multiple/ConnectionManagerConsecutive.php b/src/Multiple/ConnectionManagerConsecutive.php
@@ -2,10 +2,10 @@
 
 namespace ConnectionManager\Extra\Multiple;
 
-use React\Socket\ConnectorInterface;
 use React\Promise;
+use React\Promise\PromiseInterface;
+use React\Socket\ConnectorInterface;
 use UnderflowException;
-use React\Promise\CancellablePromiseInterface;
 
 class ConnectionManagerConsecutive implements ConnectorInterface
 {
@@ -54,7 +54,7 @@ public function tryConnection(array $managers, $uri)
             $managers = array();
             $reject(new \RuntimeException('Cancelled'));
 
-            if ($pending instanceof CancellablePromiseInterface) {
+            if ($pending instanceof PromiseInterface && \method_exists($pending, 'cancel')) {
                 $pending->cancel();
             }
         });