Completed
Push — master ( 1f6bb0...d0ea49 )
by Jean
02:08
created
src/Arrays/Arrays.php 2 patches
Spacing   +35 added lines, -35 removed lines patch added patch discarded remove patch
@@ -135,16 +135,16 @@  discard block
 block discarded – undo
135 135
     public static function mergeRecursiveCustom(
136 136
         $existing_row,
137 137
         $conflict_row,
138
-        callable $merge_resolver=null,
139
-        $max_depth=null
140
-    ){
138
+        callable $merge_resolver = null,
139
+        $max_depth = null
140
+    ) {
141 141
         static::mustBeCountable($existing_row);
142 142
         static::mustBeCountable($conflict_row);
143 143
 
144 144
         foreach ($conflict_row as $column => $conflict_value) {
145 145
 
146 146
             // not existing in first array
147
-            if (!isset($existing_row[$column])) {
147
+            if ( ! isset($existing_row[$column])) {
148 148
                 $existing_row[$column] = $conflict_value;
149 149
                 continue;
150 150
             }
@@ -177,7 +177,7 @@  discard block
 block discarded – undo
177 177
             }
178 178
             else {
179 179
                 // same resolution as array_merge_recursive
180
-                if (!is_array($existing_value)) {
180
+                if ( ! is_array($existing_value)) {
181 181
                     $existing_row[$column] = [$existing_value];
182 182
                 }
183 183
 
@@ -200,14 +200,14 @@  discard block
 block discarded – undo
200 200
     public static function mergePreservingDistincts(
201 201
         $existing_row,
202 202
         $conflict_row
203
-    ){
203
+    ) {
204 204
         static::mustBeCountable($existing_row);
205 205
         static::mustBeCountable($conflict_row);
206 206
 
207 207
         $merge = static::mergeRecursiveCustom(
208 208
             $existing_row,
209 209
             $conflict_row,
210
-            function ($existing_value, $conflict_value, $column) {
210
+            function($existing_value, $conflict_value, $column) {
211 211
 
212 212
                 if ( ! $existing_value instanceof MergeBucket) {
213 213
                     $existing_value = MergeBucket::from()->push($existing_value);
@@ -236,7 +236,7 @@  discard block
 block discarded – undo
236 236
      * @param  array|Countable   $row
237 237
      * @param  array             $options : 'excluded_columns'
238 238
      */
239
-    public static function cleanMergeDuplicates($row, array $options=[])
239
+    public static function cleanMergeDuplicates($row, array $options = [])
240 240
     {
241 241
         static::mustBeCountable($row);
242 242
 
@@ -269,7 +269,7 @@  discard block
 block discarded – undo
269 269
      * @see mergePreservingDistincts()
270 270
      * @see cleanMergeDuplicates()
271 271
      */
272
-    public static function cleanMergeBuckets($row, array $options=[])
272
+    public static function cleanMergeBuckets($row, array $options = [])
273 273
     {
274 274
         static::mustBeCountable($row);
275 275
 
@@ -310,13 +310,13 @@  discard block
 block discarded – undo
310 310
                 $id = serialize($value);
311 311
             }
312 312
 
313
-            if (isset($ids[ $id ])) {
314
-                unset($array[ $key ]);
315
-                $ids[ $id ][] = $key;
313
+            if (isset($ids[$id])) {
314
+                unset($array[$key]);
315
+                $ids[$id][] = $key;
316 316
                 continue;
317 317
             }
318 318
 
319
-            $ids[ $id ] = [$key];
319
+            $ids[$id] = [$key];
320 320
         }
321 321
 
322 322
         return $array;
@@ -336,7 +336,7 @@  discard block
 block discarded – undo
336 336
         }
337 337
         else {
338 338
             throw new \InvalidArgumentException(
339
-                "keyExists() method missing on :\n". var_export($array, true)
339
+                "keyExists() method missing on :\n".var_export($array, true)
340 340
             );
341 341
         }
342 342
 
@@ -412,16 +412,16 @@  discard block
 block discarded – undo
412 412
             throw new \InvalidArgumentException(
413 413
                 "Different number of "
414 414
                 ." values and weights for weight mean calculation: \n"
415
-                .var_export($values,  true)."\n\n"
415
+                .var_export($values, true)."\n\n"
416 416
                 .var_export($weights, true)
417 417
             );
418 418
         }
419 419
 
420
-        if (!$values)
420
+        if ( ! $values)
421 421
             return null;
422 422
 
423
-        $weights_sum  = array_sum($weights);
424
-        if (!$weights_sum)
423
+        $weights_sum = array_sum($weights);
424
+        if ( ! $weights_sum)
425 425
             return 0;
426 426
 
427 427
         $weighted_sum = 0;
@@ -470,8 +470,8 @@  discard block
 block discarded – undo
470 470
         );
471 471
 
472 472
         // The true location of the throw is still available through the backtrace
473
-        $trace_location  = debug_backtrace( DEBUG_BACKTRACE_IGNORE_ARGS, 1)[0];
474
-        $reflectionClass = new \ReflectionClass( get_class($exception) );
473
+        $trace_location  = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1)[0];
474
+        $reflectionClass = new \ReflectionClass(get_class($exception));
475 475
 
476 476
         // file
477 477
         if (isset($trace_location['file'])) {
@@ -508,8 +508,8 @@  discard block
 block discarded – undo
508 508
         );
509 509
 
510 510
         // The true location of the throw is still available through the backtrace
511
-        $trace_location  = debug_backtrace( DEBUG_BACKTRACE_IGNORE_ARGS, 1)[0];
512
-        $reflectionClass = new \ReflectionClass( get_class($exception) );
511
+        $trace_location  = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1)[0];
512
+        $reflectionClass = new \ReflectionClass(get_class($exception));
513 513
 
514 514
         // file
515 515
         if (isset($trace_location['file'])) {
@@ -549,7 +549,7 @@  discard block
 block discarded – undo
549 549
      *
550 550
      * @return string       The unique identifier of the group
551 551
      */
552
-    public static function generateGroupId($row, array $groups_definitions, array $options=[])
552
+    public static function generateGroupId($row, array $groups_definitions, array $options = [])
553 553
     {
554 554
         Arrays::mustBeCountable($row);
555 555
 
@@ -558,7 +558,7 @@  discard block
 block discarded – undo
558 558
                              : ':'
559 559
                              ;
560 560
 
561
-        $groups_separator    = ! empty($options['groups_separator'])
561
+        $groups_separator = ! empty($options['groups_separator'])
562 562
                              ? $options['groups_separator']
563 563
                              : '-'
564 564
                              ;
@@ -576,24 +576,24 @@  discard block
 block discarded – undo
576 576
                     throw new UsageException(
577 577
                         'Unset column for group id generation: '
578 578
                         .var_export($group_definition_value, true)
579
-                        ."\n" . var_export($row, true)
579
+                        ."\n".var_export($row, true)
580 580
                     );
581 581
                 }
582 582
 
583 583
                 $part_name         .= $group_definition_value;
584
-                $group_result_value = $row[ $group_definition_value ];
584
+                $group_result_value = $row[$group_definition_value];
585 585
             }
586 586
             elseif (is_int($group_definition_value)) {
587 587
                 if ( ! array_key_exists($group_definition_value, $row)) {
588 588
                     throw new UsageException(
589 589
                         'Unset column for group id generation: '
590 590
                         .var_export($group_definition_value, true)
591
-                        ."\n" . var_export($row, true)
591
+                        ."\n".var_export($row, true)
592 592
                     );
593 593
                 }
594 594
 
595
-                $part_name         .= $group_definition_value ? : '0';
596
-                $group_result_value = $row[ $group_definition_value ];
595
+                $part_name         .= $group_definition_value ?: '0';
596
+                $group_result_value = $row[$group_definition_value];
597 597
             }
598 598
             /* TODO check this is not just dead code * /
599 599
             elseif (is_callable($group_definition_value)) {
@@ -619,12 +619,12 @@  discard block
 block discarded – undo
619 619
                 throw new UsageException(
620 620
                     'Bad value provided for group id generation: '
621 621
                     .var_export($group_definition_value, true)
622
-                    ."\n" . var_export($row, true)
622
+                    ."\n".var_export($row, true)
623 623
                 );
624 624
             }
625 625
 
626
-            if (!is_null($part_name))
627
-                $group_parts[ $part_name ] = $group_result_value;
626
+            if ( ! is_null($part_name))
627
+                $group_parts[$part_name] = $group_result_value;
628 628
         }
629 629
 
630 630
         // sort the groups by names (without it the same group could have multiple ids)
@@ -636,13 +636,13 @@  discard block
 block discarded – undo
636 636
             if (is_object($group_value)) {
637 637
                 $group_value = get_class($group_value)
638 638
                              . '_'
639
-                             . hash( 'crc32b', var_export($group_value, true) );
639
+                             . hash('crc32b', var_export($group_value, true));
640 640
             }
641 641
             elseif (is_array($group_value)) {
642
-                $group_value = 'array_' . hash( 'crc32b', var_export($group_value, true) );
642
+                $group_value = 'array_'.hash('crc32b', var_export($group_value, true));
643 643
             }
644 644
 
645
-            $out[] = $group_name . $key_value_separator . $group_value;
645
+            $out[] = $group_name.$key_value_separator.$group_value;
646 646
         }
647 647
 
648 648
         return implode($groups_separator, $out);
Please login to merge, or discard this patch.
Braces   +55 added lines, -54 removed lines patch added patch discarded remove patch
@@ -65,14 +65,12 @@  discard block
 block discarded – undo
65 65
                 )
66 66
                 {
67 67
                     $array1[$key] = self::merge($array1[$key], $value);
68
-                }
69
-                else
68
+                } else
70 69
                 {
71 70
                     $array1[$key] = $value;
72 71
                 }
73 72
             }
74
-        }
75
-        else
73
+        } else
76 74
         {
77 75
             foreach ($array2 as $value)
78 76
             {
@@ -97,14 +95,12 @@  discard block
 block discarded – undo
97 95
                         )
98 96
                         {
99 97
                             $array1[$key] = self::merge($array1[$key], $value);
100
-                        }
101
-                        else
98
+                        } else
102 99
                         {
103 100
                             $array1[$key] = $value;
104 101
                         }
105 102
                     }
106
-                }
107
-                else
103
+                } else
108 104
                 {
109 105
                     foreach ($array2 as $value)
110 106
                     {
@@ -174,8 +170,7 @@  discard block
 block discarded – undo
174 170
                         $column,
175 171
                     ]
176 172
                 );
177
-            }
178
-            else {
173
+            } else {
179 174
                 // same resolution as array_merge_recursive
180 175
                 if (!is_array($existing_value)) {
181 176
                     $existing_row[$column] = [$existing_value];
@@ -246,15 +241,18 @@  discard block
 block discarded – undo
246 241
                           ;
247 242
 
248 243
         foreach ($row as $column => &$values) {
249
-            if ( ! $values instanceof MergeBucket)
250
-                continue;
244
+            if ( ! $values instanceof MergeBucket) {
245
+                            continue;
246
+            }
251 247
 
252
-            if (in_array($column, $excluded_columns))
253
-                continue;
248
+            if (in_array($column, $excluded_columns)) {
249
+                            continue;
250
+            }
254 251
 
255 252
             $values = Arrays::unique($values);
256
-            if (count($values) == 1)
257
-                $values = $values[0];
253
+            if (count($values) == 1) {
254
+                            $values = $values[0];
255
+            }
258 256
         }
259 257
 
260 258
         return $row;
@@ -279,11 +277,13 @@  discard block
 block discarded – undo
279 277
                           ;
280 278
 
281 279
         foreach ($row as $column => &$values) {
282
-            if (in_array($column, $excluded_columns))
283
-                continue;
280
+            if (in_array($column, $excluded_columns)) {
281
+                            continue;
282
+            }
284 283
 
285
-            if ($values instanceof MergeBucket)
286
-                $values = $values->toArray();
284
+            if ($values instanceof MergeBucket) {
285
+                            $values = $values->toArray();
286
+            }
287 287
         }
288 288
 
289 289
         return $row;
@@ -305,8 +305,7 @@  discard block
 block discarded – undo
305 305
         foreach ($array as $key => $value) {
306 306
             if (is_scalar($value)) {
307 307
                 $id = $value;
308
-            }
309
-            else {
308
+            } else {
310 309
                 $id = serialize($value);
311 310
             }
312 311
 
@@ -330,11 +329,9 @@  discard block
 block discarded – undo
330 329
 
331 330
         if (is_array($array)) {
332 331
             return array_key_exists($key, $array);
333
-        }
334
-        elseif ($array instanceof ChainableArray || method_exists($array, 'keyExists')) {
332
+        } elseif ($array instanceof ChainableArray || method_exists($array, 'keyExists')) {
335 333
             return $array->keyExists($key);
336
-        }
337
-        else {
334
+        } else {
338 335
             throw new \InvalidArgumentException(
339 336
                 "keyExists() method missing on :\n". var_export($array, true)
340 337
             );
@@ -360,16 +357,13 @@  discard block
 block discarded – undo
360 357
         foreach ($array as $key => &$value) { // &for optimization
361 358
             if (is_scalar($value)) {
362 359
                 $sum += $value;
363
-            }
364
-            elseif (is_null($value)) {
360
+            } elseif (is_null($value)) {
365 361
                 continue;
366
-            }
367
-            elseif (is_array($value)) {
362
+            } elseif (is_array($value)) {
368 363
                 throw new \InvalidArgumentException(
369 364
                     "Trying to sum an array with '$sum': ".var_export($value, true)
370 365
                 );
371
-            }
372
-            elseif (is_object($value)) {
366
+            } elseif (is_object($value)) {
373 367
                 if ( ! method_exists($value, 'toNumber')) {
374 368
                     throw new \InvalidArgumentEXception(
375 369
                          "Trying to sum a ".get_class($value)." object which cannot be casted as a number. "
@@ -396,17 +390,21 @@  discard block
 block discarded – undo
396 390
      */
397 391
     public static function weightedMean($values, $weights)
398 392
     {
399
-        if ($values instanceof ChainableArray)
400
-            $values = $values->toArray();
393
+        if ($values instanceof ChainableArray) {
394
+                    $values = $values->toArray();
395
+        }
401 396
 
402
-        if ($weights instanceof ChainableArray)
403
-            $weights = $weights->toArray();
397
+        if ($weights instanceof ChainableArray) {
398
+                    $weights = $weights->toArray();
399
+        }
404 400
 
405
-        if ( ! is_array($values))
406
-            $values = [$values];
401
+        if ( ! is_array($values)) {
402
+                    $values = [$values];
403
+        }
407 404
 
408
-        if ( ! is_array($weights))
409
-            $weights = [$weights];
405
+        if ( ! is_array($weights)) {
406
+                    $weights = [$weights];
407
+        }
410 408
 
411 409
         if (count($values) != count($weights)) {
412 410
             throw new \InvalidArgumentException(
@@ -417,12 +415,14 @@  discard block
 block discarded – undo
417 415
             );
418 416
         }
419 417
 
420
-        if (!$values)
421
-            return null;
418
+        if (!$values) {
419
+                    return null;
420
+        }
422 421
 
423 422
         $weights_sum  = array_sum($weights);
424
-        if (!$weights_sum)
425
-            return 0;
423
+        if (!$weights_sum) {
424
+                    return 0;
425
+        }
426 426
 
427 427
         $weighted_sum = 0;
428 428
         foreach ($values as $i => $value) {
@@ -461,8 +461,9 @@  discard block
 block discarded – undo
461 461
      */
462 462
     public static function mustBeCountable($value)
463 463
     {
464
-        if (static::isCountable($value))
465
-            return true;
464
+        if (static::isCountable($value)) {
465
+                    return true;
466
+        }
466 467
 
467 468
         $exception = new \InvalidArgumentException(
468 469
             "A value must be Countable instead of: \n"
@@ -499,8 +500,9 @@  discard block
 block discarded – undo
499 500
      */
500 501
     public static function mustBeTraversable($value)
501 502
     {
502
-        if (static::isTraversable($value))
503
-            return true;
503
+        if (static::isTraversable($value)) {
504
+                    return true;
505
+        }
504 506
 
505 507
         $exception = new \InvalidArgumentException(
506 508
             "A value must be Traversable instead of: \n"
@@ -582,8 +584,7 @@  discard block
 block discarded – undo
582 584
 
583 585
                 $part_name         .= $group_definition_value;
584 586
                 $group_result_value = $row[ $group_definition_value ];
585
-            }
586
-            elseif (is_int($group_definition_value)) {
587
+            } elseif (is_int($group_definition_value)) {
587 588
                 if ( ! array_key_exists($group_definition_value, $row)) {
588 589
                     throw new UsageException(
589 590
                         'Unset column for group id generation: '
@@ -623,8 +624,9 @@  discard block
 block discarded – undo
623 624
                 );
624 625
             }
625 626
 
626
-            if (!is_null($part_name))
627
-                $group_parts[ $part_name ] = $group_result_value;
627
+            if (!is_null($part_name)) {
628
+                            $group_parts[ $part_name ] = $group_result_value;
629
+            }
628 630
         }
629 631
 
630 632
         // sort the groups by names (without it the same group could have multiple ids)
@@ -637,8 +639,7 @@  discard block
 block discarded – undo
637 639
                 $group_value = get_class($group_value)
638 640
                              . '_'
639 641
                              . hash( 'crc32b', var_export($group_value, true) );
640
-            }
641
-            elseif (is_array($group_value)) {
642
+            } elseif (is_array($group_value)) {
642 643
                 $group_value = 'array_' . hash( 'crc32b', var_export($group_value, true) );
643 644
             }
644 645
 
Please login to merge, or discard this patch.