Fix wait() foreign promise compatibility

guzzle · Dec 14, 2016 · 4d6e1e7 · 4d6e1e7
1 parent b551b52
commit 4d6e1e7
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 3 deletions.
diff --git a/src/Promise.php b/src/Promise.php
@@ -263,10 +263,17 @@ private function invokeWaitList()
         $this->waitList = null;
 
         foreach ($waitList as $result) {
-            $result->waitIfPending();
-            while ($result->result instanceof Promise) {
-                $result = $result->result;
+            while (true) {
                 $result->waitIfPending();
+
+                if ($result->result instanceof Promise) {
+                    $result = $result->result;
+                } else {
+                    if ($result->result instanceof PromiseInterface) {
+                        $result->result->wait(false);
+                    }
+                    break;
+                }
             }
         }
     }

diff --git a/tests/CoroutineTest.php b/tests/CoroutineTest.php
@@ -2,6 +2,7 @@
 namespace GuzzleHttp\Promise\Tests;
 
 use GuzzleHttp\Promise\Coroutine;
+use GuzzleHttp\Promise\Promise;
 use GuzzleHttp\Promise\PromiseInterface;
 use PHPUnit_Framework_TestCase;
 use ReflectionClass;
@@ -62,4 +63,19 @@ public function testShouldCancelResultPromiseAndOutsideCurrentPromise()
 
         $coroutine->cancel();
     }
+
+    public function testWaitShouldResolveChainedCoroutines()
+    {
+        $promisor = function () {
+            return \GuzzleHttp\Promise\coroutine(function () {
+                yield $promise = new Promise(function () use (&$promise) {
+                    $promise->resolve(1);
+                });
+            });
+        };
+
+        $promise = $promisor()->then($promisor)->then($promisor);
+
+        $this->assertSame(1, $promise->wait());
+    }
 }