|
2 | 2 |
|
3 | 3 | namespace Clue\Promise\Timeout; |
4 | 4 |
|
5 | | -use React\Promise\Deferred; |
6 | 5 | use React\Promise\CancellablePromiseInterface; |
7 | 6 | use React\EventLoop\LoopInterface; |
8 | 7 | use React\Promise\PromiseInterface; |
| 8 | +use React\Promise\Promise; |
9 | 9 |
|
10 | 10 | function await(PromiseInterface $promise, $time, LoopInterface $loop) |
11 | 11 | { |
12 | | - $deferred = new Deferred(); |
13 | | - |
14 | | - $timer = $loop->addTimer($time, function () use ($time, $promise, $deferred) { |
15 | | - $deferred->reject(new TimeoutException($time, 'Timed out after ' . $time . ' seconds')); |
16 | | - |
17 | | - if ($promise instanceof CancellablePromiseInterface) { |
18 | | - $promise->cancel(); |
19 | | - } |
20 | | - }); |
21 | | - |
22 | | - $promise->then(function ($v) use ($timer, $loop, $deferred) { |
23 | | - $loop->cancelTimer($timer); |
24 | | - $deferred->resolve($v); |
25 | | - }, function ($v) use ($timer, $loop, $deferred) { |
26 | | - $loop->cancelTimer($timer); |
27 | | - $deferred->reject($v); |
| 12 | + return new Promise(function ($resolve, $reject) use ($loop, $time, $promise) { |
| 13 | + $timer = $loop->addTimer($time, function () use ($time, $promise, $reject) { |
| 14 | + $reject(new TimeoutException($time, 'Timed out after ' . $time . ' seconds')); |
| 15 | + |
| 16 | + if ($promise instanceof CancellablePromiseInterface) { |
| 17 | + $promise->cancel(); |
| 18 | + } |
| 19 | + }); |
| 20 | + |
| 21 | + $promise->then(function ($v) use ($timer, $loop, $resolve) { |
| 22 | + $loop->cancelTimer($timer); |
| 23 | + $resolve($v); |
| 24 | + }, function ($v) use ($timer, $loop, $reject) { |
| 25 | + $loop->cancelTimer($timer); |
| 26 | + $reject($v); |
| 27 | + }); |
28 | 28 | }); |
29 | | - |
30 | | - return $deferred->promise(); |
31 | 29 | } |
32 | 30 |
|
33 | 31 | function resolve($time, LoopInterface $loop) |
34 | 32 | { |
35 | | - $deferred = new Deferred(); |
36 | | - |
37 | | - $timer = $loop->addTimer($time, function () use ($time, $deferred) { |
38 | | - $deferred->resolve($time); |
| 33 | + return new Promise(function ($resolve) use ($loop, $time) { |
| 34 | + $loop->addTimer($time, function () use ($time, $resolve) { |
| 35 | + $resolve($time); |
| 36 | + }); |
39 | 37 | }); |
40 | | - |
41 | | - return $deferred->promise(); |
42 | 38 | } |
43 | 39 |
|
44 | 40 | function reject($time, LoopInterface $loop) |
|
0 commit comments