Completed
Push — master ( d20ccf...046303 )
by Jean
02:40
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   +58 added lines, -58 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, $row, $key);
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
         }
@@ -102,9 +102,9 @@  discard block
 block discarded – undo
102 102
     public static function mergeRecursiveCustom(
103 103
         array $existing_row,
104 104
         array $conflict_row,
105
-        callable $merge_resolver=null,
106
-        $max_depth=null
107
-    ){
105
+        callable $merge_resolver = null,
106
+        $max_depth = null
107
+    ) {
108 108
         return Arrays::mergeRecursiveCustom(
109 109
             $existing_row,
110 110
             $conflict_row,
@@ -126,7 +126,7 @@  discard block
 block discarded – undo
126 126
     /**
127 127
      * @deprecated Arrays::mergePreservingDistincts()
128 128
      */
129
-    public static function keepUniqueColumnValues(array $row, array $excluded_columns=[])
129
+    public static function keepUniqueColumnValues(array $row, array $excluded_columns = [])
130 130
     {
131 131
         return Arrays::keepUniqueColumnValues($row, $excluded_columns);
132 132
     }
@@ -147,7 +147,7 @@  discard block
 block discarded – undo
147 147
      */
148 148
     public function groupByTransformed(
149 149
         callable $indexGenerator,
150
-        callable $rowTransformer,      // todo check this behavior
150
+        callable $rowTransformer, // todo check this behavior
151 151
         callable $conflictResolver )
152 152
     {
153 153
         // The goal here is to remove the second parameter has it makes the
@@ -160,7 +160,7 @@  discard block
 block discarded – undo
160 160
         $out = [];
161 161
         foreach ($this->data as $key => $row) {
162 162
 
163
-            if (!$row)
163
+            if ( ! $row)
164 164
                 continue;
165 165
 
166 166
             $newIndex       = call_user_func($indexGenerator, $key, $row);
@@ -169,7 +169,7 @@  discard block
 block discarded – undo
169 169
                             ? call_user_func($rowTransformer, $row)
170 170
                             : $row;
171 171
 
172
-            if (!isset($out[$newIndex])) {
172
+            if ( ! isset($out[$newIndex])) {
173 173
                 $out[$newIndex] = $transformedRow;
174 174
             }
175 175
             else {
@@ -194,12 +194,12 @@  discard block
 block discarded – undo
194 194
      *                                       rows have the same index.
195 195
      * @return static
196 196
      */
197
-    public function mergeWith( $otherTable, callable $conflictResolver=null )
197
+    public function mergeWith($otherTable, callable $conflictResolver = null)
198 198
     {
199 199
         if (is_array($otherTable))
200 200
             $otherTable = new static($otherTable);
201 201
 
202
-        if (!$otherTable instanceof static) {
202
+        if ( ! $otherTable instanceof static) {
203 203
             self::throwUsageException(
204 204
                 '$otherTable must be an array or an instance of '.static::class.' instead of: '
205 205
                 .var_export($otherTable, true)
@@ -209,7 +209,7 @@  discard block
 block discarded – undo
209 209
         $out = $this->data;
210 210
         foreach ($otherTable->getArray() as $key => $row) {
211 211
 
212
-            if (!isset($out[$key])) {
212
+            if ( ! isset($out[$key])) {
213 213
                 $out[$key] = $row;
214 214
             }
215 215
             else {
@@ -237,7 +237,7 @@  discard block
 block discarded – undo
237 237
      * (same as self::mergeWith with the other table as $this)
238 238
      * @return static
239 239
      */
240
-    public function mergeIn( $otherTable, callable $conflictResolver=null )
240
+    public function mergeIn($otherTable, callable $conflictResolver = null)
241 241
     {
242 242
         $otherTable->mergeWith($this, $conflictResolver);
243 243
         return $this;
@@ -263,7 +263,7 @@  discard block
 block discarded – undo
263 263
      */
264 264
     public function each(callable $rowTransformer)
265 265
     {
266
-        $out  = [];
266
+        $out = [];
267 267
         foreach ($this->data as $key => $row) {
268 268
             $out[$key] = call_user_func_array(
269 269
                 $rowTransformer,
@@ -293,7 +293,7 @@  discard block
 block discarded – undo
293 293
      */
294 294
     public function renameColumns(array $old_to_new_names)
295 295
     {
296
-        $out  = [];
296
+        $out = [];
297 297
         foreach ($this->data as $key => $row) {
298 298
             try {
299 299
                 foreach ($old_to_new_names as $old_name => $new_name) {
@@ -302,7 +302,7 @@  discard block
 block discarded – undo
302 302
                 }
303 303
             }
304 304
             catch (\Exception $e) {
305
-                self::throwUsageException( $e->getMessage() );
305
+                self::throwUsageException($e->getMessage());
306 306
             }
307 307
 
308 308
             $out[$key] = $row;
@@ -354,20 +354,20 @@  discard block
 block discarded – undo
354 354
      *                            nor a static.
355 355
      * @return static       $this
356 356
      */
357
-    public function append($new_rows, callable $conflict_resolver=null)
357
+    public function append($new_rows, callable $conflict_resolver = null)
358 358
     {
359 359
         if ($new_rows instanceof static)
360 360
             $new_rows = $new_rows->getArray();
361 361
 
362
-        if (!is_array($new_rows)) {
362
+        if ( ! is_array($new_rows)) {
363 363
             $this->throwUsageException(
364
-                "\$new_rows parameter must be an array or an instance of " . __CLASS__
364
+                "\$new_rows parameter must be an array or an instance of ".__CLASS__
365 365
             );
366 366
         }
367 367
 
368
-        if (!$conflict_resolver) {
368
+        if ( ! $conflict_resolver) {
369 369
             // default conflict resolver: append with numeric key
370
-            $conflict_resolver = function (&$data, $existing_row, $confliuct_row, $key) {
370
+            $conflict_resolver = function(&$data, $existing_row, $confliuct_row, $key) {
371 371
                 $data[] = $confliuct_row;
372 372
             };
373 373
         }
@@ -399,7 +399,7 @@  discard block
 block discarded – undo
399 399
      *
400 400
      * @return static
401 401
      */
402
-    public function dimensionsAsColumns(array $columnNames, array $options=null)
402
+    public function dimensionsAsColumns(array $columnNames, array $options = null)
403 403
     {
404 404
         $out = $this->dimensionsAsColumns_recurser($this->data, $columnNames);
405 405
         return $this->returnConstant($out);
@@ -436,12 +436,12 @@  discard block
 block discarded – undo
436 436
      *      ],
437 437
      * ]
438 438
      */
439
-    protected function dimensionsAsColumns_recurser(array $data, $columnNames, $rowIdParts=[])
439
+    protected function dimensionsAsColumns_recurser(array $data, $columnNames, $rowIdParts = [])
440 440
     {
441 441
         $out = [];
442 442
         // if (!$columnNames)
443 443
             // return $data;
444
-        $no_more_column = !(bool) $columnNames;
444
+        $no_more_column = ! (bool) $columnNames;
445 445
 
446 446
         // If all the names have been given to the dimensions
447 447
         // we compile the index key of the row at the current level
@@ -465,7 +465,7 @@  discard block
 block discarded – undo
465 465
                     self::throwUsageException(
466 466
                          "Trying to populate a column '$name' that "
467 467
                         ."already exists with a different value "
468
-                        .var_export($data[$name], true). " => '$value'"
468
+                        .var_export($data[$name], true)." => '$value'"
469 469
                     );
470 470
                 }
471 471
                 $data[$name] = $value;
@@ -496,7 +496,7 @@  discard block
 block discarded – undo
496 496
             }
497 497
             else {
498 498
 
499
-                if (!isset($rows)) {
499
+                if ( ! isset($rows)) {
500 500
                     echo json_encode([
501 501
                         '$rowIdParts' => $rowIdParts,
502 502
                         '$row' => $row,
@@ -555,12 +555,12 @@  discard block
 block discarded – undo
555 555
 
556 556
             if (is_string($value) && array_key_exists($value, $row)) {
557 557
                 $part_name  .= $value;
558
-                $group_value = $row[ $value ];
558
+                $group_value = $row[$value];
559 559
             }
560 560
             elseif (is_callable($value)) {
561 561
 
562 562
                 if (is_string($value)) {
563
-                    $part_name  .= $value;
563
+                    $part_name .= $value;
564 564
                 }
565 565
                 // elseif (is_function($value)) {
566 566
                 elseif (is_object($value) && ($value instanceof Closure)) {
@@ -576,19 +576,19 @@  discard block
 block discarded – undo
576 576
                 ]);
577 577
             }
578 578
             elseif (is_int($value)) {
579
-                $part_name  .= $value ? : '0';
580
-                $group_value = $row[ $value ];
579
+                $part_name  .= $value ?: '0';
580
+                $group_value = $row[$value];
581 581
             }
582 582
             else {
583 583
                 self::throwUsageException(
584 584
                     'Bad value provided for groupBy id generation: '
585 585
                     .var_export($value, true)
586
-                    ."\n" . var_export($row, true)
586
+                    ."\n".var_export($row, true)
587 587
                 );
588 588
             }
589 589
 
590
-            if (!is_null($part_name))
591
-                $group_parts[ $part_name ] = $group_value;
590
+            if ( ! is_null($part_name))
591
+                $group_parts[$part_name] = $group_value;
592 592
         }
593 593
 
594 594
         // sort the groups by names (without it the same group could have multiple ids)
@@ -606,9 +606,9 @@  discard block
 block discarded – undo
606 606
     /**
607 607
      * Returns the first element of the array
608 608
      */
609
-    public function first($strict=false)
609
+    public function first($strict = false)
610 610
     {
611
-        if (!$this->count()) {
611
+        if ( ! $this->count()) {
612 612
             if ($strict)
613 613
                 throw new \ErrorException("No first element found in this array");
614 614
             else
@@ -628,9 +628,9 @@  discard block
 block discarded – undo
628 628
      *
629 629
      * @todo Preserve the offset
630 630
      */
631
-    public function last($strict=false)
631
+    public function last($strict = false)
632 632
     {
633
-        if (!$this->count()) {
633
+        if ( ! $this->count()) {
634 634
             if ($strict)
635 635
                 throw new \ErrorException("No last element found in this array");
636 636
             else
@@ -648,9 +648,9 @@  discard block
 block discarded – undo
648 648
     /**
649 649
      *
650 650
      */
651
-    public function firstKey($strict=false)
651
+    public function firstKey($strict = false)
652 652
     {
653
-        if (!$this->count()) {
653
+        if ( ! $this->count()) {
654 654
             if ($strict)
655 655
                 throw new \ErrorException("No last element found in this array");
656 656
             else
@@ -669,16 +669,16 @@  discard block
 block discarded – undo
669 669
     /**
670 670
      *
671 671
      */
672
-    public function lastKey($strict=false)
672
+    public function lastKey($strict = false)
673 673
     {
674
-        if (!$this->count()) {
674
+        if ( ! $this->count()) {
675 675
             if ($strict)
676 676
                 throw new \ErrorException("No last element found in this array");
677 677
             else
678 678
                 $lastKey = null;
679 679
         }
680 680
         else {
681
-            $key  = key($this->data);
681
+            $key = key($this->data);
682 682
             end($this->data);
683 683
             $lastKey = key($this->data);
684 684
             $this->move($key);
@@ -690,7 +690,7 @@  discard block
 block discarded – undo
690 690
     /**
691 691
      * Move the internal pointer of the array to the key given as parameter
692 692
      */
693
-    public function move($key, $strict=true)
693
+    public function move($key, $strict = true)
694 694
     {
695 695
         if (array_key_exists($key, $this->data)) {
696 696
             foreach ($this->data as $i => &$value) {
@@ -757,13 +757,13 @@  discard block
 block discarded – undo
757 757
      * @see http://php.net/manual/fr/function.var-dump.php
758 758
      * @todo Handle xdebug dump formatting
759 759
      */
760
-    public function dump($exit=false)
760
+    public function dump($exit = false)
761 761
     {
762 762
         $bt = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2);
763 763
         $caller = $bt[0];
764 764
 
765 765
         var_export([
766
-            'location' => $caller['file'] . ':' . $caller['line'],
766
+            'location' => $caller['file'].':'.$caller['line'],
767 767
             'data'     => $this->data,
768 768
         ]);
769 769
 
@@ -780,7 +780,7 @@  discard block
 block discarded – undo
780 780
      * @todo move it to an Arrays class storing static methods
781 781
      */
782 782
     public static function replaceEntries(
783
-        array $array, callable $replacer, $max_depth=null
783
+        array $array, callable $replacer, $max_depth = null
784 784
     ) {
785 785
         foreach ($array as $key => &$row) {
786 786
             $arguments = [&$row, $key];
@@ -788,7 +788,7 @@  discard block
 block discarded – undo
788 788
 
789 789
             if (is_array($row) && $max_depth !== 0) { // allowing null to have no depth limit
790 790
                 $row = self::replaceEntries(
791
-                    $row, $replacer, $max_depth ? $max_depth-1 : $max_depth
791
+                    $row, $replacer, $max_depth ? $max_depth - 1 : $max_depth
792 792
                 );
793 793
             }
794 794
         }
@@ -804,7 +804,7 @@  discard block
 block discarded – undo
804 804
      *
805 805
      * @return static $this or a new static.
806 806
      */
807
-    public function extract($callback=null)
807
+    public function extract($callback = null)
808 808
     {
809 809
         if ($callback) {
810 810
 
@@ -812,7 +812,7 @@  discard block
 block discarded – undo
812 812
                 $callback = new \JClaveau\LogicalFilter\LogicalFilter($callback);
813 813
             }
814 814
 
815
-            if (!is_callable($callback)) {
815
+            if ( ! is_callable($callback)) {
816 816
                 $this->throwUsageException(
817 817
                     "\$callback must be a logical filter description array or a callable"
818 818
                     ." instead of "
@@ -824,7 +824,7 @@  discard block
 block discarded – undo
824 824
             foreach ($this->data as $key => $value) {
825 825
                 if ($callback($value, $key)) {
826 826
                     $out[$key] = $value;
827
-                    unset( $this->data[$key] );
827
+                    unset($this->data[$key]);
828 828
                 }
829 829
             }
830 830
         }
Please login to merge, or discard this patch.
src/Arrays.php 1 patch
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -134,13 +134,13 @@  discard block
 block discarded – undo
134 134
     public static function mergeRecursiveCustom(
135 135
         array $existing_row,
136 136
         array $conflict_row,
137
-        callable $merge_resolver=null,
138
-        $max_depth=null
139
-    ){
137
+        callable $merge_resolver = null,
138
+        $max_depth = null
139
+    ) {
140 140
         foreach ($conflict_row as $column => $conflict_value) {
141 141
 
142 142
             // not existing in first array
143
-            if (!isset($existing_row[$column])) {
143
+            if ( ! isset($existing_row[$column])) {
144 144
                 $existing_row[$column] = $conflict_value;
145 145
                 continue;
146 146
             }
@@ -173,7 +173,7 @@  discard block
 block discarded – undo
173 173
             }
174 174
             else {
175 175
                 // same resolution as array_merge_recursive
176
-                if (!is_array($existing_value)) {
176
+                if ( ! is_array($existing_value)) {
177 177
                     $existing_row[$column] = [$existing_value];
178 178
                 }
179 179
 
@@ -196,11 +196,11 @@  discard block
 block discarded – undo
196 196
     public static function mergePreservingDistincts(
197 197
         array $existing_row,
198 198
         array $conflict_row
199
-    ){
199
+    ) {
200 200
         $merge = static::mergeRecursiveCustom(
201 201
             $existing_row,
202 202
             $conflict_row,
203
-            function ($existing_value, $conflict_value, $column) {
203
+            function($existing_value, $conflict_value, $column) {
204 204
 
205 205
                 if ( ! $existing_value instanceof MergeBucket) {
206 206
                     $existing_value = MergeBucket::from()->push($existing_value);
@@ -230,7 +230,7 @@  discard block
 block discarded – undo
230 230
     {
231 231
         foreach ($merged_row as $entry => $values) {
232 232
             if ($values instanceof MergeBucket) {
233
-                $merged_row[ $entry ] = $values->toArray();
233
+                $merged_row[$entry] = $values->toArray();
234 234
             }
235 235
         }
236 236
 
@@ -242,10 +242,10 @@  discard block
 block discarded – undo
242 242
      *
243 243
      * @see mergePreservingDistincts()
244 244
      */
245
-    public static function keepUniqueColumnValues(array $row, array $excluded_columns=[])
245
+    public static function keepUniqueColumnValues(array $row, array $excluded_columns = [])
246 246
     {
247 247
         foreach ($row as $column => &$values) {
248
-            if (!is_array($values))
248
+            if ( ! is_array($values))
249 249
                 continue;
250 250
 
251 251
             if (in_array($column, $excluded_columns))
@@ -269,7 +269,7 @@  discard block
 block discarded – undo
269 269
      */
270 270
     public static function unique($array)
271 271
     {
272
-        if (! is_array($array) && ! $array instanceof \Traversable) {
272
+        if ( ! is_array($array) && ! $array instanceof \Traversable) {
273 273
             throw new \InvalidArgumentException(
274 274
                 "\$array must be an array or a \Traversable instead of: \n"
275 275
                 .var_export($array, true)
@@ -285,13 +285,13 @@  discard block
 block discarded – undo
285 285
                 $id = serialize($value);
286 286
             }
287 287
 
288
-            if (isset($ids[ $id ])) {
289
-                unset($array[ $key ]);
290
-                $ids[ $id ][] = $key;
288
+            if (isset($ids[$id])) {
289
+                unset($array[$key]);
290
+                $ids[$id][] = $key;
291 291
                 continue;
292 292
             }
293 293
 
294
-            $ids[ $id ] = [$key];
294
+            $ids[$id] = [$key];
295 295
         }
296 296
 
297 297
         return $array;
@@ -308,7 +308,7 @@  discard block
 block discarded – undo
308 308
      */
309 309
     public static function sum($array)
310 310
     {
311
-        if (! is_array($array) && ! $array instanceof \Traversable) {
311
+        if ( ! is_array($array) && ! $array instanceof \Traversable) {
312 312
             throw new \InvalidArgumentException(
313 313
                 "\$array must be an array or a \Traversable instead of: \n"
314 314
                 .var_export($array, true)
@@ -384,16 +384,16 @@  discard block
 block discarded – undo
384 384
             throw new \InvalidArgumentException(
385 385
                 "Different number of "
386 386
                 ." values and weights for weight mean calculation: \n"
387
-                .var_export($values,  true)."\n\n"
387
+                .var_export($values, true)."\n\n"
388 388
                 .var_export($weights, true)
389 389
             );
390 390
         }
391 391
 
392
-        if (!$values)
392
+        if ( ! $values)
393 393
             return null;
394 394
 
395
-        $weights_sum  = array_sum($weights);
396
-        if (!$weights_sum)
395
+        $weights_sum = array_sum($weights);
396
+        if ( ! $weights_sum)
397 397
             return 0;
398 398
 
399 399
         $weighted_sum = 0;
Please login to merge, or discard this patch.