@@ -47,7 +47,7 @@ |
||
| 47 | 47 | public function __construct($stream, $loop = null, $readChunkSize = null, $buffer = null) |
| 48 | 48 | { |
| 49 | 49 | if (!\is_resource($stream) || \get_resource_type($stream) !== "stream") { |
| 50 | - throw new InvalidArgumentException('First parameter must be a valid stream resource'); |
|
| 50 | + throw new InvalidArgumentException('First parameter must be a valid stream resource'); |
|
| 51 | 51 | } |
| 52 | 52 | |
| 53 | 53 | // ensure resource is opened for reading and wrting (fopen mode must contain "+") |
@@ -87,18 +87,18 @@ discard block |
||
| 87 | 87 | |
| 88 | 88 | $this->stream = $stream; |
| 89 | 89 | $this->loop = $loop ?: Loop::get(); |
| 90 | - $this->bufferSize = ($readChunkSize === null) ? 65536 : (int)$readChunkSize; |
|
| 90 | + $this->bufferSize = ($readChunkSize === null) ? 65536 : (int) $readChunkSize; |
|
| 91 | 91 | $this->buffer = $buffer; |
| 92 | 92 | |
| 93 | 93 | $that = $this; |
| 94 | 94 | |
| 95 | - $this->buffer->on('error', function ($error) use ($that) { |
|
| 95 | + $this->buffer->on('error', function($error) use ($that) { |
|
| 96 | 96 | $that->emit('error', array($error)); |
| 97 | 97 | }); |
| 98 | 98 | |
| 99 | 99 | $this->buffer->on('close', array($this, 'close')); |
| 100 | 100 | |
| 101 | - $this->buffer->on('drain', function () use ($that) { |
|
| 101 | + $this->buffer->on('drain', function() use ($that) { |
|
| 102 | 102 | $that->emit('drain'); |
| 103 | 103 | }); |
| 104 | 104 | |
@@ -185,7 +185,7 @@ discard block |
||
| 185 | 185 | public function handleData($stream) |
| 186 | 186 | { |
| 187 | 187 | $error = null; |
| 188 | - \set_error_handler(function ($errno, $errstr, $errfile, $errline) use (&$error) { |
|
| 188 | + \set_error_handler(function($errno, $errstr, $errfile, $errline) use (&$error) { |
|
| 189 | 189 | $error = new \ErrorException( |
| 190 | 190 | $errstr, |
| 191 | 191 | 0, |
@@ -21,7 +21,7 @@ discard block |
||
| 21 | 21 | |
| 22 | 22 | public function resolve($domain) |
| 23 | 23 | { |
| 24 | - return $this->resolveAll($domain, Message::TYPE_A)->then(function (array $ips) { |
|
| 24 | + return $this->resolveAll($domain, Message::TYPE_A)->then(function(array $ips) { |
|
| 25 | 25 | return $ips[array_rand($ips)]; |
| 26 | 26 | }); |
| 27 | 27 | } |
@@ -33,7 +33,7 @@ discard block |
||
| 33 | 33 | |
| 34 | 34 | return $this->executor->query( |
| 35 | 35 | $query |
| 36 | - )->then(function (Message $response) use ($query, $that) { |
|
| 36 | + )->then(function(Message $response) use ($query, $that) { |
|
| 37 | 37 | return $that->extractValues($query, $response); |
| 38 | 38 | }); |
| 39 | 39 | } |
@@ -133,14 +133,14 @@ discard block |
||
| 133 | 133 | private function filterByField(array $answers, $field, $value) |
| 134 | 134 | { |
| 135 | 135 | $value = strtolower($value); |
| 136 | - return array_filter($answers, function ($answer) use ($field, $value) { |
|
| 136 | + return array_filter($answers, function($answer) use ($field, $value) { |
|
| 137 | 137 | return $value === strtolower($answer->$field); |
| 138 | 138 | }); |
| 139 | 139 | } |
| 140 | 140 | |
| 141 | 141 | private function mapRecordData(array $records) |
| 142 | 142 | { |
| 143 | - return array_map(function ($record) { |
|
| 143 | + return array_map(function($record) { |
|
| 144 | 144 | return $record->data; |
| 145 | 145 | }, $records); |
| 146 | 146 | } |
@@ -174,7 +174,7 @@ discard block |
||
| 174 | 174 | $rdata = array(); |
| 175 | 175 | while ($consumed < $expected) { |
| 176 | 176 | $len = ord($data[$consumed]); |
| 177 | - $rdata[] = (string)substr($data, $consumed + 1, $len); |
|
| 177 | + $rdata[] = (string) substr($data, $consumed + 1, $len); |
|
| 178 | 178 | $consumed += $len + 1; |
| 179 | 179 | } |
| 180 | 180 | } elseif (Message::TYPE_MX === $type) { |
@@ -291,7 +291,7 @@ discard block |
||
| 291 | 291 | \implode( |
| 292 | 292 | '.', |
| 293 | 293 | \array_map( |
| 294 | - function ($label) { |
|
| 294 | + function($label) { |
|
| 295 | 295 | return \addcslashes($label, "\0..\40.\177"); |
| 296 | 296 | }, |
| 297 | 297 | $labels |
@@ -66,10 +66,10 @@ discard block |
||
| 66 | 66 | $stream = $this->streamExecutor; |
| 67 | 67 | $pending = $this->datagramExecutor->query($query); |
| 68 | 68 | |
| 69 | - return new Promise(function ($resolve, $reject) use (&$pending, $stream, $query) { |
|
| 69 | + return new Promise(function($resolve, $reject) use (&$pending, $stream, $query) { |
|
| 70 | 70 | $pending->then( |
| 71 | 71 | $resolve, |
| 72 | - function ($e) use (&$pending, $stream, $query, $resolve, $reject) { |
|
| 72 | + function($e) use (&$pending, $stream, $query, $resolve, $reject) { |
|
| 73 | 73 | if ($e->getCode() === (\defined('SOCKET_EMSGSIZE') ? \SOCKET_EMSGSIZE : 90)) { |
| 74 | 74 | $pending = $stream->query($query)->then($resolve, $reject); |
| 75 | 75 | } else { |
@@ -77,7 +77,7 @@ discard block |
||
| 77 | 77 | } |
| 78 | 78 | } |
| 79 | 79 | ); |
| 80 | - }, function () use (&$pending) { |
|
| 80 | + }, function() use (&$pending) { |
|
| 81 | 81 | $pending->cancel(); |
| 82 | 82 | $pending = null; |
| 83 | 83 | }); |
@@ -21,8 +21,8 @@ discard block |
||
| 21 | 21 | $fallback = $this->fallback; |
| 22 | 22 | $promise = $this->executor->query($query); |
| 23 | 23 | |
| 24 | - return new Promise(function ($resolve, $reject) use (&$promise, $fallback, $query, &$cancelled) { |
|
| 25 | - $promise->then($resolve, function (\Exception $e1) use ($fallback, $query, $resolve, $reject, &$cancelled, &$promise) { |
|
| 24 | + return new Promise(function($resolve, $reject) use (&$promise, $fallback, $query, &$cancelled) { |
|
| 25 | + $promise->then($resolve, function(\Exception $e1) use ($fallback, $query, $resolve, $reject, &$cancelled, &$promise) { |
|
| 26 | 26 | // reject if primary resolution rejected due to cancellation |
| 27 | 27 | if ($cancelled) { |
| 28 | 28 | $reject($e1); |
@@ -30,7 +30,7 @@ discard block |
||
| 30 | 30 | } |
| 31 | 31 | |
| 32 | 32 | // start fallback query if primary query rejected |
| 33 | - $promise = $fallback->query($query)->then($resolve, function (\Exception $e2) use ($e1, $reject) { |
|
| 33 | + $promise = $fallback->query($query)->then($resolve, function(\Exception $e2) use ($e1, $reject) { |
|
| 34 | 34 | $append = $e2->getMessage(); |
| 35 | 35 | if (($pos = strpos($append, ':')) !== false) { |
| 36 | 36 | $append = substr($append, $pos + 2); |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | $reject(new \RuntimeException($e1->getMessage() . '. ' . $append)); |
| 41 | 41 | }); |
| 42 | 42 | }); |
| 43 | - }, function () use (&$promise, &$cancelled) { |
|
| 43 | + }, function() use (&$promise, &$cancelled) { |
|
| 44 | 44 | // cancel pending query (primary or fallback) |
| 45 | 45 | $cancelled = true; |
| 46 | 46 | $promise->cancel(); |
@@ -32,9 +32,9 @@ discard block |
||
| 32 | 32 | $executor = $this->executor; |
| 33 | 33 | |
| 34 | 34 | $pending = $cache->get($id); |
| 35 | - return new Promise(function ($resolve, $reject) use ($query, $id, $cache, $executor, &$pending, $that) { |
|
| 35 | + return new Promise(function($resolve, $reject) use ($query, $id, $cache, $executor, &$pending, $that) { |
|
| 36 | 36 | $pending->then( |
| 37 | - function ($message) use ($query, $id, $cache, $executor, &$pending, $that) { |
|
| 37 | + function($message) use ($query, $id, $cache, $executor, &$pending, $that) { |
|
| 38 | 38 | // return cached response message on cache hit |
| 39 | 39 | if ($message !== null) { |
| 40 | 40 | return $message; |
@@ -42,7 +42,7 @@ discard block |
||
| 42 | 42 | |
| 43 | 43 | // perform DNS lookup if not already cached |
| 44 | 44 | return $pending = $executor->query($query)->then( |
| 45 | - function (Message $message) use ($cache, $id, $that) { |
|
| 45 | + function(Message $message) use ($cache, $id, $that) { |
|
| 46 | 46 | // DNS response message received => store in cache when not truncated and return |
| 47 | 47 | if (!$message->tc) { |
| 48 | 48 | $cache->set($id, $message, $that->ttl($message)); |
@@ -52,11 +52,11 @@ discard block |
||
| 52 | 52 | } |
| 53 | 53 | ); |
| 54 | 54 | } |
| 55 | - )->then($resolve, function ($e) use ($reject, &$pending) { |
|
| 55 | + )->then($resolve, function($e) use ($reject, &$pending) { |
|
| 56 | 56 | $reject($e); |
| 57 | 57 | $pending = null; |
| 58 | 58 | }); |
| 59 | - }, function ($_, $reject) use (&$pending, $query) { |
|
| 59 | + }, function($_, $reject) use (&$pending, $query) { |
|
| 60 | 60 | $reject(new \RuntimeException('DNS query for ' . $query->describe() . ' has been cancelled')); |
| 61 | 61 | $pending->cancel(); |
| 62 | 62 | $pending = null; |
@@ -58,11 +58,11 @@ discard block |
||
| 58 | 58 | $this->pending[$key] = $promise; |
| 59 | 59 | $this->counts[$key] = 1; |
| 60 | 60 | |
| 61 | - $pending =& $this->pending; |
|
| 62 | - $counts =& $this->counts; |
|
| 63 | - $promise->then(function () use ($key, &$pending, &$counts) { |
|
| 61 | + $pending = & $this->pending; |
|
| 62 | + $counts = & $this->counts; |
|
| 63 | + $promise->then(function() use ($key, &$pending, &$counts) { |
|
| 64 | 64 | unset($pending[$key], $counts[$key]); |
| 65 | - }, function () use ($key, &$pending, &$counts) { |
|
| 65 | + }, function() use ($key, &$pending, &$counts) { |
|
| 66 | 66 | unset($pending[$key], $counts[$key]); |
| 67 | 67 | }); |
| 68 | 68 | } |
@@ -70,11 +70,11 @@ discard block |
||
| 70 | 70 | // Return a child promise awaiting the pending query. |
| 71 | 71 | // Cancelling this child promise should only cancel the pending query |
| 72 | 72 | // when no other child promise is awaiting the same query. |
| 73 | - $pending =& $this->pending; |
|
| 74 | - $counts =& $this->counts; |
|
| 75 | - return new Promise(function ($resolve, $reject) use ($promise) { |
|
| 73 | + $pending = & $this->pending; |
|
| 74 | + $counts = & $this->counts; |
|
| 75 | + return new Promise(function($resolve, $reject) use ($promise) { |
|
| 76 | 76 | $promise->then($resolve, $reject); |
| 77 | - }, function () use (&$promise, $key, $query, &$pending, &$counts) { |
|
| 77 | + }, function() use (&$promise, $key, $query, &$pending, &$counts) { |
|
| 78 | 78 | if (--$counts[$key] < 1) { |
| 79 | 79 | unset($pending[$key], $counts[$key]); |
| 80 | 80 | $promise->cancel(); |
@@ -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')); |