@@ -23,19 +23,19 @@ |
||
23 | 23 | |
24 | 24 | public function tryQuery(Query $query, $retries) |
25 | 25 | { |
26 | - $deferred = new Deferred(function () use (&$promise) { |
|
26 | + $deferred = new Deferred(function() use (&$promise) { |
|
27 | 27 | if ($promise instanceof PromiseInterface && \method_exists($promise, 'cancel')) { |
28 | 28 | $promise->cancel(); |
29 | 29 | } |
30 | 30 | }); |
31 | 31 | |
32 | - $success = function ($value) use ($deferred, &$errorback) { |
|
32 | + $success = function($value) use ($deferred, &$errorback) { |
|
33 | 33 | $errorback = null; |
34 | 34 | $deferred->resolve($value); |
35 | 35 | }; |
36 | 36 | |
37 | 37 | $executor = $this->executor; |
38 | - $errorback = function ($e) use ($deferred, &$promise, $query, $success, &$errorback, &$retries, $executor) { |
|
38 | + $errorback = function($e) use ($deferred, &$promise, $query, $success, &$errorback, &$retries, $executor) { |
|
39 | 39 | if (!$e instanceof TimeoutException) { |
40 | 40 | $errorback = null; |
41 | 41 | $deferred->reject($e); |
@@ -34,15 +34,15 @@ discard block |
||
34 | 34 | |
35 | 35 | $loop = $this->loop; |
36 | 36 | $time = $this->timeout; |
37 | - return new Promise(function ($resolve, $reject) use ($loop, $time, $promise, $query) { |
|
37 | + return new Promise(function($resolve, $reject) use ($loop, $time, $promise, $query) { |
|
38 | 38 | $timer = null; |
39 | - $promise = $promise->then(function ($v) use (&$timer, $loop, $resolve) { |
|
39 | + $promise = $promise->then(function($v) use (&$timer, $loop, $resolve) { |
|
40 | 40 | if ($timer) { |
41 | 41 | $loop->cancelTimer($timer); |
42 | 42 | } |
43 | 43 | $timer = false; |
44 | 44 | $resolve($v); |
45 | - }, function ($v) use (&$timer, $loop, $reject) { |
|
45 | + }, function($v) use (&$timer, $loop, $reject) { |
|
46 | 46 | if ($timer) { |
47 | 47 | $loop->cancelTimer($timer); |
48 | 48 | } |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | } |
57 | 57 | |
58 | 58 | // start timeout timer which will cancel the pending promise |
59 | - $timer = $loop->addTimer($time, function () use ($time, &$promise, $reject, $query) { |
|
59 | + $timer = $loop->addTimer($time, function() use ($time, &$promise, $reject, $query) { |
|
60 | 60 | $reject(new TimeoutException( |
61 | 61 | 'DNS query for ' . $query->describe() . ' timed out' |
62 | 62 | )); |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | $promise->cancel(); |
68 | 68 | $promise = null; |
69 | 69 | }); |
70 | - }, function () use (&$promise) { |
|
70 | + }, function() use (&$promise) { |
|
71 | 71 | // Cancelling this promise will cancel the pending query, thus triggering the rejection logic above. |
72 | 72 | // Avoid garbage references in call stack by passing pending promise by reference. |
73 | 73 | assert(\method_exists($promise, 'cancel')); |
@@ -180,7 +180,7 @@ discard block |
||
180 | 180 | $socket = @\stream_socket_client($this->nameserver, $errno, $errstr, 0, \STREAM_CLIENT_CONNECT | \STREAM_CLIENT_ASYNC_CONNECT); |
181 | 181 | if ($socket === false) { |
182 | 182 | return \React\Promise\reject(new \RuntimeException( |
183 | - 'DNS query for ' . $query->describe() . ' failed: Unable to connect to DNS server ' . $this->nameserver . ' (' . $errstr . ')', |
|
183 | + 'DNS query for ' . $query->describe() . ' failed: Unable to connect to DNS server ' . $this->nameserver . ' (' . $errstr . ')', |
|
184 | 184 | $errno |
185 | 185 | )); |
186 | 186 | } |
@@ -205,9 +205,9 @@ discard block |
||
205 | 205 | $this->loop->addWriteStream($this->socket, array($this, 'handleWritable')); |
206 | 206 | } |
207 | 207 | |
208 | - $names =& $this->names; |
|
208 | + $names = & $this->names; |
|
209 | 209 | $that = $this; |
210 | - $deferred = new Deferred(function () use ($that, &$names, $request) { |
|
210 | + $deferred = new Deferred(function() use ($that, &$names, $request) { |
|
211 | 211 | // remove from list of pending names, but remember pending query |
212 | 212 | $name = $names[$request->id]; |
213 | 213 | unset($names[$request->id]); |
@@ -252,7 +252,7 @@ discard block |
||
252 | 252 | |
253 | 253 | $errno = 0; |
254 | 254 | $errstr = ''; |
255 | - \set_error_handler(function ($_, $error) use (&$errno, &$errstr) { |
|
255 | + \set_error_handler(function($_, $error) use (&$errno, &$errstr) { |
|
256 | 256 | // Match errstr from PHP's warning message. |
257 | 257 | // fwrite(): Send of 327712 bytes failed with errno=32 Broken pipe |
258 | 258 | \preg_match('/errno=(\d+) (.+)/', $error, $m); |
@@ -306,7 +306,7 @@ discard block |
||
306 | 306 | } |
307 | 307 | |
308 | 308 | $data = \substr($this->readBuffer, 2, $length); |
309 | - $this->readBuffer = (string)substr($this->readBuffer, $length + 2); |
|
309 | + $this->readBuffer = (string) substr($this->readBuffer, $length + 2); |
|
310 | 310 | |
311 | 311 | try { |
312 | 312 | $response = $this->parser->parseMessage($data); |
@@ -374,7 +374,7 @@ discard block |
||
374 | 374 | { |
375 | 375 | if ($this->idleTimer === null && !$this->names) { |
376 | 376 | $that = $this; |
377 | - $this->idleTimer = $this->loop->addTimer($this->idlePeriod, function () use ($that) { |
|
377 | + $this->idleTimer = $this->loop->addTimer($this->idlePeriod, function() use ($that) { |
|
378 | 378 | $that->closeError('Idle timeout'); |
379 | 379 | }); |
380 | 380 | } |
@@ -138,7 +138,7 @@ discard block |
||
138 | 138 | $socket = @\stream_socket_client($this->nameserver, $errno, $errstr, 0); |
139 | 139 | if ($socket === false) { |
140 | 140 | return \React\Promise\reject(new \RuntimeException( |
141 | - 'DNS query for ' . $query->describe() . ' failed: Unable to connect to DNS server ' . $this->nameserver . ' (' . $errstr . ')', |
|
141 | + 'DNS query for ' . $query->describe() . ' failed: Unable to connect to DNS server ' . $this->nameserver . ' (' . $errstr . ')', |
|
142 | 142 | $errno |
143 | 143 | )); |
144 | 144 | } |
@@ -146,7 +146,7 @@ discard block |
||
146 | 146 | // set socket to non-blocking and immediately try to send (fill write buffer) |
147 | 147 | \stream_set_blocking($socket, false); |
148 | 148 | |
149 | - \set_error_handler(function ($_, $error) use (&$errno, &$errstr) { |
|
149 | + \set_error_handler(function($_, $error) use (&$errno, &$errstr) { |
|
150 | 150 | // Write may potentially fail, but most common errors are already caught by connection check above. |
151 | 151 | // Among others, macOS is known to report here when trying to send to broadcast address. |
152 | 152 | // This can also be reproduced by writing data exceeding `stream_set_chunk_size()` to a server refusing UDP data. |
@@ -162,13 +162,13 @@ discard block |
||
162 | 162 | |
163 | 163 | if ($written !== \strlen($queryData)) { |
164 | 164 | return \React\Promise\reject(new \RuntimeException( |
165 | - 'DNS query for ' . $query->describe() . ' failed: Unable to send query to DNS server ' . $this->nameserver . ' (' . $errstr . ')', |
|
165 | + 'DNS query for ' . $query->describe() . ' failed: Unable to send query to DNS server ' . $this->nameserver . ' (' . $errstr . ')', |
|
166 | 166 | $errno |
167 | 167 | )); |
168 | 168 | } |
169 | 169 | |
170 | 170 | $loop = $this->loop; |
171 | - $deferred = new Deferred(function () use ($loop, $socket, $query) { |
|
171 | + $deferred = new Deferred(function() use ($loop, $socket, $query) { |
|
172 | 172 | // cancellation should remove socket from loop and close socket |
173 | 173 | $loop->removeReadStream($socket); |
174 | 174 | \fclose($socket); |
@@ -179,7 +179,7 @@ discard block |
||
179 | 179 | $max = $this->maxPacketSize; |
180 | 180 | $parser = $this->parser; |
181 | 181 | $nameserver = $this->nameserver; |
182 | - $loop->addReadStream($socket, function ($socket) use ($loop, $deferred, $query, $parser, $request, $max, $nameserver) { |
|
182 | + $loop->addReadStream($socket, function($socket) use ($loop, $deferred, $query, $parser, $request, $max, $nameserver) { |
|
183 | 183 | // try to read a single data packet from the DNS server |
184 | 184 | // ignoring any errors, this is uses UDP packets and not a stream of data |
185 | 185 | $data = @\fread($socket, $max); |
@@ -51,15 +51,15 @@ |
||
51 | 51 | } |
52 | 52 | } |
53 | 53 | |
54 | - public function catch(callable $onRejected): PromiseInterface |
|
54 | + public function catch (callable $onRejected): PromiseInterface |
|
55 | 55 | { |
56 | 56 | return $this; |
57 | 57 | } |
58 | 58 | |
59 | 59 | public function finally(callable $onFulfilledOrRejected): PromiseInterface |
60 | 60 | { |
61 | - return $this->then(function ($value) use ($onFulfilledOrRejected): PromiseInterface { |
|
62 | - return resolve($onFulfilledOrRejected())->then(function () use ($value) { |
|
61 | + return $this->then(function($value) use ($onFulfilledOrRejected): PromiseInterface { |
|
62 | + return resolve($onFulfilledOrRejected())->then(function() use ($value) { |
|
63 | 63 | return $value; |
64 | 64 | }); |
65 | 65 | }); |
@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | * @param callable(TThrowable): (PromiseInterface<TRejected>|TRejected) $onRejected |
83 | 83 | * @return PromiseInterface<TRejected> |
84 | 84 | */ |
85 | - public function catch(callable $onRejected): PromiseInterface |
|
85 | + public function catch (callable $onRejected): PromiseInterface |
|
86 | 86 | { |
87 | 87 | if (!_checkTypehint($onRejected, $this->reason)) { |
88 | 88 | return $this; |
@@ -96,8 +96,8 @@ discard block |
||
96 | 96 | |
97 | 97 | public function finally(callable $onFulfilledOrRejected): PromiseInterface |
98 | 98 | { |
99 | - return $this->then(null, function (\Throwable $reason) use ($onFulfilledOrRejected): PromiseInterface { |
|
100 | - return resolve($onFulfilledOrRejected())->then(function () use ($reason): PromiseInterface { |
|
99 | + return $this->then(null, function(\Throwable $reason) use ($onFulfilledOrRejected): PromiseInterface { |
|
100 | + return resolve($onFulfilledOrRejected())->then(function() use ($reason): PromiseInterface { |
|
101 | 101 | return new RejectedPromise($reason); |
102 | 102 | }); |
103 | 103 | }); |
@@ -54,7 +54,7 @@ |
||
54 | 54 | * @param callable(TThrowable): (PromiseInterface<TRejected>|TRejected) $onRejected |
55 | 55 | * @return PromiseInterface<T|TRejected> |
56 | 56 | */ |
57 | - public function catch(callable $onRejected): PromiseInterface; |
|
57 | + public function catch (callable $onRejected): PromiseInterface; |
|
58 | 58 | |
59 | 59 | /** |
60 | 60 | * Allows you to execute "cleanup" type tasks in a promise chain. |
@@ -23,7 +23,7 @@ |
||
23 | 23 | */ |
24 | 24 | public function __construct(?callable $canceller = null) |
25 | 25 | { |
26 | - $this->promise = new Promise(function ($resolve, $reject): void { |
|
26 | + $this->promise = new Promise(function($resolve, $reject): void { |
|
27 | 27 | $this->resolveCallback = $resolve; |
28 | 28 | $this->rejectCallback = $reject; |
29 | 29 | }, $canceller); |
@@ -36,7 +36,7 @@ discard block |
||
36 | 36 | } |
37 | 37 | |
38 | 38 | /** @var Promise<T> */ |
39 | - return new Promise(function (callable $resolve, callable $reject) use ($promiseOrValue): void { |
|
39 | + return new Promise(function(callable $resolve, callable $reject) use ($promiseOrValue): void { |
|
40 | 40 | $promiseOrValue->then($resolve, $reject); |
41 | 41 | }, $canceller); |
42 | 42 | } |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | $cancellationQueue = new Internal\CancellationQueue(); |
80 | 80 | |
81 | 81 | /** @var Promise<array<T>> */ |
82 | - return new Promise(function (callable $resolve, callable $reject) use ($promisesOrValues, $cancellationQueue): void { |
|
82 | + return new Promise(function(callable $resolve, callable $reject) use ($promisesOrValues, $cancellationQueue): void { |
|
83 | 83 | $toResolve = 0; |
84 | 84 | /** @var bool */ |
85 | 85 | $continue = true; |
@@ -91,14 +91,14 @@ discard block |
||
91 | 91 | ++$toResolve; |
92 | 92 | |
93 | 93 | resolve($promiseOrValue)->then( |
94 | - function ($value) use ($i, &$values, &$toResolve, &$continue, $resolve): void { |
|
94 | + function($value) use ($i, &$values, &$toResolve, &$continue, $resolve): void { |
|
95 | 95 | $values[$i] = $value; |
96 | 96 | |
97 | 97 | if (0 === --$toResolve && !$continue) { |
98 | 98 | $resolve($values); |
99 | 99 | } |
100 | 100 | }, |
101 | - function (\Throwable $reason) use (&$continue, $reject): void { |
|
101 | + function(\Throwable $reason) use (&$continue, $reject): void { |
|
102 | 102 | $continue = false; |
103 | 103 | $reject($reason); |
104 | 104 | } |
@@ -132,13 +132,13 @@ discard block |
||
132 | 132 | $cancellationQueue = new Internal\CancellationQueue(); |
133 | 133 | |
134 | 134 | /** @var Promise<T> */ |
135 | - return new Promise(function (callable $resolve, callable $reject) use ($promisesOrValues, $cancellationQueue): void { |
|
135 | + return new Promise(function(callable $resolve, callable $reject) use ($promisesOrValues, $cancellationQueue): void { |
|
136 | 136 | $continue = true; |
137 | 137 | |
138 | 138 | foreach ($promisesOrValues as $promiseOrValue) { |
139 | 139 | $cancellationQueue->enqueue($promiseOrValue); |
140 | 140 | |
141 | - resolve($promiseOrValue)->then($resolve, $reject)->finally(function () use (&$continue): void { |
|
141 | + resolve($promiseOrValue)->then($resolve, $reject)->finally(function() use (&$continue): void { |
|
142 | 142 | $continue = false; |
143 | 143 | }); |
144 | 144 | |
@@ -169,7 +169,7 @@ discard block |
||
169 | 169 | $cancellationQueue = new Internal\CancellationQueue(); |
170 | 170 | |
171 | 171 | /** @var Promise<T> */ |
172 | - return new Promise(function (callable $resolve, callable $reject) use ($promisesOrValues, $cancellationQueue): void { |
|
172 | + return new Promise(function(callable $resolve, callable $reject) use ($promisesOrValues, $cancellationQueue): void { |
|
173 | 173 | $toReject = 0; |
174 | 174 | $continue = true; |
175 | 175 | $reasons = []; |
@@ -179,11 +179,11 @@ discard block |
||
179 | 179 | ++$toReject; |
180 | 180 | |
181 | 181 | resolve($promiseOrValue)->then( |
182 | - function ($value) use ($resolve, &$continue): void { |
|
182 | + function($value) use ($resolve, &$continue): void { |
|
183 | 183 | $continue = false; |
184 | 184 | $resolve($value); |
185 | 185 | }, |
186 | - function (\Throwable $reason) use ($i, &$reasons, &$toReject, $reject, &$continue): void { |
|
186 | + function(\Throwable $reason) use ($i, &$reasons, &$toReject, $reject, &$continue): void { |
|
187 | 187 | $reasons[$i] = $reason; |
188 | 188 | |
189 | 189 | if (0 === --$toReject && !$continue) { |