Skip to content

await: throw Throwables #52

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Thomas-Gelf wants to merge 1 commit into from
Closed

await: throw Throwables #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions src/functions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,15 +117,16 @@ function ($error) use (&$exception, &$rejected, &$wait, $loop) {
}

if ($rejected) {
if (!$exception instanceof \Exception) {
$exception = new \UnexpectedValueException(
'Promise rejected with unexpected value of type ' . (is_object($exception) ? get_class($exception) : gettype($exception)),
0,
$exception instanceof \Throwable ? $exception : null
);
if ($exception instanceof \Throwable || $exception instanceof \Exception) {
throw $exception;
}

throw $exception;
throw new \UnexpectedValueException(
'Promise rejected with unexpected value of type '
. (is_object($exception)
? get_class($exception)
: gettype($exception))
);
}

return $resolved;
Expand Down
8 changes: 3 additions & 5 deletions tests/FunctionAwaitTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,17 +35,15 @@ public function testAwaitOneRejectedWithNullWillWrapInUnexpectedValueException()
/**
* @requires PHP 7
*/
public function testAwaitOneRejectedWithPhp7ErrorWillWrapInUnexpectedValueExceptionWithPrevious()
public function testAwaitOneRejectedWithPhp7ErrorWillThrowThatVerySameError()
{
$promise = Promise\reject(new \Error('Test'));

try {
Block\await($promise, $this->loop);
$this->fail();
} catch (\UnexpectedValueException $e) {
$this->assertEquals('Promise rejected with unexpected value of type Error', $e->getMessage());
$this->assertInstanceOf('Throwable', $e->getPrevious());
$this->assertEquals('Test', $e->getPrevious()->getMessage());
} catch (\Error $e) {
$this->assertEquals('Test', $e->getMessage());
}
}

Expand Down