@@ -148,7 +148,7 @@ discard block |
||
148 | 148 | * @param \GameQ\Buffer $buffer |
149 | 149 | * @param \GameQ\Result $result |
150 | 150 | */ |
151 | - protected function processKeyValuePairs(Buffer &$buffer, Result &$result) |
|
151 | + protected function processKeyValuePairs(Buffer & $buffer, Result & $result) |
|
152 | 152 | { |
153 | 153 | |
154 | 154 | // Key / value pairs |
@@ -176,7 +176,7 @@ discard block |
||
176 | 176 | * @param \GameQ\Buffer $buffer |
177 | 177 | * @param \GameQ\Result $result |
178 | 178 | */ |
179 | - protected function processPlayersAndTeams(Buffer &$buffer, Result &$result) |
|
179 | + protected function processPlayersAndTeams(Buffer & $buffer, Result & $result) |
|
180 | 180 | { |
181 | 181 | |
182 | 182 | // Players and team info |
@@ -139,7 +139,7 @@ discard block |
||
139 | 139 | { |
140 | 140 | |
141 | 141 | // Results that will be returned |
142 | - $results = [ ]; |
|
142 | + $results = []; |
|
143 | 143 | |
144 | 144 | // Get the length of the server code so we can figure out how much to read later |
145 | 145 | $serverCodeLength = strlen($this->server_code); |
@@ -170,7 +170,7 @@ discard block |
||
170 | 170 | // Now we need to call the proper method |
171 | 171 | $results = array_merge( |
172 | 172 | $results, |
173 | - call_user_func_array([ $this, $this->responses[$response_type] ], [ $buffer ]) |
|
173 | + call_user_func_array([$this, $this->responses[$response_type]], [$buffer]) |
|
174 | 174 | ); |
175 | 175 | |
176 | 176 | unset($buffer); |
@@ -120,7 +120,7 @@ |
||
120 | 120 | |
121 | 121 | // Build the server code |
122 | 122 | $this->server_code = implode('', array_map('chr', explode('.', $server->ip()))) . |
123 | - pack("S", $server->portClient()); |
|
123 | + pack("S", $server->portClient()); |
|
124 | 124 | |
125 | 125 | // Loop over the packets and update them |
126 | 126 | foreach ($this->packets as $packetType => $packet) { |
@@ -200,7 +200,7 @@ discard block |
||
200 | 200 | * @param string $data |
201 | 201 | * @param \GameQ\Result $result |
202 | 202 | */ |
203 | - protected function processDetails($data, Result &$result) |
|
203 | + protected function processDetails($data, Result & $result) |
|
204 | 204 | { |
205 | 205 | |
206 | 206 | // Create a buffer |
@@ -230,7 +230,7 @@ discard block |
||
230 | 230 | * @param string $data |
231 | 231 | * @param \GameQ\Result $result |
232 | 232 | */ |
233 | - protected function processChannels($data, Result &$result) |
|
233 | + protected function processChannels($data, Result & $result) |
|
234 | 234 | { |
235 | 235 | |
236 | 236 | // Create a buffer |
@@ -262,7 +262,7 @@ discard block |
||
262 | 262 | * @param string $data |
263 | 263 | * @param \GameQ\Result $result |
264 | 264 | */ |
265 | - protected function processPlayers($data, Result &$result) |
|
265 | + protected function processPlayers($data, Result & $result) |
|
266 | 266 | { |
267 | 267 | |
268 | 268 | // Create a buffer |
@@ -170,7 +170,7 @@ discard block |
||
170 | 170 | $server_addr = explode(':', $ip_address); |
171 | 171 | |
172 | 172 | // Port is the last item in the array, remove it and save |
173 | - $this->port_client = (int)array_pop($server_addr); |
|
173 | + $this->port_client = (int) array_pop($server_addr); |
|
174 | 174 | |
175 | 175 | // The rest is the address, recombine |
176 | 176 | $this->ip = implode(':', $server_addr); |
@@ -185,7 +185,7 @@ discard block |
||
185 | 185 | } |
186 | 186 | |
187 | 187 | // Now let's validate the IPv6 value sent, remove the square brackets ([]) first |
188 | - if (!filter_var(trim($this->ip, '[]'), FILTER_VALIDATE_IP, ['flags' => FILTER_FLAG_IPV6,])) { |
|
188 | + if (!filter_var(trim($this->ip, '[]'), FILTER_VALIDATE_IP, ['flags' => FILTER_FLAG_IPV6, ])) { |
|
189 | 189 | throw new Exception("The IPv6 address '{$this->ip}' is invalid."); |
190 | 190 | } |
191 | 191 | } else { |
@@ -194,7 +194,7 @@ discard block |
||
194 | 194 | list($this->ip, $this->port_client) = explode(':', $ip_address); |
195 | 195 | |
196 | 196 | // Type case the port |
197 | - $this->port_client = (int)$this->port_client; |
|
197 | + $this->port_client = (int) $this->port_client; |
|
198 | 198 | } else { |
199 | 199 | // No port, fail |
200 | 200 | throw new Exception( |
@@ -204,7 +204,7 @@ discard block |
||
204 | 204 | } |
205 | 205 | |
206 | 206 | // Validate the IPv4 value, if FALSE is not a valid IP, maybe a hostname. Try to resolve |
207 | - if (!filter_var($this->ip, FILTER_VALIDATE_IP, ['flags' => FILTER_FLAG_IPV4,]) |
|
207 | + if (!filter_var($this->ip, FILTER_VALIDATE_IP, ['flags' => FILTER_FLAG_IPV4, ]) |
|
208 | 208 | && $this->ip === gethostbyname($this->ip) |
209 | 209 | ) { |
210 | 210 | // When gethostbyname() fails it returns the original string |
@@ -222,7 +222,7 @@ discard block |
||
222 | 222 | |
223 | 223 | // Specific query port defined |
224 | 224 | if (array_key_exists(self::SERVER_OPTIONS_QUERY_PORT, $this->options)) { |
225 | - $this->port_query = (int)$this->options[self::SERVER_OPTIONS_QUERY_PORT]; |
|
225 | + $this->port_query = (int) $this->options[self::SERVER_OPTIONS_QUERY_PORT]; |
|
226 | 226 | } else { |
227 | 227 | // Do math based on the protocol class |
228 | 228 | $this->port_query = $this->protocol->findQueryPort($this->port_client); |
@@ -90,7 +90,7 @@ |
||
90 | 90 | } |
91 | 91 | |
92 | 92 | // Multiply so we move the decimal point out of the way, if there is one |
93 | - $key = (int)(floatval($matches[2]) * 1000); |
|
93 | + $key = (int) (floatval($matches[2]) * 1000); |
|
94 | 94 | |
95 | 95 | // Add this packet to the processed |
96 | 96 | $processed[$key] = $matches[1]; |
@@ -83,7 +83,7 @@ discard block |
||
83 | 83 | protected $options = [ |
84 | 84 | 'debug' => false, |
85 | 85 | 'timeout' => 3, // Seconds |
86 | - 'filters' => [ 'normalize' => [ ] ], |
|
86 | + 'filters' => ['normalize' => []], |
|
87 | 87 | // Advanced settings |
88 | 88 | 'stream_timeout' => 200000, // See http://www.php.net/manual/en/function.stream-select.php for more info |
89 | 89 | 'write_wait' => 500, |
@@ -98,7 +98,7 @@ discard block |
||
98 | 98 | * |
99 | 99 | * @type array |
100 | 100 | */ |
101 | - protected $servers = [ ]; |
|
101 | + protected $servers = []; |
|
102 | 102 | |
103 | 103 | /** |
104 | 104 | * The query library to use. Default is Native |
@@ -124,7 +124,7 @@ discard block |
||
124 | 124 | public function __get($option) |
125 | 125 | { |
126 | 126 | |
127 | - return isset($this->options[ $option ]) ? $this->options[ $option ] : null; |
|
127 | + return isset($this->options[$option]) ? $this->options[$option] : null; |
|
128 | 128 | } |
129 | 129 | |
130 | 130 | /** |
@@ -138,7 +138,7 @@ discard block |
||
138 | 138 | public function __set($option, $value) |
139 | 139 | { |
140 | 140 | |
141 | - $this->options[ $option ] = $value; |
|
141 | + $this->options[$option] = $value; |
|
142 | 142 | |
143 | 143 | return true; |
144 | 144 | } |
@@ -167,11 +167,11 @@ discard block |
||
167 | 167 | * |
168 | 168 | * @return $this |
169 | 169 | */ |
170 | - public function addServer(array $server_info = [ ]) |
|
170 | + public function addServer(array $server_info = []) |
|
171 | 171 | { |
172 | 172 | |
173 | 173 | // Add and validate the server |
174 | - $this->servers[ uniqid() ] = new Server($server_info); |
|
174 | + $this->servers[uniqid()] = new Server($server_info); |
|
175 | 175 | |
176 | 176 | return $this; // Make calls chainable |
177 | 177 | } |
@@ -183,7 +183,7 @@ discard block |
||
183 | 183 | * |
184 | 184 | * @return $this |
185 | 185 | */ |
186 | - public function addServers(array $servers = [ ]) |
|
186 | + public function addServers(array $servers = []) |
|
187 | 187 | { |
188 | 188 | |
189 | 189 | // Loop through all the servers and add them |
@@ -204,12 +204,12 @@ discard block |
||
204 | 204 | * @return $this |
205 | 205 | * @throws \Exception |
206 | 206 | */ |
207 | - public function addServersFromFiles($files = [ ]) |
|
207 | + public function addServersFromFiles($files = []) |
|
208 | 208 | { |
209 | 209 | |
210 | 210 | // Since we expect an array let us turn a string (i.e. single file) into an array |
211 | 211 | if (!is_array($files)) { |
212 | - $files = [ $files ]; |
|
212 | + $files = [$files]; |
|
213 | 213 | } |
214 | 214 | |
215 | 215 | // Iterate over the file(s) and add them |
@@ -243,7 +243,7 @@ discard block |
||
243 | 243 | { |
244 | 244 | |
245 | 245 | // Reset all the servers |
246 | - $this->servers = [ ]; |
|
246 | + $this->servers = []; |
|
247 | 247 | |
248 | 248 | return $this; // Make Chainable |
249 | 249 | } |
@@ -256,11 +256,11 @@ discard block |
||
256 | 256 | * |
257 | 257 | * @return $this |
258 | 258 | */ |
259 | - public function addFilter($filterName, $options = [ ]) |
|
259 | + public function addFilter($filterName, $options = []) |
|
260 | 260 | { |
261 | 261 | |
262 | 262 | // Add the filter |
263 | - $this->options['filters'][ strtolower($filterName) ] = $options; |
|
263 | + $this->options['filters'][strtolower($filterName)] = $options; |
|
264 | 264 | |
265 | 265 | return $this; |
266 | 266 | } |
@@ -280,7 +280,7 @@ discard block |
||
280 | 280 | |
281 | 281 | // Remove this filter if it has been defined |
282 | 282 | if (array_key_exists($filterName, $this->options['filters'])) { |
283 | - unset($this->options['filters'][ $filterName ]); |
|
283 | + unset($this->options['filters'][$filterName]); |
|
284 | 284 | } |
285 | 285 | |
286 | 286 | return $this; |
@@ -304,7 +304,7 @@ discard block |
||
304 | 304 | unset($class); |
305 | 305 | |
306 | 306 | // Define the return |
307 | - $results = [ ]; |
|
307 | + $results = []; |
|
308 | 308 | |
309 | 309 | // @todo: Add break up into loop to split large arrays into smaller chunks |
310 | 310 | |
@@ -328,7 +328,7 @@ discard block |
||
328 | 328 | ksort($result); |
329 | 329 | |
330 | 330 | // Add the result to the results array |
331 | - $results[ $server->id() ] = $result; |
|
331 | + $results[$server->id()] = $result; |
|
332 | 332 | } |
333 | 333 | |
334 | 334 | return $results; |
@@ -341,7 +341,7 @@ discard block |
||
341 | 341 | { |
342 | 342 | |
343 | 343 | // Initialize the sockets for reading |
344 | - $sockets = [ ]; |
|
344 | + $sockets = []; |
|
345 | 345 | |
346 | 346 | // By default we don't have any challenges to process |
347 | 347 | $server_challenge = false; |
@@ -371,7 +371,7 @@ discard block |
||
371 | 371 | $socket->write($server->protocol()->getPacket(Protocol::PACKET_CHALLENGE)); |
372 | 372 | |
373 | 373 | // Add the socket information so we can reference it easily |
374 | - $sockets[ (int) $socket->get() ] = [ |
|
374 | + $sockets[(int) $socket->get()] = [ |
|
375 | 375 | 'server_id' => $server_id, |
376 | 376 | 'socket' => $socket, |
377 | 377 | ]; |
@@ -394,27 +394,27 @@ discard block |
||
394 | 394 | if ($server_challenge) { |
395 | 395 | // Now we need to listen for and grab challenge response(s) |
396 | 396 | $responses = call_user_func_array( |
397 | - [ $this->query, 'getResponses' ], |
|
398 | - [ $sockets, $this->timeout, $this->stream_timeout ] |
|
397 | + [$this->query, 'getResponses'], |
|
398 | + [$sockets, $this->timeout, $this->stream_timeout] |
|
399 | 399 | ); |
400 | 400 | |
401 | 401 | // Iterate over the challenge responses |
402 | 402 | foreach ($responses as $socket_id => $response) { |
403 | 403 | // Back out the server_id we need to update the challenge response for |
404 | - $server_id = $sockets[ $socket_id ]['server_id']; |
|
404 | + $server_id = $sockets[$socket_id]['server_id']; |
|
405 | 405 | |
406 | 406 | // Make this into a buffer so it is easier to manipulate |
407 | 407 | $challenge = new Buffer(implode('', $response)); |
408 | 408 | |
409 | 409 | // Grab the server instance |
410 | 410 | /* @var $server \GameQ\Server */ |
411 | - $server = $this->servers[ $server_id ]; |
|
411 | + $server = $this->servers[$server_id]; |
|
412 | 412 | |
413 | 413 | // Apply the challenge |
414 | 414 | $server->protocol()->challengeParseAndApply($challenge); |
415 | 415 | |
416 | 416 | // Add this socket to be reused, has to be reused in GameSpy3 for example |
417 | - $server->socketAdd($sockets[ $socket_id ]['socket']); |
|
417 | + $server->socketAdd($sockets[$socket_id]['socket']); |
|
418 | 418 | |
419 | 419 | // Clear |
420 | 420 | unset($server); |
@@ -429,7 +429,7 @@ discard block |
||
429 | 429 | { |
430 | 430 | |
431 | 431 | // Initialize the array of sockets |
432 | - $sockets = [ ]; |
|
432 | + $sockets = []; |
|
433 | 433 | |
434 | 434 | // Iterate over the server list |
435 | 435 | foreach ($this->servers as $server_id => $server) { |
@@ -473,7 +473,7 @@ discard block |
||
473 | 473 | unset($packets); |
474 | 474 | |
475 | 475 | // Add the socket information so we can reference it easily |
476 | - $sockets[ (int) $socket->get() ] = [ |
|
476 | + $sockets[(int) $socket->get()] = [ |
|
477 | 477 | 'server_id' => $server_id, |
478 | 478 | 'socket' => $socket, |
479 | 479 | ]; |
@@ -492,18 +492,18 @@ discard block |
||
492 | 492 | |
493 | 493 | // Now we need to listen for and grab response(s) |
494 | 494 | $responses = call_user_func_array( |
495 | - [ $this->query, 'getResponses' ], |
|
496 | - [ $sockets, $this->timeout, $this->stream_timeout ] |
|
495 | + [$this->query, 'getResponses'], |
|
496 | + [$sockets, $this->timeout, $this->stream_timeout] |
|
497 | 497 | ); |
498 | 498 | |
499 | 499 | // Iterate over the responses |
500 | 500 | foreach ($responses as $socket_id => $response) { |
501 | 501 | // Back out the server_id |
502 | - $server_id = $sockets[ $socket_id ]['server_id']; |
|
502 | + $server_id = $sockets[$socket_id]['server_id']; |
|
503 | 503 | |
504 | 504 | // Grab the server instance |
505 | 505 | /* @var $server \GameQ\Server */ |
506 | - $server = $this->servers[ $server_id ]; |
|
506 | + $server = $this->servers[$server_id]; |
|
507 | 507 | |
508 | 508 | // Save the response from this packet |
509 | 509 | $server->protocol()->packetResponse($response); |
@@ -600,7 +600,7 @@ discard block |
||
600 | 600 | $class = new \ReflectionClass(sprintf('GameQ\\Filters\\%s', ucfirst($filterName))); |
601 | 601 | |
602 | 602 | // Create a new instance of the filter class specified |
603 | - $filter = $class->newInstanceArgs([ $filterOptions ]); |
|
603 | + $filter = $class->newInstanceArgs([$filterOptions]); |
|
604 | 604 | |
605 | 605 | // Apply the filter to the data |
606 | 606 | $results = $filter->apply($results, $server); |
@@ -200,12 +200,12 @@ |
||
200 | 200 | // Check to see if the response is empty, if so we are done with this server |
201 | 201 | if (strlen($response) == 0) { |
202 | 202 | // Remove this server from any future read loops |
203 | - unset($sockets_tmp[(int)$socket]); |
|
203 | + unset($sockets_tmp[(int) $socket]); |
|
204 | 204 | continue; |
205 | 205 | } |
206 | 206 | |
207 | 207 | // Add the response we got back |
208 | - $responses[(int)$socket][] = $response; |
|
208 | + $responses[(int) $socket][] = $response; |
|
209 | 209 | } |
210 | 210 | |
211 | 211 | // Because stream_select modifies read we need to reset it each time to the original array of sockets |
@@ -838,7 +838,7 @@ discard block |
||
838 | 838 | * @param int $fieldCount |
839 | 839 | * @param \GameQ\Result $result |
840 | 840 | */ |
841 | - protected function processChannel($data, $fieldCount, Result &$result) |
|
841 | + protected function processChannel($data, $fieldCount, Result & $result) |
|
842 | 842 | { |
843 | 843 | |
844 | 844 | // Split the items on the comma |
@@ -860,7 +860,7 @@ discard block |
||
860 | 860 | * @param int $fieldCount |
861 | 861 | * @param \GameQ\Result $result |
862 | 862 | */ |
863 | - protected function processPlayer($data, $fieldCount, Result &$result) |
|
863 | + protected function processPlayer($data, $fieldCount, Result & $result) |
|
864 | 864 | { |
865 | 865 | |
866 | 866 | // Split the items on the comma |
@@ -222,7 +222,7 @@ discard block |
||
222 | 222 | * @param \GameQ\Buffer $buffer |
223 | 223 | * @param \GameQ\Result $result |
224 | 224 | */ |
225 | - protected function processDetails(Buffer &$buffer, Result &$result) |
|
225 | + protected function processDetails(Buffer & $buffer, Result & $result) |
|
226 | 226 | { |
227 | 227 | |
228 | 228 | // We go until we hit an empty key |
@@ -241,7 +241,7 @@ discard block |
||
241 | 241 | * @param \GameQ\Buffer $buffer |
242 | 242 | * @param \GameQ\Result $result |
243 | 243 | */ |
244 | - protected function processPlayersAndTeams(Buffer &$buffer, Result &$result) |
|
244 | + protected function processPlayersAndTeams(Buffer & $buffer, Result & $result) |
|
245 | 245 | { |
246 | 246 | |
247 | 247 | /* |