@@ -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) { |
@@ -479,7 +479,7 @@ discard block |
||
| 479 | 479 | unset($packets); |
| 480 | 480 | |
| 481 | 481 | // Add the socket information so we can reference it easily |
| 482 | - $sockets[ (int) $socket->get() ] = [ |
|
| 482 | + $sockets[(int) $socket->get()] = [ |
|
| 483 | 483 | 'server_id' => $server_id, |
| 484 | 484 | 'socket' => $socket, |
| 485 | 485 | ]; |
@@ -490,18 +490,18 @@ discard block |
||
| 490 | 490 | |
| 491 | 491 | // Now we need to listen for and grab response(s) |
| 492 | 492 | $responses = call_user_func_array( |
| 493 | - [ $this->query, 'getResponses' ], |
|
| 494 | - [ $sockets, $this->timeout, $this->stream_timeout ] |
|
| 493 | + [$this->query, 'getResponses'], |
|
| 494 | + [$sockets, $this->timeout, $this->stream_timeout] |
|
| 495 | 495 | ); |
| 496 | 496 | |
| 497 | 497 | // Iterate over the responses |
| 498 | 498 | foreach ($responses as $socket_id => $response) { |
| 499 | 499 | // Back out the server_id |
| 500 | - $server_id = $sockets[ $socket_id ]['server_id']; |
|
| 500 | + $server_id = $sockets[$socket_id]['server_id']; |
|
| 501 | 501 | |
| 502 | 502 | // Grab the server instance |
| 503 | 503 | /* @var $server \GameQ\Server */ |
| 504 | - $server = $this->servers[ $server_id ]; |
|
| 504 | + $server = $this->servers[$server_id]; |
|
| 505 | 505 | |
| 506 | 506 | // Save the response from this packet |
| 507 | 507 | $server->protocol()->packetResponse($response); |
@@ -598,7 +598,7 @@ discard block |
||
| 598 | 598 | $class = new \ReflectionClass(sprintf('GameQ\\Filters\\%s', ucfirst($filterName))); |
| 599 | 599 | |
| 600 | 600 | // Create a new instance of the filter class specified |
| 601 | - $filter = $class->newInstanceArgs([ $filterOptions ]); |
|
| 601 | + $filter = $class->newInstanceArgs([$filterOptions]); |
|
| 602 | 602 | |
| 603 | 603 | // Apply the filter to the data |
| 604 | 604 | $results = $filter->apply($results, $server); |
@@ -134,19 +134,19 @@ discard block |
||
| 134 | 134 | $loop_active = true; |
| 135 | 135 | |
| 136 | 136 | // Will hold the responses read from the sockets |
| 137 | - $responses = [ ]; |
|
| 137 | + $responses = []; |
|
| 138 | 138 | |
| 139 | 139 | // To store the sockets |
| 140 | - $sockets_tmp = [ ]; |
|
| 140 | + $sockets_tmp = []; |
|
| 141 | 141 | |
| 142 | 142 | // Loop and pull out all the actual sockets we need to listen on |
| 143 | 143 | foreach ($sockets as $socket_id => $socket_data) { |
| 144 | 144 | // Get the socket |
| 145 | 145 | /* @var $socket \GameQ\Query\Core */ |
| 146 | - $socket = $socket_data[ 'socket' ]; |
|
| 146 | + $socket = $socket_data['socket']; |
|
| 147 | 147 | |
| 148 | 148 | // Append the actual socket we are listening to |
| 149 | - $sockets_tmp[ $socket_id ] = $socket->get(); |
|
| 149 | + $sockets_tmp[$socket_id] = $socket->get(); |
|
| 150 | 150 | |
| 151 | 151 | unset($socket); |
| 152 | 152 | } |
@@ -191,12 +191,12 @@ discard block |
||
| 191 | 191 | // Check to see if the response is empty, if so we are done with this server |
| 192 | 192 | if (strlen($response) == 0) { |
| 193 | 193 | // Remove this server from any future read loops |
| 194 | - unset($sockets_tmp[ (int) $socket ]); |
|
| 194 | + unset($sockets_tmp[(int) $socket]); |
|
| 195 | 195 | continue; |
| 196 | 196 | } |
| 197 | 197 | |
| 198 | 198 | // Add the response we got back |
| 199 | - $responses[ (int) $socket ][] = $response; |
|
| 199 | + $responses[(int) $socket][] = $response; |
|
| 200 | 200 | } |
| 201 | 201 | |
| 202 | 202 | // Because stream_select modifies read we need to reset it each time to the original array of sockets |