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