RetailCRM-Mirror/graphql-php
1
0
Fork 0
mirror of https://github.com/retailcrm/graphql-php.git synced 2024-11-29 00:25:17 +03:00
Code Issues Projects Releases Wiki Activity

Execution: fixed rejection issue in sync promise

Browse Source
This commit is contained in:
vladar 2016-12-03 02:48:51 +07:00
parent e97ca7f971
commit ab4ae779af
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Executor/Promise/Adapter/SyncPromise.php
View File

@ -134,7 +134,11 @@ class SyncPromise
} }
} else if ($this->state === self::REJECTED) { } else if ($this->state === self::REJECTED) {
try { try {
$promise->resolve($onRejected ? $onRejected($this->result) : $this->result); if ($onRejected) {
$promise->resolve($onRejected($this->result));
} else {
$promise->reject($this->result);
}
} catch (\Exception $e) { } catch (\Exception $e) {
$promise->reject($e); $promise->reject($e);
} }

12
tests/Executor/Promise/SyncPromiseTest.php
View File

@ -224,6 +224,18 @@ class SyncPromiseTest extends \PHPUnit_Framework_TestCase
$promise->reject(new \Exception("Rejected Reason")); $promise->reject(new \Exception("Rejected Reason"));
$this->assertValidPromise($promise, "Rejected Reason", null, SyncPromise::REJECTED); $this->assertValidPromise($promise, "Rejected Reason", null, SyncPromise::REJECTED);
$promise = new SyncPromise();
$promise2 = $promise->then(null, function() {
return 'value';
});
$promise->reject(new \Exception("Rejected Again"));
$this->assertValidPromise($promise2, null, 'value', SyncPromise::FULFILLED);
$promise = new SyncPromise();
$promise2 = $promise->then();
$promise->reject(new \Exception("Rejected Once Again"));
$this->assertValidPromise($promise2, "Rejected Once Again", null, SyncPromise::REJECTED);
} }
public function testPendingPromiseThen() public function testPendingPromiseThen()