Forward compatibility with react/promise 3

WyriHaximus · WyriHaximus · commit b3e9ca1c613b · 2022-09-10T23:36:02.000+02:00
diff --git a/composer.json b/composer.json
@@ -41,7 +41,7 @@
         "evenement/evenement": "^3.0 || ^2.0 || ^1.0",
         "react/event-loop": "^1.2",
         "react/dns": "^1.7",
-        "react/promise": "~2.1|~1.2"
+        "react/promise": "^3 || ^2.1 || ^1.2"
     },
     "require-dev": {
         "clue/block-react": "~1.0",
diff --git a/src/Factory.php b/src/Factory.php
@@ -9,7 +9,6 @@
 use React\EventLoop\Loop;
 use React\EventLoop\LoopInterface;
 use React\Promise;
-use React\Promise\CancellablePromiseInterface;
 use \Exception;
 
 class Factory
@@ -140,7 +139,7 @@ function ($_, $reject) use ($promise) {
                 $reject(new \RuntimeException('Cancelled creating socket during DNS lookup'));
 
                 // (try to) cancel pending DNS lookup, otherwise ignoring its results
-                if ($promise instanceof CancellablePromiseInterface) {
+                if (\method_exists($promise, 'cancel')) {
                     $promise->cancel();
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@`
`9`	`9`	`use React\EventLoop\Loop;`
`10`	`10`	`use React\EventLoop\LoopInterface;`
`11`	`11`	`use React\Promise;`
`12`		`-use React\Promise\CancellablePromiseInterface;`
`13`	`12`	`use \Exception;`
`14`	`13`
`15`	`14`	`class Factory`
`@@ -140,7 +139,7 @@ function ($_, $reject) use ($promise) {`
`140`	`139`	`$reject(new \RuntimeException('Cancelled creating socket during DNS lookup'));`
`141`	`140`
`142`	`141`	`// (try to) cancel pending DNS lookup, otherwise ignoring its results`
`143`		`- if ($promise instanceof CancellablePromiseInterface) {`
	`142`	`+ if (\method_exists($promise, 'cancel')) {`
`144`	`143`	`$promise->cancel();`
`145`	`144`	`}`
`146`	`145`	`}`