Fix some() not cancelling pending promises when too much input promis…

…es reject
reactphp · May 2, 2016 · 16ff799 · 16ff799
1 parent d9c1bf5
commit 16ff799
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/src/functions.php b/src/functions.php
@@ -128,14 +128,15 @@ function some($promisesOrValues, $howMany)
                         }
                     };
 
-                    $rejecter = function ($reason) use ($i, &$reasons, &$toReject, $toResolve, $reject) {
+                    $rejecter = function ($reason) use ($i, &$reasons, &$toReject, $toResolve, $reject, $cancellationQueue) {
                         if ($toResolve < 1 || $toReject < 1) {
                             return;
                         }
 
                         $reasons[$i] = $reason;
 
                         if (0 === --$toReject) {
+                            $cancellationQueue();
                             $reject($reasons);
                         }
                     };

diff --git a/tests/FunctionSomeTest.php b/tests/FunctionSomeTest.php
@@ -226,4 +226,23 @@ public function shouldCancelOtherPendingInputArrayPromisesIfEnoughPromisesFulfil
 
         some([$deferred->promise(), $mock2], 1);
     }
+
+    /** @test */
+    public function shouldCancelOtherPendingInputArrayPromisesIfEnoughPromisesReject()
+    {
+        $mock = $this->createCallableMock();
+        $mock
+            ->expects($this->never())
+            ->method('__invoke');
+
+        $deferred = New Deferred($mock);
+        $deferred->reject();
+
+        $mock2 = $this->getMock('React\Promise\CancellablePromiseInterface');
+        $mock2
+            ->expects($this->once())
+            ->method('cancel');
+
+        some([$deferred->promise(), $mock2], 2);
+    }
 }