Merge pull request #48 from clue-labs/promise-v4

WyriHaximus · web-flow · commit 257634a96ef7 · 2022-06-30T11:22:30.000+02:00
[4.x] Forward compatibility with upcoming Promise v3
diff --git a/composer.json b/composer.json
@@ -28,7 +28,7 @@
     "require": {
         "php": ">=8.1",
         "react/event-loop": "^1.2",
-        "react/promise": "^2.8 || ^1.2.1"
+        "react/promise": "^3.0 || ^2.8 || ^1.2.1"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.3"
diff --git a/src/functions.php b/src/functions.php
@@ -2,8 +2,6 @@
 
 namespace React\Async;
 
-use React\EventLoop\Loop;
-use React\Promise\CancellablePromiseInterface;
 use React\Promise\Deferred;
 use React\Promise\Promise;
 use React\Promise\PromiseInterface;
@@ -199,7 +197,7 @@ function async(callable $function): callable
         }, function () use (&$fiber): void {
             FiberMap::cancel($fiber);
             $promise = FiberMap::getPromise($fiber);
-            if ($promise instanceof CancellablePromiseInterface) {
+            if ($promise instanceof PromiseInterface && \method_exists($promise, 'cancel')) {
                 $promise->cancel();
             }
         });
@@ -535,7 +533,7 @@ function parallel(iterable $tasks): PromiseInterface
     $pending = [];
     $deferred = new Deferred(function () use (&$pending) {
         foreach ($pending as $promise) {
-            if ($promise instanceof CancellablePromiseInterface) {
+            if ($promise instanceof PromiseInterface && \method_exists($promise, 'cancel')) {
                 $promise->cancel();
             }
         }
@@ -549,7 +547,7 @@ function parallel(iterable $tasks): PromiseInterface
         $deferred->reject($error);
 
         foreach ($pending as $promise) {
-            if ($promise instanceof CancellablePromiseInterface) {
+            if ($promise instanceof PromiseInterface && \method_exists($promise, 'cancel')) {
                 $promise->cancel();
             }
         }
@@ -593,7 +591,7 @@ function series(iterable $tasks): PromiseInterface
 {
     $pending = null;
     $deferred = new Deferred(function () use (&$pending) {
-        if ($pending instanceof CancellablePromiseInterface) {
+        if ($pending instanceof PromiseInterface && \method_exists($pending, 'cancel')) {
             $pending->cancel();
         }
         $pending = null;
@@ -644,7 +642,7 @@ function waterfall(iterable $tasks): PromiseInterface
 {
     $pending = null;
     $deferred = new Deferred(function () use (&$pending) {
-        if ($pending instanceof CancellablePromiseInterface) {
+        if ($pending instanceof PromiseInterface && \method_exists($pending, 'cancel')) {
             $pending->cancel();
         }
         $pending = null;
diff --git a/tests/SeriesTest.php b/tests/SeriesTest.php
@@ -174,7 +174,7 @@ public function testSeriesWillCancelFirstPendingPromiseWhenCallingCancelOnResult
         $tasks = array(
             function () {
                 return new Promise(function ($resolve) {
-                    $resolve();
+                    $resolve(null);
                 });
             },
             function () use (&$cancelled) {
diff --git a/tests/WaterfallTest.php b/tests/WaterfallTest.php
@@ -188,7 +188,7 @@ public function testWaterfallWillCancelFirstPendingPromiseWhenCallingCancelOnRes
         $tasks = array(
             function () {
                 return new Promise(function ($resolve) {
-                    $resolve();
+                    $resolve(null);
                 });
             },
             function () use (&$cancelled) {

Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,6 @@`
`2`	`2`
`3`	`3`	`namespace React\Async;`
`4`	`4`
`5`		`-use React\EventLoop\Loop;`
`6`		`-use React\Promise\CancellablePromiseInterface;`
`7`	`5`	`use React\Promise\Deferred;`
`8`	`6`	`use React\Promise\Promise;`
`9`	`7`	`use React\Promise\PromiseInterface;`
`@@ -199,7 +197,7 @@ function async(callable $function): callable`
`199`	`197`	`}, function () use (&$fiber): void {`
`200`	`198`	`FiberMap::cancel($fiber);`
`201`	`199`	`$promise = FiberMap::getPromise($fiber);`
`202`		`- if ($promise instanceof CancellablePromiseInterface) {`
	`200`	`+ if ($promise instanceof PromiseInterface && \method_exists($promise, 'cancel')) {`
`203`	`201`	`$promise->cancel();`
`204`	`202`	`}`
`205`	`203`	`});`
`@@ -535,7 +533,7 @@ function parallel(iterable $tasks): PromiseInterface`
`535`	`533`	`$pending = [];`
`536`	`534`	`$deferred = new Deferred(function () use (&$pending) {`
`537`	`535`	`foreach ($pending as $promise) {`
`538`		`- if ($promise instanceof CancellablePromiseInterface) {`
	`536`	`+ if ($promise instanceof PromiseInterface && \method_exists($promise, 'cancel')) {`
`539`	`537`	`$promise->cancel();`
`540`	`538`	`}`
`541`	`539`	`}`
`@@ -549,7 +547,7 @@ function parallel(iterable $tasks): PromiseInterface`
`549`	`547`	`$deferred->reject($error);`
`550`	`548`
`551`	`549`	`foreach ($pending as $promise) {`
`552`		`- if ($promise instanceof CancellablePromiseInterface) {`
	`550`	`+ if ($promise instanceof PromiseInterface && \method_exists($promise, 'cancel')) {`
`553`	`551`	`$promise->cancel();`
`554`	`552`	`}`
`555`	`553`	`}`
`@@ -593,7 +591,7 @@ function series(iterable $tasks): PromiseInterface`
`593`	`591`	`{`
`594`	`592`	`$pending = null;`
`595`	`593`	`$deferred = new Deferred(function () use (&$pending) {`
`596`		`- if ($pending instanceof CancellablePromiseInterface) {`
	`594`	`+ if ($pending instanceof PromiseInterface && \method_exists($pending, 'cancel')) {`
`597`	`595`	`$pending->cancel();`
`598`	`596`	`}`
`599`	`597`	`$pending = null;`
`@@ -644,7 +642,7 @@ function waterfall(iterable $tasks): PromiseInterface`
`644`	`642`	`{`
`645`	`643`	`$pending = null;`
`646`	`644`	`$deferred = new Deferred(function () use (&$pending) {`
`647`		`- if ($pending instanceof CancellablePromiseInterface) {`
	`645`	`+ if ($pending instanceof PromiseInterface && \method_exists($pending, 'cancel')) {`
`648`	`646`	`$pending->cancel();`
`649`	`647`	`}`
`650`	`648`	`$pending = null;`