@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | // TODO: add write() event to make sure we're not sending any excessive data |
| 67 | 67 | |
| 68 | 68 | // cancelling this leaves this stream in an inconsistent state… |
| 69 | - $deferred = new Deferred(function () { |
|
| 69 | + $deferred = new Deferred(function() { |
|
| 70 | 70 | throw new \RuntimeException(); |
| 71 | 71 | }); |
| 72 | 72 | |
@@ -81,7 +81,7 @@ discard block |
||
| 81 | 81 | } |
| 82 | 82 | |
| 83 | 83 | $that = $this; |
| 84 | - $toggleCrypto = function () use ($socket, $deferred, $toggle, $method, $that) { |
|
| 84 | + $toggleCrypto = function() use ($socket, $deferred, $toggle, $method, $that) { |
|
| 85 | 85 | $that->toggleCrypto($socket, $deferred, $toggle, $method); |
| 86 | 86 | }; |
| 87 | 87 | |
@@ -93,7 +93,7 @@ discard block |
||
| 93 | 93 | |
| 94 | 94 | $loop = $this->loop; |
| 95 | 95 | |
| 96 | - return $deferred->promise()->then(function () use ($stream, $socket, $loop, $toggle) { |
|
| 96 | + return $deferred->promise()->then(function() use ($stream, $socket, $loop, $toggle) { |
|
| 97 | 97 | $loop->removeReadStream($socket); |
| 98 | 98 | |
| 99 | 99 | $stream->encryptionEnabled = $toggle; |
@@ -118,7 +118,7 @@ discard block |
||
| 118 | 118 | public function toggleCrypto($socket, Deferred $deferred, $toggle, $method) |
| 119 | 119 | { |
| 120 | 120 | $error = null; |
| 121 | - \set_error_handler(function ($_, $errstr) use (&$error) { |
|
| 121 | + \set_error_handler(function($_, $errstr) use (&$error) { |
|
| 122 | 122 | $error = \str_replace(array("\r", "\n"), ' ', $errstr); |
| 123 | 123 | |
| 124 | 124 | // remove useless function name from error message |
@@ -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, $uri) { |
|
| 37 | + return new Promise(function($resolve, $reject) use ($loop, $time, $promise, $uri) { |
|
| 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, $uri) { |
|
| 59 | + $timer = $loop->addTimer($time, function() use ($time, &$promise, $reject, $uri) { |
|
| 60 | 60 | $reject(new \RuntimeException( |
| 61 | 61 | 'Connection to ' . $uri . ' timed out after ' . $time . ' seconds (ETIMEDOUT)', |
| 62 | 62 | \defined('SOCKET_ETIMEDOUT') ? \SOCKET_ETIMEDOUT : 110 |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | $promise->cancel(); |
| 69 | 69 | $promise = null; |
| 70 | 70 | }); |
| 71 | - }, function () use (&$promise) { |
|
| 71 | + }, function() use (&$promise) { |
|
| 72 | 72 | // Cancelling this promise will cancel the pending connection, thus triggering the rejection logic above. |
| 73 | 73 | // Avoid garbage references in call stack by passing pending promise by reference. |
| 74 | 74 | assert(\method_exists($promise, 'cancel')); |
@@ -106,8 +106,8 @@ discard block |
||
| 106 | 106 | |
| 107 | 107 | // wait for connection |
| 108 | 108 | $loop = $this->loop; |
| 109 | - return new Promise\Promise(function ($resolve, $reject) use ($loop, $stream, $uri) { |
|
| 110 | - $loop->addWriteStream($stream, function ($stream) use ($loop, $resolve, $reject, $uri) { |
|
| 109 | + return new Promise\Promise(function($resolve, $reject) use ($loop, $stream, $uri) { |
|
| 110 | + $loop->addWriteStream($stream, function($stream) use ($loop, $resolve, $reject, $uri) { |
|
| 111 | 111 | $loop->removeWriteStream($stream); |
| 112 | 112 | |
| 113 | 113 | // The following hack looks like the only way to |
@@ -126,7 +126,7 @@ discard block |
||
| 126 | 126 | // This is only known to work on Linux, Mac and Windows are known to not support this. |
| 127 | 127 | $errno = 0; |
| 128 | 128 | $errstr = ''; |
| 129 | - \set_error_handler(function ($_, $error) use (&$errno, &$errstr) { |
|
| 129 | + \set_error_handler(function($_, $error) use (&$errno, &$errstr) { |
|
| 130 | 130 | // Match errstr from PHP's warning message. |
| 131 | 131 | // fwrite(): send of 1 bytes failed with errno=111 Connection refused |
| 132 | 132 | \preg_match('/errno=(\d+) (.+)/', $error, $m); |
@@ -153,7 +153,7 @@ discard block |
||
| 153 | 153 | $resolve(new Connection($stream, $loop)); |
| 154 | 154 | } |
| 155 | 155 | }); |
| 156 | - }, function () use ($loop, $stream, $uri) { |
|
| 156 | + }, function() use ($loop, $stream, $uri) { |
|
| 157 | 157 | $loop->removeWriteStream($stream); |
| 158 | 158 | \fclose($stream); |
| 159 | 159 | |
@@ -72,10 +72,10 @@ discard block |
||
| 72 | 72 | $this->server = $server; |
| 73 | 73 | |
| 74 | 74 | $that = $this; |
| 75 | - $server->on('connection', function (ConnectionInterface $conn) use ($that) { |
|
| 75 | + $server->on('connection', function(ConnectionInterface $conn) use ($that) { |
|
| 76 | 76 | $that->emit('connection', array($conn)); |
| 77 | 77 | }); |
| 78 | - $server->on('error', function (\Exception $error) use ($that) { |
|
| 78 | + $server->on('error', function(\Exception $error) use ($that) { |
|
| 79 | 79 | $that->emit('error', array($error)); |
| 80 | 80 | }); |
| 81 | 81 | } |
@@ -112,7 +112,7 @@ discard block |
||
| 112 | 112 | { |
| 113 | 113 | $errno = 0; |
| 114 | 114 | $errstr = ''; |
| 115 | - \set_error_handler(function ($_, $error) use (&$errno, &$errstr) { |
|
| 115 | + \set_error_handler(function($_, $error) use (&$errno, &$errstr) { |
|
| 116 | 116 | // Match errstr from PHP's warning message. |
| 117 | 117 | // stream_socket_accept(): accept failed: Connection timed out |
| 118 | 118 | $errstr = \preg_replace('#.*: #', '', $error); |
@@ -164,7 +164,7 @@ |
||
| 164 | 164 | |
| 165 | 165 | $this->connections[] = $connection; |
| 166 | 166 | $that = $this; |
| 167 | - $connection->on('close', function () use ($that, $connection) { |
|
| 167 | + $connection->on('close', function() use ($that, $connection) { |
|
| 168 | 168 | $that->handleDisconnection($connection); |
| 169 | 169 | }); |
| 170 | 170 | |
@@ -39,7 +39,7 @@ |
||
| 39 | 39 | // parse string into array structure |
| 40 | 40 | // ignore warnings due to excessive data structures (max_input_vars and max_input_nesting_level) |
| 41 | 41 | $ret = array(); |
| 42 | - @\parse_str((string)$request->getBody(), $ret); |
|
| 42 | + @\parse_str((string) $request->getBody(), $ret); |
|
| 43 | 43 | |
| 44 | 44 | return $request->withParsedBody($ret); |
| 45 | 45 | } |
@@ -53,11 +53,11 @@ discard block |
||
| 53 | 53 | /** @var ?\Closure $closer */ |
| 54 | 54 | $closer = null; |
| 55 | 55 | |
| 56 | - return new Promise(function ($resolve, $reject) use ($body, &$closer, $sizeLimit, $request, $next) { |
|
| 56 | + return new Promise(function($resolve, $reject) use ($body, &$closer, $sizeLimit, $request, $next) { |
|
| 57 | 57 | // buffer request body data in memory, discard but keep buffering if limit is reached |
| 58 | 58 | $buffer = ''; |
| 59 | 59 | $bufferer = null; |
| 60 | - $body->on('data', $bufferer = function ($data) use (&$buffer, $sizeLimit, $body, &$bufferer) { |
|
| 60 | + $body->on('data', $bufferer = function($data) use (&$buffer, $sizeLimit, $body, &$bufferer) { |
|
| 61 | 61 | $buffer .= $data; |
| 62 | 62 | |
| 63 | 63 | // On buffer overflow keep the request body stream in, |
@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | }); |
| 73 | 73 | |
| 74 | 74 | // call $next with current buffer and resolve or reject with its results |
| 75 | - $body->on('close', $closer = function () use (&$buffer, $request, $resolve, $reject, $next) { |
|
| 75 | + $body->on('close', $closer = function() use (&$buffer, $request, $resolve, $reject, $next) { |
|
| 76 | 76 | try { |
| 77 | 77 | // resolve with result of next handler |
| 78 | 78 | $resolve($next($request->withBody(new BufferedBody($buffer)))); |
@@ -85,7 +85,7 @@ discard block |
||
| 85 | 85 | }); |
| 86 | 86 | |
| 87 | 87 | // reject buffering if body emits error |
| 88 | - $body->on('error', function (\Exception $e) use ($reject, $body, $closer) { |
|
| 88 | + $body->on('error', function(\Exception $e) use ($reject, $body, $closer) { |
|
| 89 | 89 | // remove close handler to avoid resolving, then close and reject |
| 90 | 90 | assert($closer instanceof \Closure); |
| 91 | 91 | $body->removeListener('close', $closer); |
@@ -97,7 +97,7 @@ discard block |
||
| 97 | 97 | $e |
| 98 | 98 | )); |
| 99 | 99 | }); |
| 100 | - }, function () use ($body, &$closer) { |
|
| 100 | + }, function() use ($body, &$closer) { |
|
| 101 | 101 | // cancelled buffering: remove close handler to avoid resolving, then close and reject |
| 102 | 102 | assert($closer instanceof \Closure); |
| 103 | 103 | $body->removeListener('close', $closer); |
@@ -130,12 +130,12 @@ discard block |
||
| 130 | 130 | } |
| 131 | 131 | |
| 132 | 132 | // get next queue position |
| 133 | - $queue =& $this->queue; |
|
| 133 | + $queue = & $this->queue; |
|
| 134 | 134 | $queue[] = null; |
| 135 | 135 | \end($queue); |
| 136 | 136 | $id = \key($queue); |
| 137 | 137 | |
| 138 | - $deferred = new Deferred(function ($_, $reject) use (&$queue, $id) { |
|
| 138 | + $deferred = new Deferred(function($_, $reject) use (&$queue, $id) { |
|
| 139 | 139 | // queued promise cancelled before its next handler is invoked |
| 140 | 140 | // remove from queue and reject explicitly |
| 141 | 141 | unset($queue[$id]); |
@@ -147,7 +147,7 @@ discard block |
||
| 147 | 147 | |
| 148 | 148 | $pending = &$this->pending; |
| 149 | 149 | $that = $this; |
| 150 | - return $deferred->promise()->then(function () use ($request, $next, $body, &$pending, $that) { |
|
| 150 | + return $deferred->promise()->then(function() use ($request, $next, $body, &$pending, $that) { |
|
| 151 | 151 | // invoke next request handler |
| 152 | 152 | ++$pending; |
| 153 | 153 | |
@@ -182,11 +182,11 @@ discard block |
||
| 182 | 182 | { |
| 183 | 183 | $that = $this; |
| 184 | 184 | |
| 185 | - return $promise->then(function ($response) use ($that) { |
|
| 185 | + return $promise->then(function($response) use ($that) { |
|
| 186 | 186 | $that->processQueue(); |
| 187 | 187 | |
| 188 | 188 | return $response; |
| 189 | - }, function ($error) use ($that) { |
|
| 189 | + }, function($error) use ($that) { |
|
| 190 | 190 | $that->processQueue(); |
| 191 | 191 | |
| 192 | 192 | return Promise\reject($error); |
@@ -283,7 +283,7 @@ discard block |
||
| 283 | 283 | { |
| 284 | 284 | return \preg_replace_callback( |
| 285 | 285 | '/(?:[^a-z0-9_\-\.~!\$&\'\(\)\*\+,;=' . ($component === \PHP_URL_PATH ? ':@\/' : ($component === \PHP_URL_QUERY || $component === \PHP_URL_FRAGMENT ? ':@\/\?' : '')) . '%]++|%(?![a-f0-9]{2}))/i', |
| 286 | - function (array $match) { |
|
| 286 | + function(array $match) { |
|
| 287 | 287 | return \rawurlencode($match[0]); |
| 288 | 288 | }, |
| 289 | 289 | $part |
@@ -310,7 +310,7 @@ discard block |
||
| 310 | 310 | if ($rel->getAuthority() !== '') { |
| 311 | 311 | $reset = true; |
| 312 | 312 | $userInfo = \explode(':', $rel->getUserInfo(), 2); |
| 313 | - $new = $base->withUserInfo($userInfo[0], isset($userInfo[1]) ? $userInfo[1]: null)->withHost($rel->getHost())->withPort($rel->getPort()); |
|
| 313 | + $new = $base->withUserInfo($userInfo[0], isset($userInfo[1]) ? $userInfo[1] : null)->withHost($rel->getHost())->withPort($rel->getPort()); |
|
| 314 | 314 | } |
| 315 | 315 | |
| 316 | 316 | if ($reset && $rel->getPath() === '') { |