Completed
Push — v3 ( d4735a...cb3f17 )
by Austin
08:35
created
src/GameQ/Query/Native.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -138,10 +138,10 @@  discard block
 block discarded – undo
138 138
         $loop_active = true;
139 139
 
140 140
         // Will hold the responses read from the sockets
141
-        $responses = [ ];
141
+        $responses = [];
142 142
 
143 143
         // To store the sockets
144
-        $sockets_tmp = [ ];
144
+        $sockets_tmp = [];
145 145
 
146 146
         // Loop and pull out all the actual sockets we need to listen on
147 147
         foreach ($sockets as $socket_id => $socket_data) {
@@ -150,7 +150,7 @@  discard block
 block discarded – undo
150 150
             $socket = $socket_data['socket'];
151 151
 
152 152
             // Append the actual socket we are listening to
153
-            $sockets_tmp[ $socket_id ] = $socket->get();
153
+            $sockets_tmp[$socket_id] = $socket->get();
154 154
 
155 155
             unset($socket);
156 156
         }
@@ -195,12 +195,12 @@  discard block
 block discarded – undo
195 195
                 // Check to see if the response is empty, if so we are done with this server
196 196
                 if (strlen($response) == 0) {
197 197
                     // Remove this server from any future read loops
198
-                    unset($sockets_tmp[ (int) $socket ]);
198
+                    unset($sockets_tmp[(int) $socket]);
199 199
                     continue;
200 200
                 }
201 201
 
202 202
                 // Add the response we got back
203
-                $responses[ (int) $socket ][] = $response;
203
+                $responses[(int) $socket][] = $response;
204 204
             }
205 205
 
206 206
             // Because stream_select modifies read we need to reset it each time to the original array of sockets
Please login to merge, or discard this patch.
src/GameQ/GameQ.php 1 patch
Spacing   +29 added lines, -29 removed lines patch added patch discarded remove patch
@@ -83,7 +83,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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);
Please login to merge, or discard this patch.