Merge branch 'master' into 3.0

reactphp · May 2, 2016 · 08b491c · 08b491c
2 parents e8c20be + 16ff799
commit 08b491c
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/src/functions.php b/src/functions.php
@@ -121,14 +121,15 @@ function some(array $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
@@ -146,7 +146,6 @@ public function shouldCancelOtherPendingInputArrayPromisesIfEnoughPromisesFulfil
             ->expects($this->never())
             ->method('__invoke');
 
-
         $deferred = New Deferred($mock);
         $deferred->resolve();
 
@@ -155,6 +154,25 @@ public function shouldCancelOtherPendingInputArrayPromisesIfEnoughPromisesFulfil
             ->expects($this->once())
             ->method('cancel');
 
-        some([$deferred->promise(), $mock2], 1)->cancel();
+        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);
     }
 }