@@ -18,7 +18,7 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 | } |