Immediately resolve each promises that are passed an empty iterator

pixelcog · Oct 15, 2015 · 4cdb3fb · 4cdb3fb
1 parent 97fe721
commit 4cdb3fb
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/src/EachPromise.php b/src/EachPromise.php
@@ -83,6 +83,11 @@ private function createPromise()
     {
         $this->aggregate = new Promise(function () {
             reset($this->pending);
+            if (empty($this->pending) && !$this->iterable->valid()) {
+                $this->aggregate->resolve(null);
+                return;
+            }
+
             // Consume a potentially fluctuating list of promises while
             // ensuring that indexes are maintained (precluding array_shift).
             while ($promise = current($this->pending)) {

diff --git a/tests/EachPromiseTest.php b/tests/EachPromiseTest.php
@@ -160,6 +160,12 @@ public function testCanBeCancelled()
         $this->markTestIncomplete();
     }
 
+    public function testFulfillsImmediatelyWhenGivenAnEmptyIterator()
+    {
+        $each = new EachPromise(new \ArrayIterator([]));
+        $result = $each->promise()->wait();
+    }
+
     public function testDoesNotBlowStackWithFulfilledPromises()
     {
         $pending = [];