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

jsor · jsor · commit 16ff799a3a74 · 2016-05-02T08:48:40.000+02:00
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);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -128,14 +128,15 @@ function some($promisesOrValues, $howMany)`
`128`	`128`	`}`
`129`	`129`	`};`
`130`	`130`
`131`		`- $rejecter = function ($reason) use ($i, &$reasons, &$toReject, $toResolve, $reject) {`
	`131`	`+ $rejecter = function ($reason) use ($i, &$reasons, &$toReject, $toResolve, $reject, $cancellationQueue) {`
`132`	`132`	`if ($toResolve < 1 \|\| $toReject < 1) {`
`133`	`133`	`return;`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`$reasons[$i] = $reason;`
`137`	`137`
`138`	`138`	`if (0 === --$toReject) {`
	`139`	`+ $cancellationQueue();`
`139`	`140`	`$reject($reasons);`
`140`	`141`	`}`
`141`	`142`	`};`