RetailCRM-Mirror/graphql-php
1
0
Fork 0
mirror of https://github.com/retailcrm/graphql-php.git synced 2025-02-14 11:33:13 +03:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Fixed SyncPromiseAdapter::all() to not change the order of arrays
This commit is contained in:
Vladimir Razuvaev 2017-02-24 01:06:35 +07:00 committed by GitHub
commit dd4acfd3b6
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Executor/Promise/Adapter/SyncPromiseAdapter.php
View File

@ -96,6 +96,7 @@ class SyncPromiseAdapter implements PromiseAdapter
foreach ($promisesOrValues as $index => $promiseOrValue) { foreach ($promisesOrValues as $index => $promiseOrValue) {
if ($promiseOrValue instanceof Promise) { if ($promiseOrValue instanceof Promise) {
$result[$index] = null;
$promiseOrValue->then( $promiseOrValue->then(
function($value) use ($index, &$count, $total, &$result, $all) { function($value) use ($index, &$count, $total, &$result, $all) {
$result[$index] = $value; $result[$index] = $value;

14
tests/Executor/Promise/SyncPromiseAdapterTest.php
View File

@ -186,18 +186,18 @@ class SyncPromiseAdapterTest extends \PHPUnit_Framework_TestCase
} }
); );
$this->assertEquals($onFulfilledCalled, false); $this->assertSame($onFulfilledCalled, false);
$this->assertEquals($onRejectedCalled, false); $this->assertSame($onRejectedCalled, false);
SyncPromise::runQueue(); SyncPromise::runQueue();
if ($expectedNextState !== SyncPromise::PENDING) { if ($expectedNextState !== SyncPromise::PENDING) {
$this->assertEquals(!$expectedNextReason, $onFulfilledCalled); $this->assertSame(!$expectedNextReason, $onFulfilledCalled);
$this->assertEquals(!!$expectedNextReason, $onRejectedCalled); $this->assertSame(!!$expectedNextReason, $onRejectedCalled);
} }
$this->assertEquals($expectedNextValue, $actualNextValue); $this->assertSame($expectedNextValue, $actualNextValue);
$this->assertEquals($expectedNextReason, $actualNextReason); $this->assertSame($expectedNextReason, $actualNextReason);
$this->assertEquals($expectedNextState, $promise->adoptedPromise->state); $this->assertSame($expectedNextState, $promise->adoptedPromise->state);
} }
} }