53
53
function await (PromiseInterface $ promise )
54
54
{
55
55
$ wait = true ;
56
- $ resolved = null ;
57
- $ exception = null ;
56
+ $ resolved = false ;
58
57
$ rejected = false ;
58
+ $ resolvedValue = null ;
59
+ $ rejectedThrowable = null ;
59
60
60
61
$ promise ->then (
61
- function ($ c ) use (&$ resolved , &$ wait ) {
62
- $ resolved = $ c ;
62
+ function ($ c ) use (&$ resolved , &$ resolvedValue , &$ wait ) {
63
+ $ resolvedValue = $ c ;
64
+ $ resolved = true ;
63
65
$ wait = false ;
64
66
Loop::stop ();
65
67
},
66
- function ($ error ) use (&$ exception , &$ rejected , &$ wait ) {
67
- $ exception = $ error ;
68
+ function ($ error ) use (&$ rejected , &$ rejectedThrowable , &$ wait ) {
69
+ $ rejectedThrowable = $ error ;
68
70
$ rejected = true ;
69
71
$ wait = false ;
70
72
Loop::stop ();
@@ -75,22 +77,37 @@ function ($error) use (&$exception, &$rejected, &$wait) {
75
77
// argument does not show up in the stack trace in PHP 7+ only.
76
78
$ promise = null ;
77
79
80
+ if ($ rejected ) {
81
+ // promise is rejected with an unexpected value (Promise API v1 or v2 only)
82
+ if (!$ rejectedThrowable instanceof \Exception && !$ rejectedThrowable instanceof \Throwable) {
83
+ $ rejectedThrowable = new \UnexpectedValueException (
84
+ 'Promise rejected with unexpected value of type ' . (is_object ($ rejectedThrowable ) ? get_class ($ rejectedThrowable ) : gettype ($ rejectedThrowable ))
85
+ );
86
+ }
87
+
88
+ throw $ rejectedThrowable ;
89
+ }
90
+
91
+ if ($ resolved ) {
92
+ return $ resolvedValue ;
93
+ }
94
+
78
95
while ($ wait ) {
79
96
Loop::run ();
80
97
}
81
98
82
99
if ($ rejected ) {
83
100
// promise is rejected with an unexpected value (Promise API v1 or v2 only)
84
- if (!$ exception instanceof \Throwable) {
85
- $ exception = new \UnexpectedValueException (
86
- 'Promise rejected with unexpected value of type ' . (is_object ($ exception ) ? get_class ($ exception ) : gettype ($ exception ))
101
+ if (!$ rejectedThrowable instanceof \Exception && ! $ rejectedThrowable instanceof \Throwable) {
102
+ $ rejectedThrowable = new \UnexpectedValueException (
103
+ 'Promise rejected with unexpected value of type ' . (is_object ($ rejectedThrowable ) ? get_class ($ rejectedThrowable ) : gettype ($ rejectedThrowable ))
87
104
);
88
105
}
89
106
90
- throw $ exception ;
107
+ throw $ rejectedThrowable ;
91
108
}
92
109
93
- return $ resolved ;
110
+ return $ resolvedValue ;
94
111
}
95
112
96
113
0 commit comments