Completed
Push — master ( ea513b...0f77f4 )
by Jean
02:50
created
src/ChainableArray.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -27,14 +27,14 @@  discard block
 block discarded – undo
27 27
 
28 28
     /**
29 29
      */
30
-    public static function from(array $data=[], $isConstant=false)
30
+    public static function from(array $data = [], $isConstant = false)
31 31
     {
32 32
         return new static($data, $isConstant);
33 33
     }
34 34
 
35 35
     /**
36 36
      */
37
-    public function __construct(array $data=[], $isConstant=false)
37
+    public function __construct(array $data = [], $isConstant = false)
38 38
     {
39 39
         $this->data       = $data;
40 40
         $this->isConstant = $isConstant;
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
78 78
      *
79 79
      * @return ChainableArray $this
80 80
      */
81
-    public function setConstant($state=true)
81
+    public function setConstant($state = true)
82 82
     {
83 83
         $this->isConstant = $state;
84 84
         return $this;
@@ -147,7 +147,7 @@  discard block
 block discarded – undo
147 147
     /**
148 148
      * Checks if an argument is an array or a ChainableArray
149 149
      */
150
-    private function argumentIsArrayOrArrayObject( $argument )
150
+    private function argumentIsArrayOrArrayObject($argument)
151 151
     {
152 152
         return is_array($argument)
153 153
             || $argument instanceof ChainableArray;
@@ -162,15 +162,15 @@  discard block
 block discarded – undo
162 162
         $backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 20);
163 163
         $i      = 1;
164 164
         $caller = $backtrace[$i];
165
-        while (     isset($backtrace[$i]['class'])
166
-                &&  $backtrace[$i]['class'] == __CLASS__ ) {
165
+        while (isset($backtrace[$i]['class'])
166
+                &&  $backtrace[$i]['class'] == __CLASS__) {
167 167
             $caller = $backtrace[$i];
168 168
             $i++;
169 169
         }
170 170
 
171 171
         $exception = new \ErrorException($message);
172 172
 
173
-        $reflectionClass = new \ReflectionClass( get_class($exception) );
173
+        $reflectionClass = new \ReflectionClass(get_class($exception));
174 174
 
175 175
         //file
176 176
         $reflectionProperty = $reflectionClass->getProperty('file');
Please login to merge, or discard this patch.
src/ChainableArray_NativeFunctions_Trait.php 1 patch
Spacing   +42 added lines, -42 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
      *                              The current key we be kept if null.
22 22
      * @return $this
23 23
      */
24
-    public function columns($column_names, $index_key=null)
24
+    public function columns($column_names, $index_key = null)
25 25
     {
26 26
         $out = [];
27 27
         foreach ($this->data as $key => &$row) {
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
32 32
             if (is_array($column_names)) {
33 33
                 $out[$key] = [];
34 34
                 foreach ($column_names as $column_name) {
35
-                    if (!array_key_exists($column_name, $row)) {
35
+                    if ( ! array_key_exists($column_name, $row)) {
36 36
                         self::throwUsageException(
37 37
                              "Trying to extract a column from a row which"
38 38
                             ." doesn't contain it : '$column_name' \n"
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
                     $keys = [];
61 61
                 }
62 62
 
63
-                if (!in_array($column_names, $keys)) {
63
+                if ( ! in_array($column_names, $keys)) {
64 64
                     self::throwUsageException('A row have no index to '
65 65
                         .'fill the column: '.$column_names."\n"
66 66
                         .$key.' => '.var_export($row, true));
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
78 78
      *
79 79
      * @deprecated Use columns() instead
80 80
      */
81
-    public function column($column_names, $index_key=null)
81
+    public function column($column_names, $index_key = null)
82 82
     {
83 83
         return $this->columns($column_names, $index_key);
84 84
     }
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
99 99
      * @param  $default_value To use if the array is empty
100 100
      * @return array The min.
101 101
      */
102
-    public function min($default_value=null)
102
+    public function min($default_value = null)
103 103
     {
104 104
         if ($this->isEmpty() && $default_value !== null)
105 105
             return $default_value;
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
122 122
      * @param  $default_value To use if the array is empty
123 123
      * @return array The max.
124 124
      */
125
-    public function max($default_value=null)
125
+    public function max($default_value = null)
126 126
     {
127 127
         if ($this->isEmpty() && $default_value !== null)
128 128
             return $default_value;
@@ -179,7 +179,7 @@  discard block
 block discarded – undo
179 179
      *
180 180
      * @return static $this or a new static.
181 181
      */
182
-    public function filter($callback=null)
182
+    public function filter($callback = null)
183 183
     {
184 184
         if ($callback) {
185 185
 
@@ -187,7 +187,7 @@  discard block
 block discarded – undo
187 187
                 $callback = new \JClaveau\LogicalFilter\LogicalFilter($callback);
188 188
             }
189 189
 
190
-            if (!is_callable($callback)) {
190
+            if ( ! is_callable($callback)) {
191 191
                 $this->throwUsageException(
192 192
                     "\$callback must be a logical filter description array or a callable"
193 193
                     ." instead of "
@@ -204,8 +204,8 @@  discard block
 block discarded – undo
204 204
             else {
205 205
                 $out = $this->data;
206 206
                 foreach ($out as $key => $value) {
207
-                    if (!$callback($value, $key))
208
-                        unset( $out[$key] );
207
+                    if ( ! $callback($value, $key))
208
+                        unset($out[$key]);
209 209
                 }
210 210
             }
211 211
         }
@@ -224,10 +224,10 @@  discard block
 block discarded – undo
224 224
      *
225 225
      * @return static $this or a new static.
226 226
      */
227
-    public function filterKey(callable $callback=null)
227
+    public function filterKey(callable $callback = null)
228 228
     {
229 229
         throw new \ErrorException('This method is replaced by '
230
-            . __TRAIT__ . '::filtr()');
230
+            . __TRAIT__.'::filtr()');
231 231
     }
232 232
 
233 233
     /**
@@ -258,7 +258,7 @@  discard block
 block discarded – undo
258 258
      */
259 259
     public function intersectKey($intersect_with)
260 260
     {
261
-        if (!$this->argumentIsArrayOrArrayObject($intersect_with))
261
+        if ( ! $this->argumentIsArrayOrArrayObject($intersect_with))
262 262
             self::throwUsageException("First argument must be an array or a ".static::class.".");
263 263
 
264 264
         if ($intersect_with instanceof static)
@@ -298,7 +298,7 @@  discard block
 block discarded – undo
298 298
     public function unshift()
299 299
     {
300 300
         $data = $this->data;
301
-        $arguments = Arrays::merge( [&$data], func_get_args() );
301
+        $arguments = Arrays::merge([&$data], func_get_args());
302 302
 
303 303
         call_user_func_array('array_unshift', $arguments);
304 304
         return $this->returnConstant($data);
@@ -312,7 +312,7 @@  discard block
 block discarded – undo
312 312
     public function push()
313 313
     {
314 314
         $data = $this->data;
315
-        $arguments = Arrays::merge( [&$data], func_get_args() );
315
+        $arguments = Arrays::merge([&$data], func_get_args());
316 316
 
317 317
         call_user_func_array('array_push', $arguments);
318 318
         return $this->returnConstant($data);
@@ -323,7 +323,7 @@  discard block
 block discarded – undo
323 323
      *
324 324
      * @return static $this or a new static.
325 325
      */
326
-    public function unique($flags=SORT_STRING)
326
+    public function unique($flags = SORT_STRING)
327 327
     {
328 328
         $out = array_unique($this->data, $flags);
329 329
         return $this->returnConstant($out);
@@ -349,9 +349,9 @@  discard block
 block discarded – undo
349 349
      *
350 350
      * @return static $this or a new static.
351 351
      */
352
-    public function diff($compare_with, $check_keys=false, $strict_comparison=false)
352
+    public function diff($compare_with, $check_keys = false, $strict_comparison = false)
353 353
     {
354
-        if (!$this->argumentIsArrayOrArrayObject($compare_with))
354
+        if ( ! $this->argumentIsArrayOrArrayObject($compare_with))
355 355
             self::throwUsageException("First argument must be an iterable");
356 356
 
357 357
         $kept_values = $this->data;
@@ -364,14 +364,14 @@  discard block
 block discarded – undo
364 364
                 if ($check_keys) {
365 365
 
366 366
                     if ($strict_comparison) {
367
-                        if (    $kept_key   === $compared_key
368
-                            &&  $kept_value === $compared_value ) {
367
+                        if ($kept_key === $compared_key
368
+                            &&  $kept_value === $compared_value) {
369 369
                             $is_equal = true;
370 370
                         }
371 371
                     }
372 372
                     else {
373
-                        if (    $kept_key   == $compared_key
374
-                            &&  $kept_value == $compared_value ) {
373
+                        if ($kept_key == $compared_key
374
+                            &&  $kept_value == $compared_value) {
375 375
                             $is_equal = true;
376 376
                         }
377 377
                     }
@@ -391,7 +391,7 @@  discard block
 block discarded – undo
391 391
 
392 392
                 if ($is_equal) {
393 393
                     // Debug::dumpJson($kept_key, !true);
394
-                    unset($kept_values[ $kept_key ]);
394
+                    unset($kept_values[$kept_key]);
395 395
                     break;
396 396
                 }
397 397
             }
@@ -421,7 +421,7 @@  discard block
 block discarded – undo
421 421
      */
422 422
     public function fillKeys($keys, $value)
423 423
     {
424
-        if (!$this->argumentIsArrayOrArrayObject($keys))
424
+        if ( ! $this->argumentIsArrayOrArrayObject($keys))
425 425
             self::throwUsageException("First argument must be an array or a ".static::class.".");
426 426
 
427 427
         if ($keys instanceof static)
@@ -438,7 +438,7 @@  discard block
 block discarded – undo
438 438
      *
439 439
      * @return static The filled array.
440 440
      */
441
-    public function fill($start, $number, $value, $interval=1)
441
+    public function fill($start, $number, $value, $interval = 1)
442 442
     {
443 443
         $out = [];
444 444
         while ($number >= 0) {
@@ -468,8 +468,8 @@  discard block
 block discarded – undo
468 468
         $zero_key,
469 469
         $end_key,
470 470
         callable $step_generator,
471
-        $max_interations_count=1000
472
-    ){
471
+        $max_interations_count = 1000
472
+    ) {
473 473
         if ($max_interations_count < 0)
474 474
             throw new \InvalidArgumentException("$maximum_interations_count must be positive");
475 475
 
@@ -479,17 +479,17 @@  discard block
 block discarded – undo
479 479
         $iterations_count    = 0;
480 480
 
481 481
         while ($iterations_count <= $max_interations_count) {
482
-            $current_step_value = call_user_func_array( $step_generator, [
483
-                &$current_step_key,   // param by reference
482
+            $current_step_value = call_user_func_array($step_generator, [
483
+                &$current_step_key, // param by reference
484 484
                 $previous_step_value,
485
-                $current_step_key,   // not passed by ref
485
+                $current_step_key, // not passed by ref
486 486
                 $out
487 487
             ]);
488 488
 
489 489
             if ($current_step_key === null) {
490 490
                 $out[] = $current_step_value;
491 491
             }
492
-            elseif (!is_int($current_step_key)) {
492
+            elseif ( ! is_int($current_step_key)) {
493 493
                 // Set the local as en_US tu have floats formatted with
494 494
                 // "." as separator
495 495
                 // TODO : could it be useful for dates to?
@@ -527,7 +527,7 @@  discard block
 block discarded – undo
527 527
      *
528 528
      * @return array The keys.
529 529
      */
530
-    public function keys($search_value=null, $strict=false)
530
+    public function keys($search_value = null, $strict = false)
531 531
     {
532 532
         if ($search_value)
533 533
             return array_keys($this->data, $search_value, $strict);
@@ -559,7 +559,7 @@  discard block
 block discarded – undo
559 559
      *
560 560
      * @return string The array written in PHP code.
561 561
      */
562
-    public function export($return=true)
562
+    public function export($return = true)
563 563
     {
564 564
         return var_export($this->data, $return);
565 565
     }
@@ -572,9 +572,9 @@  discard block
 block discarded – undo
572 572
      * @param  bool $return Should we print it or return it?
573 573
      * @return string The printed array
574 574
      */
575
-    public function print_($return=false)
575
+    public function print_($return = false)
576 576
     {
577
-        if (!$return) {
577
+        if ( ! $return) {
578 578
 
579 579
             echo '<pre>';
580 580
             print_r($this->data);
@@ -634,7 +634,7 @@  discard block
 block discarded – undo
634 634
      *
635 635
      * @see http://php.net/manual/fr/function.prev.php
636 636
      */
637
-    public function usort(callable $callback=null)
637
+    public function usort(callable $callback = null)
638 638
     {
639 639
         $data = $this->data;
640 640
 
@@ -647,9 +647,9 @@  discard block
 block discarded – undo
647 647
             };
648 648
         }
649 649
 
650
-        $arguments = Arrays::merge( [&$data], [$callback] );
650
+        $arguments = Arrays::merge([&$data], [$callback]);
651 651
 
652
-        if ( ! call_user_func_array('uasort', $arguments) )
652
+        if ( ! call_user_func_array('uasort', $arguments))
653 653
             throw new \ErrorException('Unable to apply usort');
654 654
 
655 655
         return $this->returnConstant($data);
@@ -660,7 +660,7 @@  discard block
 block discarded – undo
660 660
      *
661 661
      * @see http://php.net/manual/fr/function.uksort.php
662 662
      */
663
-    public function uksort(callable $callback=null)
663
+    public function uksort(callable $callback = null)
664 664
     {
665 665
         $data = $this->data;
666 666
 
@@ -670,9 +670,9 @@  discard block
 block discarded – undo
670 670
             };
671 671
         }
672 672
 
673
-        $arguments = Arrays::merge( [&$data], [$callback] );
673
+        $arguments = Arrays::merge([&$data], [$callback]);
674 674
 
675
-        if ( ! call_user_func_array('uksort', $arguments) )
675
+        if ( ! call_user_func_array('uksort', $arguments))
676 676
             throw new \ErrorException('Unable to apply uksort');
677 677
 
678 678
         return $this->returnConstant($data);
@@ -686,7 +686,7 @@  discard block
 block discarded – undo
686 686
      */
687 687
     public function intersect($intersect_with)
688 688
     {
689
-        if (!$this->argumentIsArrayOrArrayObject($intersect_with)) {
689
+        if ( ! $this->argumentIsArrayOrArrayObject($intersect_with)) {
690 690
             $this->throwUsageException("First argument must be an array or a ".static::class.".");
691 691
         }
692 692
 
Please login to merge, or discard this patch.
src/polyfills.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if (!function_exists('spl_object_id')) {
2
+if ( ! function_exists('spl_object_id')) {
3 3
     /**
4 4
      * @see https://secure.php.net/manual/en/function.spl-object-id.php
5 5
      * This method doesn't exist before PHP 7.2.0
@@ -12,7 +12,7 @@  discard block
 block discarded – undo
12 12
     }
13 13
 }
14 14
 
15
-if (!function_exists('is_iterable')) {
15
+if ( ! function_exists('is_iterable')) {
16 16
     /**
17 17
      * @see https://github.com/symfony/polyfill-php71/commit/36004d119352f4506398032259a08e4ca9607285
18 18
      * This method doesn't exist before PHP 7.1.0
Please login to merge, or discard this patch.
src/ChainableArray_Wip_Trait.php 1 patch
Spacing   +40 added lines, -40 removed lines patch added patch discarded remove patch
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
91 91
     {
92 92
         $column_name = $key_column_names->shift();
93 93
 
94
-        if (!$column_name)
94
+        if ( ! $column_name)
95 95
             return $rows;
96 96
 
97 97
         // $out = new static;
@@ -212,85 +212,85 @@  discard block
 block discarded – undo
212 212
             '3rd'
213 213
         ]);
214 214
 
215
-        $expected = array (
216
-            0 => array (
215
+        $expected = array(
216
+            0 => array(
217 217
                 'a3' => 1,
218 218
                 'b3' => 1,
219 219
                 '3rd' => 'a2',
220 220
                 '2nd' => 'a1',
221 221
                 '1st' => 'a',
222 222
             ),
223
-            1 => array (
223
+            1 => array(
224 224
                 'a3' => 1,
225 225
                 'b3' => 1,
226 226
                 '3rd' => 'b2',
227 227
                 '2nd' => 'a1',
228 228
                 '1st' => 'a',
229 229
             ),
230
-            2 => array (
230
+            2 => array(
231 231
                 'a3' => 1,
232 232
                 'b3' => 1,
233 233
                 '3rd' => 'c2',
234 234
                 '2nd' => 'a1',
235 235
                 '1st' => 'a',
236 236
             ),
237
-            3 => array (
237
+            3 => array(
238 238
                 'a3' => 1,
239 239
                 'b3' => 1,
240 240
                 '3rd' => 'a2',
241 241
                 '2nd' => 'b1',
242 242
                 '1st' => 'a',
243 243
             ),
244
-            4 => array (
244
+            4 => array(
245 245
                 'a3' => 1,
246 246
                 'b3' => 1,
247 247
                 '3rd' => 'b2',
248 248
                 '2nd' => 'b1',
249 249
                 '1st' => 'a',
250 250
             ),
251
-            5 => array (
251
+            5 => array(
252 252
                 'a3' => 1,
253 253
                 'b3' => 1,
254 254
                 '3rd' => 'c2',
255 255
                 '2nd' => 'b1',
256 256
                 '1st' => 'a',
257 257
             ),
258
-            6 => array (
258
+            6 => array(
259 259
                 'a3' => 1,
260 260
                 'b3' => 1,
261 261
                 '3rd' => 'a2',
262 262
                 '2nd' => 'a1',
263 263
                 '1st' => 'b',
264 264
             ),
265
-            7 => array (
265
+            7 => array(
266 266
                 'a3' => 1,
267 267
                 'b3' => 1,
268 268
                 '3rd' => 'b2',
269 269
                 '2nd' => 'a1',
270 270
                 '1st' => 'b',
271 271
             ),
272
-            8 => array (
272
+            8 => array(
273 273
                 'a3' => 1,
274 274
                 'b3' => 1,
275 275
                 '3rd' => 'c2',
276 276
                 '2nd' => 'a1',
277 277
                 '1st' => 'b',
278 278
             ),
279
-            9 => array (
279
+            9 => array(
280 280
                 'a3' => 1,
281 281
                 'b3' => 1,
282 282
                 '3rd' => 'a2',
283 283
                 '2nd' => 'b1',
284 284
                 '1st' => 'b',
285 285
             ),
286
-            10 => array (
286
+            10 => array(
287 287
                 'a3' => 1,
288 288
                 'b3' => 1,
289 289
                 '3rd' => 'b2',
290 290
                 '2nd' => 'b1',
291 291
                 '1st' => 'b',
292 292
             ),
293
-            11 => array (
293
+            11 => array(
294 294
                 'a3' => 1,
295 295
                 'b3' => 1,
296 296
                 '3rd' => 'c2',
@@ -327,19 +327,19 @@  discard block
 block discarded – undo
327 327
      */
328 328
     private function piramidize_aux($key_column_names, $rows)
329 329
     {
330
-        if (!is_array($rows))
330
+        if ( ! is_array($rows))
331 331
             return $rows;
332 332
 
333 333
         $column_name = $key_column_names->shift();
334 334
 
335
-        if (!$column_name)
335
+        if ( ! $column_name)
336 336
             return $rows;
337 337
 
338 338
         // $out = new static;
339 339
         $out = [];
340 340
         foreach ($rows as $key => $row) {
341 341
 
342
-            if (!isset($row[$column_name])) {
342
+            if ( ! isset($row[$column_name])) {
343 343
                 throw new \ErrorException("No value found for column"
344 344
                     ." name '$column_name' in the row: ".var_export($row, true));
345 345
             }
@@ -348,7 +348,7 @@  discard block
 block discarded – undo
348 348
             unset($row[$column_name]);
349 349
 
350 350
             if ($key_column_names->count()) {
351
-                if (!isset($out[$key]))
351
+                if ( ! isset($out[$key]))
352 352
                     $out[$key] = [];
353 353
 
354 354
                 $out[$key][] = $row;
@@ -456,68 +456,68 @@  discard block
 block discarded – undo
456 456
             '1st',
457 457
         ]);
458 458
 
459
-        $expected = array (
460
-            'a2' => array (
461
-                'a1' => array (
462
-                    'a' => array (
459
+        $expected = array(
460
+            'a2' => array(
461
+                'a1' => array(
462
+                    'a' => array(
463 463
                         'a3' => 1,
464 464
                         'b3' => 1,
465 465
                     ),
466
-                    'b' => array (
466
+                    'b' => array(
467 467
                         'a3' => 1,
468 468
                         'b3' => 1,
469 469
                     ),
470 470
                 ),
471
-                'b1' => array (
472
-                    'a' => array (
471
+                'b1' => array(
472
+                    'a' => array(
473 473
                         'a3' => 1,
474 474
                         'b3' => 1,
475 475
                     ),
476
-                    'b' => array (
476
+                    'b' => array(
477 477
                         'a3' => 1,
478 478
                         'b3' => 1,
479 479
                     ),
480 480
                 ),
481 481
             ),
482
-            'b2' => array (
483
-                'a1' => array (
484
-                    'a' => array (
482
+            'b2' => array(
483
+                'a1' => array(
484
+                    'a' => array(
485 485
                         'a3' => 2,
486 486
                         'b3' => 2,
487 487
                     ),
488
-                    'b' => array (
488
+                    'b' => array(
489 489
                         'a3' => 2,
490 490
                         'b3' => 2,
491 491
                     ),
492 492
                 ),
493
-                'b1' => array (
494
-                    'a' => array (
493
+                'b1' => array(
494
+                    'a' => array(
495 495
                         'a3' => 2,
496 496
                         'b3' => 2,
497 497
                     ),
498
-                    'b' => array (
498
+                    'b' => array(
499 499
                         'a3' => 2,
500 500
                         'b3' => 2,
501 501
                     ),
502 502
                 ),
503 503
             ),
504
-            'c2' => array (
505
-                'a1' => array (
506
-                    'a' => array (
504
+            'c2' => array(
505
+                'a1' => array(
506
+                    'a' => array(
507 507
                         'a3' => 3,
508 508
                         'b3' => 3,
509 509
                     ),
510
-                    'b' => array (
510
+                    'b' => array(
511 511
                         'a3' => 3,
512 512
                         'b3' => 3,
513 513
                     ),
514 514
                 ),
515
-                'b1' => array (
516
-                    'a' => array (
515
+                'b1' => array(
516
+                    'a' => array(
517 517
                         'a3' => 3,
518 518
                         'b3' => 3,
519 519
                     ),
520
-                    'b' => array (
520
+                    'b' => array(
521 521
                         'a3' => 3,
522 522
                         'b3' => 3,
523 523
                     ),
Please login to merge, or discard this patch.
src/ChainableArray_ArrayAccess_Trait.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -86,7 +86,7 @@
 block discarded – undo
86 86
             // The true location of the throw is still available through
87 87
             // $e->getTrace()
88 88
             $trace_location  = $e->getTrace()[1];
89
-            $reflectionClass = new \ReflectionClass( get_class($e) );
89
+            $reflectionClass = new \ReflectionClass(get_class($e));
90 90
 
91 91
             //file
92 92
             if (isset($trace_location['file'])) {
Please login to merge, or discard this patch.
src/ChainableArray_Utils_Trait.php 1 patch
Spacing   +64 added lines, -64 removed lines patch added patch discarded remove patch
@@ -18,7 +18,7 @@  discard block
 block discarded – undo
18 18
      *
19 19
      * @return array The array containing the grouped rows.
20 20
      */
21
-    public function groupBy( callable $indexGenerator, callable $conflictResolver=null )
21
+    public function groupBy(callable $indexGenerator, callable $conflictResolver = null)
22 22
     {
23 23
         // todo : this doesn't work
24 24
         // return $this->groupByTransformed($indexGenerator, null, $conflictResolver);
@@ -26,15 +26,15 @@  discard block
 block discarded – undo
26 26
         $out = [];
27 27
         foreach ($this->data as $key => $row) {
28 28
 
29
-            if (!$row)
29
+            if ( ! $row)
30 30
                 continue;
31 31
 
32 32
             $newIndexes     = call_user_func($indexGenerator, $key, $row);
33
-            if (!is_array($newIndexes))
33
+            if ( ! is_array($newIndexes))
34 34
                 $newIndexes = [$newIndexes];
35 35
 
36 36
             foreach ($newIndexes as $newIndex) {
37
-                if (!isset($out[$newIndex])) {
37
+                if ( ! isset($out[$newIndex])) {
38 38
                     $out[$newIndex] = $row;
39 39
                 }
40 40
                 else {
@@ -69,26 +69,26 @@  discard block
 block discarded – undo
69 69
      *
70 70
      * @return array The array containing the grouped rows.
71 71
      */
72
-    public function groupInArrays( callable $indexGenerator )
72
+    public function groupInArrays(callable $indexGenerator)
73 73
     {
74 74
         $out = [];
75 75
         foreach ($this->data as $key => $row) {
76 76
 
77
-            if (!$row)
77
+            if ( ! $row)
78 78
                 continue;
79 79
 
80 80
             $new_keys = call_user_func($indexGenerator, $key, $row);
81
-            if (!is_array($new_keys))
81
+            if ( ! is_array($new_keys))
82 82
                 $new_keys = [$new_keys];
83 83
 
84 84
             foreach ($new_keys as $new_key) {
85
-                if (!isset($out[ $new_key ])) {
86
-                    $out[ $new_key ] = [
85
+                if ( ! isset($out[$new_key])) {
86
+                    $out[$new_key] = [
87 87
                         $key => $row
88 88
                     ];
89 89
                 }
90 90
                 else {
91
-                    $out[ $new_key ][ $key ] = $row;
91
+                    $out[$new_key][$key] = $row;
92 92
                 }
93 93
             }
94 94
         }
@@ -111,13 +111,13 @@  discard block
 block discarded – undo
111 111
     public static function mergeRecursiveCustom(
112 112
         array $existing_row,
113 113
         array $conflict_row,
114
-        callable $merge_resolver=null,
115
-        $max_depth=null
116
-    ){
114
+        callable $merge_resolver = null,
115
+        $max_depth = null
116
+    ) {
117 117
         foreach ($conflict_row as $column => $conflict_value) {
118 118
 
119 119
             // not existing in first array
120
-            if (!isset($existing_row[$column])) {
120
+            if ( ! isset($existing_row[$column])) {
121 121
                 $existing_row[$column] = $conflict_value;
122 122
                 continue;
123 123
             }
@@ -150,7 +150,7 @@  discard block
 block discarded – undo
150 150
             }
151 151
             else {
152 152
                 // same reslution as array_merge_recursive
153
-                if (!is_array($existing_value)) {
153
+                if ( ! is_array($existing_value)) {
154 154
                     $existing_row[$column] = [$existing_value];
155 155
                 }
156 156
 
@@ -173,13 +173,13 @@  discard block
 block discarded – undo
173 173
     public static function mergePreservingDistincts(
174 174
         array $existing_row,
175 175
         array $conflict_row
176
-    ){
176
+    ) {
177 177
         return static::mergeRecursiveCustom(
178 178
             $existing_row,
179 179
             $conflict_row,
180
-            function ($existing_value, $conflict_value, $column) {
180
+            function($existing_value, $conflict_value, $column) {
181 181
 
182
-                if (!is_array($existing_value))
182
+                if ( ! is_array($existing_value))
183 183
                     $existing_value = [$existing_value];
184 184
 
185 185
                 // We store the new value with their previous ones
@@ -204,10 +204,10 @@  discard block
 block discarded – undo
204 204
      *
205 205
      * @see mergePreservingDistincts()
206 206
      */
207
-    public static function keepUniqueColumnValues(array $row, array $excluded_columns=[])
207
+    public static function keepUniqueColumnValues(array $row, array $excluded_columns = [])
208 208
     {
209 209
         foreach ($row as $column => &$values) {
210
-            if (!is_array($values))
210
+            if ( ! is_array($values))
211 211
                 continue;
212 212
 
213 213
             if (in_array($column, $excluded_columns))
@@ -237,7 +237,7 @@  discard block
 block discarded – undo
237 237
      */
238 238
     public function groupByTransformed(
239 239
         callable $indexGenerator,
240
-        callable $rowTransformer,      // todo check this behavior
240
+        callable $rowTransformer, // todo check this behavior
241 241
         callable $conflictResolver )
242 242
     {
243 243
         // The goal here is to remove the second parameter has it makes the
@@ -250,7 +250,7 @@  discard block
 block discarded – undo
250 250
         $out = [];
251 251
         foreach ($this->data as $key => $row) {
252 252
 
253
-            if (!$row)
253
+            if ( ! $row)
254 254
                 continue;
255 255
 
256 256
             $newIndex       = call_user_func($indexGenerator, $key, $row);
@@ -259,7 +259,7 @@  discard block
 block discarded – undo
259 259
                             ? call_user_func($rowTransformer, $row)
260 260
                             : $row;
261 261
 
262
-            if (!isset($out[$newIndex])) {
262
+            if ( ! isset($out[$newIndex])) {
263 263
                 $out[$newIndex] = $transformedRow;
264 264
             }
265 265
             else {
@@ -284,12 +284,12 @@  discard block
 block discarded – undo
284 284
      *                                       rows have the same index.
285 285
      * @return static
286 286
      */
287
-    public function mergeWith( $otherTable, callable $conflictResolver=null )
287
+    public function mergeWith($otherTable, callable $conflictResolver = null)
288 288
     {
289 289
         if (is_array($otherTable))
290 290
             $otherTable = new static($otherTable);
291 291
 
292
-        if (!$otherTable instanceof static) {
292
+        if ( ! $otherTable instanceof static) {
293 293
             self::throwUsageException(
294 294
                 '$otherTable must be an array or an instance of '.static::class.' instead of: '
295 295
                 .var_export($otherTable, true)
@@ -299,7 +299,7 @@  discard block
 block discarded – undo
299 299
         $out = $this->data;
300 300
         foreach ($otherTable->getArray() as $key => $row) {
301 301
 
302
-            if (!isset($out[$key])) {
302
+            if ( ! isset($out[$key])) {
303 303
                 $out[$key] = $row;
304 304
             }
305 305
             else {
@@ -327,7 +327,7 @@  discard block
 block discarded – undo
327 327
      * (same as self::mergeWith with the other table as $this)
328 328
      * @return static
329 329
      */
330
-    public function mergeIn( $otherTable, callable $conflictResolver=null )
330
+    public function mergeIn($otherTable, callable $conflictResolver = null)
331 331
     {
332 332
         $otherTable->mergeWith($this, $conflictResolver);
333 333
         return $this;
@@ -353,7 +353,7 @@  discard block
 block discarded – undo
353 353
      */
354 354
     public function each(callable $rowTransformer)
355 355
     {
356
-        $out  = [];
356
+        $out = [];
357 357
         foreach ($this->data as $key => $row) {
358 358
             $out[$key] = call_user_func_array(
359 359
                 $rowTransformer,
@@ -383,7 +383,7 @@  discard block
 block discarded – undo
383 383
      */
384 384
     public function renameColumns(array $old_to_new_names)
385 385
     {
386
-        $out  = [];
386
+        $out = [];
387 387
         foreach ($this->data as $key => $row) {
388 388
             try {
389 389
                 foreach ($old_to_new_names as $old_name => $new_name) {
@@ -392,7 +392,7 @@  discard block
 block discarded – undo
392 392
                 }
393 393
             }
394 394
             catch (\Exception $e) {
395
-                self::throwUsageException( $e->getMessage() );
395
+                self::throwUsageException($e->getMessage());
396 396
             }
397 397
 
398 398
             $out[$key] = $row;
@@ -444,20 +444,20 @@  discard block
 block discarded – undo
444 444
      *                            nor a static.
445 445
      * @return static       $this
446 446
      */
447
-    public function append($new_rows, callable $conflict_resolver=null)
447
+    public function append($new_rows, callable $conflict_resolver = null)
448 448
     {
449 449
         if ($new_rows instanceof static)
450 450
             $new_rows = $new_rows->getArray();
451 451
 
452
-        if (!is_array($new_rows)) {
452
+        if ( ! is_array($new_rows)) {
453 453
             $this->throwUsageException(
454
-                "\$new_rows parameter must be an array or an instance of " . __CLASS__
454
+                "\$new_rows parameter must be an array or an instance of ".__CLASS__
455 455
             );
456 456
         }
457 457
 
458
-        if (!$conflict_resolver) {
458
+        if ( ! $conflict_resolver) {
459 459
             // default conflict resolver: append with numeric key
460
-            $conflict_resolver = function (&$data, $existing_row, $confliuct_row, $key) {
460
+            $conflict_resolver = function(&$data, $existing_row, $confliuct_row, $key) {
461 461
                 $data[] = $confliuct_row;
462 462
             };
463 463
         }
@@ -489,7 +489,7 @@  discard block
 block discarded – undo
489 489
      *
490 490
      * @return static
491 491
      */
492
-    public function dimensionsAsColumns(array $columnNames, array $options=null)
492
+    public function dimensionsAsColumns(array $columnNames, array $options = null)
493 493
     {
494 494
         $out = $this->dimensionsAsColumns_recurser($this->data, $columnNames);
495 495
         return $this->returnConstant($out);
@@ -526,12 +526,12 @@  discard block
 block discarded – undo
526 526
      *      ],
527 527
      * ]
528 528
      */
529
-    protected function dimensionsAsColumns_recurser(array $data, $columnNames, $rowIdParts=[])
529
+    protected function dimensionsAsColumns_recurser(array $data, $columnNames, $rowIdParts = [])
530 530
     {
531 531
         $out = [];
532 532
         // if (!$columnNames)
533 533
             // return $data;
534
-        $no_more_column = !(bool) $columnNames;
534
+        $no_more_column = ! (bool) $columnNames;
535 535
 
536 536
         // If all the names have been given to the dimensions
537 537
         // we compile the index key of the row at the current level
@@ -555,7 +555,7 @@  discard block
 block discarded – undo
555 555
                     self::throwUsageException(
556 556
                          "Trying to populate a column '$name' that "
557 557
                         ."already exists with a different value "
558
-                        .var_export($data[$name], true). " => '$value'"
558
+                        .var_export($data[$name], true)." => '$value'"
559 559
                     );
560 560
                 }
561 561
                 $data[$name] = $value;
@@ -586,7 +586,7 @@  discard block
 block discarded – undo
586 586
             }
587 587
             else {
588 588
 
589
-                if (!isset($rows)) {
589
+                if ( ! isset($rows)) {
590 590
                     echo json_encode([
591 591
                         '$rowIdParts' => $rowIdParts,
592 592
                         '$row' => $row,
@@ -645,12 +645,12 @@  discard block
 block discarded – undo
645 645
 
646 646
             if (is_string($value) && array_key_exists($value, $row)) {
647 647
                 $part_name  .= $value;
648
-                $group_value = $row[ $value ];
648
+                $group_value = $row[$value];
649 649
             }
650 650
             elseif (is_callable($value)) {
651 651
 
652 652
                 if (is_string($value)) {
653
-                    $part_name  .= $value;
653
+                    $part_name .= $value;
654 654
                 }
655 655
                 // elseif (is_function($value)) {
656 656
                 elseif (is_object($value) && ($value instanceof Closure)) {
@@ -666,19 +666,19 @@  discard block
 block discarded – undo
666 666
                 ]);
667 667
             }
668 668
             elseif (is_int($value)) {
669
-                $part_name  .= $value ? : '0';
670
-                $group_value = $row[ $value ];
669
+                $part_name  .= $value ?: '0';
670
+                $group_value = $row[$value];
671 671
             }
672 672
             else {
673 673
                 self::throwUsageException(
674 674
                     'Bad value provided for groupBy id generation: '
675 675
                     .var_export($value, true)
676
-                    ."\n" . var_export($row, true)
676
+                    ."\n".var_export($row, true)
677 677
                 );
678 678
             }
679 679
 
680
-            if (!is_null($part_name))
681
-                $group_parts[ $part_name ] = $group_value;
680
+            if ( ! is_null($part_name))
681
+                $group_parts[$part_name] = $group_value;
682 682
         }
683 683
 
684 684
         // sort the groups by names (without it the same group could have multiple ids)
@@ -696,9 +696,9 @@  discard block
 block discarded – undo
696 696
     /**
697 697
      * Returns the first element of the array
698 698
      */
699
-    public function first($strict=false)
699
+    public function first($strict = false)
700 700
     {
701
-        if (!$this->count()) {
701
+        if ( ! $this->count()) {
702 702
             if ($strict)
703 703
                 throw new \ErrorException("No first element found in this array");
704 704
             else
@@ -718,9 +718,9 @@  discard block
 block discarded – undo
718 718
      *
719 719
      * @todo Preserve the offset
720 720
      */
721
-    public function last($strict=false)
721
+    public function last($strict = false)
722 722
     {
723
-        if (!$this->count()) {
723
+        if ( ! $this->count()) {
724 724
             if ($strict)
725 725
                 throw new \ErrorException("No last element found in this array");
726 726
             else
@@ -738,9 +738,9 @@  discard block
 block discarded – undo
738 738
     /**
739 739
      *
740 740
      */
741
-    public function firstKey($strict=false)
741
+    public function firstKey($strict = false)
742 742
     {
743
-        if (!$this->count()) {
743
+        if ( ! $this->count()) {
744 744
             if ($strict)
745 745
                 throw new \ErrorException("No last element found in this array");
746 746
             else
@@ -759,16 +759,16 @@  discard block
 block discarded – undo
759 759
     /**
760 760
      *
761 761
      */
762
-    public function lastKey($strict=false)
762
+    public function lastKey($strict = false)
763 763
     {
764
-        if (!$this->count()) {
764
+        if ( ! $this->count()) {
765 765
             if ($strict)
766 766
                 throw new \ErrorException("No last element found in this array");
767 767
             else
768 768
                 $lastKey = null;
769 769
         }
770 770
         else {
771
-            $key  = key($this->data);
771
+            $key = key($this->data);
772 772
             end($this->data);
773 773
             $lastKey = key($this->data);
774 774
             $this->move($key);
@@ -780,7 +780,7 @@  discard block
 block discarded – undo
780 780
     /**
781 781
      * Move the internal pointer of the array to the key given as parameter
782 782
      */
783
-    public function move($key, $strict=true)
783
+    public function move($key, $strict = true)
784 784
     {
785 785
         if (array_key_exists($key, $this->data)) {
786 786
             foreach ($this->data as $i => &$value) {
@@ -847,13 +847,13 @@  discard block
 block discarded – undo
847 847
      * @see http://php.net/manual/fr/function.var-dump.php
848 848
      * @todo Handle xdebug dump formatting
849 849
      */
850
-    public function dump($exit=false)
850
+    public function dump($exit = false)
851 851
     {
852 852
         $bt = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2);
853 853
         $caller = $bt[0];
854 854
 
855 855
         header('content-type: text/html');
856
-        var_dump($caller['file'] . ':' . $caller['line']);
856
+        var_dump($caller['file'].':'.$caller['line']);
857 857
         var_dump($this->data);
858 858
 
859 859
         if ($exit)
@@ -869,7 +869,7 @@  discard block
 block discarded – undo
869 869
      * @todo move it to an Arrays class storing static methods
870 870
      */
871 871
     public static function replaceEntries(
872
-        array $array, callable $replacer, $max_depth=null
872
+        array $array, callable $replacer, $max_depth = null
873 873
     ) {
874 874
         foreach ($array as $key => &$row) {
875 875
             $arguments = [&$row, $key];
@@ -877,7 +877,7 @@  discard block
 block discarded – undo
877 877
 
878 878
             if (is_array($row) && $max_depth !== 0) { // allowing null to have no depth limit
879 879
                 $row = self::replaceEntries(
880
-                    $row, $replacer, $max_depth ? $max_depth-1 : $max_depth
880
+                    $row, $replacer, $max_depth ? $max_depth - 1 : $max_depth
881 881
                 );
882 882
             }
883 883
         }
@@ -893,7 +893,7 @@  discard block
 block discarded – undo
893 893
      *
894 894
      * @return static $this or a new static.
895 895
      */
896
-    public function extract($callback=null)
896
+    public function extract($callback = null)
897 897
     {
898 898
         if ($callback) {
899 899
 
@@ -901,7 +901,7 @@  discard block
 block discarded – undo
901 901
                 $callback = new \JClaveau\LogicalFilter\LogicalFilter($callback);
902 902
             }
903 903
 
904
-            if (!is_callable($callback)) {
904
+            if ( ! is_callable($callback)) {
905 905
                 $this->throwUsageException(
906 906
                     "\$callback must be a logical filter description array or a callable"
907 907
                     ." instead of "
@@ -913,7 +913,7 @@  discard block
 block discarded – undo
913 913
             foreach ($this->data as $key => $value) {
914 914
                 if ($callback($value, $key)) {
915 915
                     $out[$key] = $value;
916
-                    unset( $this->data[$key] );
916
+                    unset($this->data[$key]);
917 917
                 }
918 918
             }
919 919
         }
Please login to merge, or discard this patch.