Merge pull request #92 from webmozart/sync-promise-adapter-indices

Fixed SyncPromiseAdapter::all() to not change the order of arrays
webonyx · Feb 23, 2017 · dd4acfd · dd4acfd
2 parents ed41a4c + e35b576
commit dd4acfd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/src/Executor/Promise/Adapter/SyncPromiseAdapter.php b/src/Executor/Promise/Adapter/SyncPromiseAdapter.php
@@ -96,6 +96,7 @@ public function all(array $promisesOrValues)
 
         foreach ($promisesOrValues as $index => $promiseOrValue) {
             if ($promiseOrValue instanceof Promise) {
+                $result[$index] = null;
                 $promiseOrValue->then(
                     function($value) use ($index, &$count, $total, &$result, $all) {
                         $result[$index] = $value;

diff --git a/tests/Executor/Promise/SyncPromiseAdapterTest.php b/tests/Executor/Promise/SyncPromiseAdapterTest.php
@@ -186,18 +186,18 @@ function(\Exception $reason) use (&$actualNextReason, &$onRejectedCalled) {
             }
         );
 
-        $this->assertEquals($onFulfilledCalled, false);
-        $this->assertEquals($onRejectedCalled, false);
+        $this->assertSame($onFulfilledCalled, false);
+        $this->assertSame($onRejectedCalled, false);
 
         SyncPromise::runQueue();
 
         if ($expectedNextState !== SyncPromise::PENDING) {
-            $this->assertEquals(!$expectedNextReason, $onFulfilledCalled);
-            $this->assertEquals(!!$expectedNextReason, $onRejectedCalled);
+            $this->assertSame(!$expectedNextReason, $onFulfilledCalled);
+            $this->assertSame(!!$expectedNextReason, $onRejectedCalled);
         }
 
-        $this->assertEquals($expectedNextValue, $actualNextValue);
-        $this->assertEquals($expectedNextReason, $actualNextReason);
-        $this->assertEquals($expectedNextState, $promise->adoptedPromise->state);
+        $this->assertSame($expectedNextValue, $actualNextValue);
+        $this->assertSame($expectedNextReason, $actualNextReason);
+        $this->assertSame($expectedNextState, $promise->adoptedPromise->state);
     }
 }