Skip to content

Fix getting the type of unexpected reject reason #37

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
Furgas wants to merge 3 commits into from
Closed

Fix getting the type of unexpected reject reason #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
642f978
Fix getting the type of unexpected reject reason
Furgas Jul 24, 2018
485a2e3
Fix getting the type of unexpected reject reason
Furgas Jul 24, 2018
f694835
Merge branch 'fix-get-class-warning' of https://github.com/Furgas/rea…
Furgas Jul 24, 2018
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
3 changes: 3 additions & 0 deletions tests/FunctionAwaitTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ public function testAwaitOneRejected()

/**
* @expectedException UnexpectedValueException
* @expectedExceptionMessage Promise rejected with unexpected value of type bool
*/
public function testAwaitOneRejectedWithFalseWillWrapInUnexpectedValueException()
{
Expand All @@ -29,6 +30,7 @@ public function testAwaitOneRejectedWithFalseWillWrapInUnexpectedValueException(

/**
* @expectedException UnexpectedValueException
* @expectedExceptionMessage Promise rejected with unexpected value of type NULL
*/
public function testAwaitOneRejectedWithNullWillWrapInUnexpectedValueException()
{
Expand All @@ -48,6 +50,7 @@ public function testAwaitOneRejectedWithPhp7ErrorWillWrapInUnexpectedValueExcept
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());
}
Expand Down