Skip to content

Fix is_object() check on rejections with truthy non-Exception values #40

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
esroyo wants to merge 1 commit into from
Closed

Fix is_object() check on rejections with truthy non-Exception values #40

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
2 changes: 1 addition & 1 deletion src/functions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ 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))),
'Promise rejected with unexpected value of type ' . (is_object($exception) ? get_class($exception) : gettype($exception)),
0,
$exception instanceof \Throwable ? $exception : null
);
Expand Down
14 changes: 14 additions & 0 deletions tests/FunctionAwaitTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,20 @@ public function testAwaitOneRejectedWithFalseWillWrapInUnexpectedValueException(
Block\await($promise, $this->loop);
}

/**
* @expectedException UnexpectedValueException
*/
public function testAwaitOneRejectedWithNonFalsyWillWrapInUnexpectedValueException()
{
$all = array(
$this->createPromiseResolved(1),
Promise\reject(new Exception('first')),
Promise\reject(new Exception('second'))
);

Block\await(Promise\some($all, count($all)), $this->loop);
}

/**
* @expectedException UnexpectedValueException
*/
Expand Down