@@ -553,7 +553,7 @@ |
||
| 553 | 553 | foreach ($rowIdParts as $name => $value) { |
| 554 | 554 | if (isset($data[$name]) && $data[$name] !== $value) { |
| 555 | 555 | self::throwUsageException( |
| 556 | - "Trying to populate a column '$name' that " |
|
| 556 | + "Trying to populate a column '$name' that " |
|
| 557 | 557 | ."already exists with a different value " |
| 558 | 558 | .var_export($data[$name], true). " => '$value'" |
| 559 | 559 | ); |
@@ -26,18 +26,19 @@ discard block |
||
| 26 | 26 | $out = []; |
| 27 | 27 | foreach ($this->data as $key => $row) { |
| 28 | 28 | |
| 29 | - if (!$row) |
|
| 30 | - continue; |
|
| 29 | + if (!$row) { |
|
| 30 | + continue; |
|
| 31 | + } |
|
| 31 | 32 | |
| 32 | 33 | $newIndexes = call_user_func($indexGenerator, $key, $row); |
| 33 | - if (!is_array($newIndexes)) |
|
| 34 | - $newIndexes = [$newIndexes]; |
|
| 34 | + if (!is_array($newIndexes)) { |
|
| 35 | + $newIndexes = [$newIndexes]; |
|
| 36 | + } |
|
| 35 | 37 | |
| 36 | 38 | foreach ($newIndexes as $newIndex) { |
| 37 | 39 | if (!isset($out[$newIndex])) { |
| 38 | 40 | $out[$newIndex] = $row; |
| 39 | - } |
|
| 40 | - else { |
|
| 41 | + } else { |
|
| 41 | 42 | if ($conflictResolver === null) { |
| 42 | 43 | self::throwUsageException( |
| 43 | 44 | "A 'group by' provoking a conflict" |
@@ -74,20 +75,21 @@ discard block |
||
| 74 | 75 | $out = []; |
| 75 | 76 | foreach ($this->data as $key => $row) { |
| 76 | 77 | |
| 77 | - if (!$row) |
|
| 78 | - continue; |
|
| 78 | + if (!$row) { |
|
| 79 | + continue; |
|
| 80 | + } |
|
| 79 | 81 | |
| 80 | 82 | $new_keys = call_user_func($indexGenerator, $key, $row); |
| 81 | - if (!is_array($new_keys)) |
|
| 82 | - $new_keys = [$new_keys]; |
|
| 83 | + if (!is_array($new_keys)) { |
|
| 84 | + $new_keys = [$new_keys]; |
|
| 85 | + } |
|
| 83 | 86 | |
| 84 | 87 | foreach ($new_keys as $new_key) { |
| 85 | 88 | if (!isset($out[ $new_key ])) { |
| 86 | 89 | $out[ $new_key ] = [ |
| 87 | 90 | $key => $row |
| 88 | 91 | ]; |
| 89 | - } |
|
| 90 | - else { |
|
| 92 | + } else { |
|
| 91 | 93 | $out[ $new_key ][ $key ] = $row; |
| 92 | 94 | } |
| 93 | 95 | } |
@@ -147,8 +149,7 @@ discard block |
||
| 147 | 149 | $column, |
| 148 | 150 | ] |
| 149 | 151 | ); |
| 150 | - } |
|
| 151 | - else { |
|
| 152 | + } else { |
|
| 152 | 153 | // same reslution as array_merge_recursive |
| 153 | 154 | if (!is_array($existing_value)) { |
| 154 | 155 | $existing_row[$column] = [$existing_value]; |
@@ -179,8 +180,9 @@ discard block |
||
| 179 | 180 | $conflict_row, |
| 180 | 181 | function ($existing_value, $conflict_value, $column) { |
| 181 | 182 | |
| 182 | - if (!is_array($existing_value)) |
|
| 183 | - $existing_value = [$existing_value]; |
|
| 183 | + if (!is_array($existing_value)) { |
|
| 184 | + $existing_value = [$existing_value]; |
|
| 185 | + } |
|
| 184 | 186 | |
| 185 | 187 | // We store the new value with their previous ones |
| 186 | 188 | if ( ! is_array($conflict_value)) { |
@@ -207,15 +209,18 @@ discard block |
||
| 207 | 209 | public static function keepUniqueColumnValues(array $row, array $excluded_columns=[]) |
| 208 | 210 | { |
| 209 | 211 | foreach ($row as $column => &$values) { |
| 210 | - if (!is_array($values)) |
|
| 211 | - continue; |
|
| 212 | + if (!is_array($values)) { |
|
| 213 | + continue; |
|
| 214 | + } |
|
| 212 | 215 | |
| 213 | - if (in_array($column, $excluded_columns)) |
|
| 214 | - continue; |
|
| 216 | + if (in_array($column, $excluded_columns)) { |
|
| 217 | + continue; |
|
| 218 | + } |
|
| 215 | 219 | |
| 216 | 220 | $values = array_unique($values); |
| 217 | - if (count($values) == 1) |
|
| 218 | - $values = $values[0]; |
|
| 221 | + if (count($values) == 1) { |
|
| 222 | + $values = $values[0]; |
|
| 223 | + } |
|
| 219 | 224 | } |
| 220 | 225 | |
| 221 | 226 | return $row; |
@@ -250,8 +255,9 @@ discard block |
||
| 250 | 255 | $out = []; |
| 251 | 256 | foreach ($this->data as $key => $row) { |
| 252 | 257 | |
| 253 | - if (!$row) |
|
| 254 | - continue; |
|
| 258 | + if (!$row) { |
|
| 259 | + continue; |
|
| 260 | + } |
|
| 255 | 261 | |
| 256 | 262 | $newIndex = call_user_func($indexGenerator, $key, $row); |
| 257 | 263 | |
@@ -261,8 +267,7 @@ discard block |
||
| 261 | 267 | |
| 262 | 268 | if (!isset($out[$newIndex])) { |
| 263 | 269 | $out[$newIndex] = $transformedRow; |
| 264 | - } |
|
| 265 | - else { |
|
| 270 | + } else { |
|
| 266 | 271 | $out[$newIndex] = call_user_func( |
| 267 | 272 | $conflictResolver, |
| 268 | 273 | $newIndex, |
@@ -286,8 +291,9 @@ discard block |
||
| 286 | 291 | */ |
| 287 | 292 | public function mergeWith( $otherTable, callable $conflictResolver=null ) |
| 288 | 293 | { |
| 289 | - if (is_array($otherTable)) |
|
| 290 | - $otherTable = new static($otherTable); |
|
| 294 | + if (is_array($otherTable)) { |
|
| 295 | + $otherTable = new static($otherTable); |
|
| 296 | + } |
|
| 291 | 297 | |
| 292 | 298 | if (!$otherTable instanceof static) { |
| 293 | 299 | self::throwUsageException( |
@@ -301,10 +307,10 @@ discard block |
||
| 301 | 307 | |
| 302 | 308 | if (!isset($out[$key])) { |
| 303 | 309 | $out[$key] = $row; |
| 304 | - } |
|
| 305 | - else { |
|
| 306 | - if ($conflictResolver === null) |
|
| 307 | - self::throwUsageException('No conflict resolver for a merge provoking one'); |
|
| 310 | + } else { |
|
| 311 | + if ($conflictResolver === null) { |
|
| 312 | + self::throwUsageException('No conflict resolver for a merge provoking one'); |
|
| 313 | + } |
|
| 308 | 314 | |
| 309 | 315 | $arguments = [ |
| 310 | 316 | &$key, |
@@ -390,8 +396,7 @@ discard block |
||
| 390 | 396 | $row[$new_name] = $row[$old_name]; |
| 391 | 397 | unset($row[$old_name]); |
| 392 | 398 | } |
| 393 | - } |
|
| 394 | - catch (\Exception $e) { |
|
| 399 | + } catch (\Exception $e) { |
|
| 395 | 400 | self::throwUsageException( $e->getMessage() ); |
| 396 | 401 | } |
| 397 | 402 | |
@@ -412,17 +417,19 @@ discard block |
||
| 412 | 417 | public function limit() |
| 413 | 418 | { |
| 414 | 419 | $arguments = func_get_args(); |
| 415 | - if (count($arguments) == 1 && is_numeric($arguments[0])) |
|
| 416 | - $max = $arguments[0]; |
|
| 417 | - else |
|
| 418 | - self::throwUsageException("Bad arguments type and count for limit()"); |
|
| 420 | + if (count($arguments) == 1 && is_numeric($arguments[0])) { |
|
| 421 | + $max = $arguments[0]; |
|
| 422 | + } else { |
|
| 423 | + self::throwUsageException("Bad arguments type and count for limit()"); |
|
| 424 | + } |
|
| 419 | 425 | |
| 420 | 426 | $out = []; |
| 421 | 427 | $count = 0; |
| 422 | 428 | foreach ($this->data as $key => $row) { |
| 423 | 429 | |
| 424 | - if ($max <= $count) |
|
| 425 | - break; |
|
| 430 | + if ($max <= $count) { |
|
| 431 | + break; |
|
| 432 | + } |
|
| 426 | 433 | |
| 427 | 434 | $out[$key] = $row; |
| 428 | 435 | |
@@ -446,8 +453,9 @@ discard block |
||
| 446 | 453 | */ |
| 447 | 454 | public function append($new_rows, callable $conflict_resolver=null) |
| 448 | 455 | { |
| 449 | - if ($new_rows instanceof static) |
|
| 450 | - $new_rows = $new_rows->getArray(); |
|
| 456 | + if ($new_rows instanceof static) { |
|
| 457 | + $new_rows = $new_rows->getArray(); |
|
| 458 | + } |
|
| 451 | 459 | |
| 452 | 460 | if (!is_array($new_rows)) { |
| 453 | 461 | $this->throwUsageException( |
@@ -472,8 +480,7 @@ discard block |
||
| 472 | 480 | ]; |
| 473 | 481 | |
| 474 | 482 | call_user_func_array($conflict_resolver, $arguments); |
| 475 | - } |
|
| 476 | - else { |
|
| 483 | + } else { |
|
| 477 | 484 | $this->data[$key] = $new_row; |
| 478 | 485 | } |
| 479 | 486 | } |
@@ -583,8 +590,7 @@ discard block |
||
| 583 | 590 | foreach ($rows as $row_id => $joined_row) { |
| 584 | 591 | $out[$row_id] = $joined_row; |
| 585 | 592 | } |
| 586 | - } |
|
| 587 | - else { |
|
| 593 | + } else { |
|
| 588 | 594 | |
| 589 | 595 | if (!isset($rows)) { |
| 590 | 596 | echo json_encode([ |
@@ -594,8 +600,9 @@ discard block |
||
| 594 | 600 | exit; |
| 595 | 601 | } |
| 596 | 602 | |
| 597 | - foreach ($rowIdParts as $rowIdPartName => $rowIdPartValue) |
|
| 598 | - $row[$rowIdPartName] = $rowIdPartValue; |
|
| 603 | + foreach ($rowIdParts as $rowIdPartName => $rowIdPartValue) { |
|
| 604 | + $row[$rowIdPartName] = $rowIdPartValue; |
|
| 605 | + } |
|
| 599 | 606 | |
| 600 | 607 | $indexParts = []; |
| 601 | 608 | foreach ($rowIdParts as $name => $value) { |
@@ -646,8 +653,7 @@ discard block |
||
| 646 | 653 | if (is_string($value) && array_key_exists($value, $row)) { |
| 647 | 654 | $part_name .= $value; |
| 648 | 655 | $group_value = $row[ $value ]; |
| 649 | - } |
|
| 650 | - elseif (is_callable($value)) { |
|
| 656 | + } elseif (is_callable($value)) { |
|
| 651 | 657 | |
| 652 | 658 | if (is_string($value)) { |
| 653 | 659 | $part_name .= $value; |
@@ -656,20 +662,17 @@ discard block |
||
| 656 | 662 | elseif (is_object($value) && ($value instanceof Closure)) { |
| 657 | 663 | $part_name .= 'unnamed-closure-' |
| 658 | 664 | . hash('crc32b', var_export($value, true)); |
| 659 | - } |
|
| 660 | - elseif (is_array($value)) { |
|
| 665 | + } elseif (is_array($value)) { |
|
| 661 | 666 | $part_name .= implode('::', $value); |
| 662 | 667 | } |
| 663 | 668 | |
| 664 | 669 | $group_value = call_user_func_array($value, [ |
| 665 | 670 | $row, &$part_name |
| 666 | 671 | ]); |
| 667 | - } |
|
| 668 | - elseif (is_int($value)) { |
|
| 672 | + } elseif (is_int($value)) { |
|
| 669 | 673 | $part_name .= $value ? : '0'; |
| 670 | 674 | $group_value = $row[ $value ]; |
| 671 | - } |
|
| 672 | - else { |
|
| 675 | + } else { |
|
| 673 | 676 | self::throwUsageException( |
| 674 | 677 | 'Bad value provided for groupBy id generation: ' |
| 675 | 678 | .var_export($value, true) |
@@ -677,8 +680,9 @@ discard block |
||
| 677 | 680 | ); |
| 678 | 681 | } |
| 679 | 682 | |
| 680 | - if (!is_null($part_name)) |
|
| 681 | - $group_parts[ $part_name ] = $group_value; |
|
| 683 | + if (!is_null($part_name)) { |
|
| 684 | + $group_parts[ $part_name ] = $group_value; |
|
| 685 | + } |
|
| 682 | 686 | } |
| 683 | 687 | |
| 684 | 688 | // sort the groups by names (without it the same group could have multiple ids) |
@@ -699,12 +703,12 @@ discard block |
||
| 699 | 703 | public function first($strict=false) |
| 700 | 704 | { |
| 701 | 705 | if (!$this->count()) { |
| 702 | - if ($strict) |
|
| 703 | - throw new \ErrorException("No first element found in this array"); |
|
| 704 | - else |
|
| 705 | - $first = null; |
|
| 706 | - } |
|
| 707 | - else { |
|
| 706 | + if ($strict) { |
|
| 707 | + throw new \ErrorException("No first element found in this array"); |
|
| 708 | + } else { |
|
| 709 | + $first = null; |
|
| 710 | + } |
|
| 711 | + } else { |
|
| 708 | 712 | $key = key($this->data); |
| 709 | 713 | $first = reset($this->data); |
| 710 | 714 | $this->move($key); |
@@ -721,12 +725,12 @@ discard block |
||
| 721 | 725 | public function last($strict=false) |
| 722 | 726 | { |
| 723 | 727 | if (!$this->count()) { |
| 724 | - if ($strict) |
|
| 725 | - throw new \ErrorException("No last element found in this array"); |
|
| 726 | - else |
|
| 727 | - $last = null; |
|
| 728 | - } |
|
| 729 | - else { |
|
| 728 | + if ($strict) { |
|
| 729 | + throw new \ErrorException("No last element found in this array"); |
|
| 730 | + } else { |
|
| 731 | + $last = null; |
|
| 732 | + } |
|
| 733 | + } else { |
|
| 730 | 734 | $key = key($this->data); |
| 731 | 735 | $last = end($this->data); |
| 732 | 736 | $this->move($key); |
@@ -741,12 +745,12 @@ discard block |
||
| 741 | 745 | public function firstKey($strict=false) |
| 742 | 746 | { |
| 743 | 747 | if (!$this->count()) { |
| 744 | - if ($strict) |
|
| 745 | - throw new \ErrorException("No last element found in this array"); |
|
| 746 | - else |
|
| 747 | - $firstKey = null; |
|
| 748 | - } |
|
| 749 | - else { |
|
| 748 | + if ($strict) { |
|
| 749 | + throw new \ErrorException("No last element found in this array"); |
|
| 750 | + } else { |
|
| 751 | + $firstKey = null; |
|
| 752 | + } |
|
| 753 | + } else { |
|
| 750 | 754 | $key = key($this->data); |
| 751 | 755 | reset($this->data); |
| 752 | 756 | $firstKey = key($this->data); |
@@ -762,12 +766,12 @@ discard block |
||
| 762 | 766 | public function lastKey($strict=false) |
| 763 | 767 | { |
| 764 | 768 | if (!$this->count()) { |
| 765 | - if ($strict) |
|
| 766 | - throw new \ErrorException("No last element found in this array"); |
|
| 767 | - else |
|
| 768 | - $lastKey = null; |
|
| 769 | - } |
|
| 770 | - else { |
|
| 769 | + if ($strict) { |
|
| 770 | + throw new \ErrorException("No last element found in this array"); |
|
| 771 | + } else { |
|
| 772 | + $lastKey = null; |
|
| 773 | + } |
|
| 774 | + } else { |
|
| 771 | 775 | $key = key($this->data); |
| 772 | 776 | end($this->data); |
| 773 | 777 | $lastKey = key($this->data); |
@@ -789,8 +793,7 @@ discard block |
||
| 789 | 793 | break; |
| 790 | 794 | } |
| 791 | 795 | } |
| 792 | - } |
|
| 793 | - elseif ($strict) { |
|
| 796 | + } elseif ($strict) { |
|
| 794 | 797 | throw new \ErrorException("Unable to move the internal pointer to a key that doesn't exist."); |
| 795 | 798 | } |
| 796 | 799 | |
@@ -856,8 +859,9 @@ discard block |
||
| 856 | 859 | var_dump($caller['file'] . ':' . $caller['line']); |
| 857 | 860 | var_dump($this->data); |
| 858 | 861 | |
| 859 | - if ($exit) |
|
| 860 | - exit; |
|
| 862 | + if ($exit) { |
|
| 863 | + exit; |
|
| 864 | + } |
|
| 861 | 865 | |
| 862 | 866 | return $this; |
| 863 | 867 | } |
@@ -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, $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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 | } |
@@ -27,14 +27,14 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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'); |
@@ -96,8 +96,7 @@ |
||
| 96 | 96 | { |
| 97 | 97 | if ($this->isConstant) { |
| 98 | 98 | return new static($out); |
| 99 | - } |
|
| 100 | - else { |
|
| 99 | + } else { |
|
| 101 | 100 | $this->data = $out; |
| 102 | 101 | return $this; |
| 103 | 102 | } |
@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | foreach ($column_names as $column_name) { |
| 35 | 35 | if (!array_key_exists($column_name, $row)) { |
| 36 | 36 | self::throwUsageException( |
| 37 | - "Trying to extract a column from a row which" |
|
| 37 | + "Trying to extract a column from a row which" |
|
| 38 | 38 | ." doesn't contain it : '$column_name' \n" |
| 39 | 39 | .var_export($row, true) |
| 40 | 40 | ); |
@@ -680,7 +680,6 @@ discard block |
||
| 680 | 680 | |
| 681 | 681 | /** |
| 682 | 682 | * Equivalent of array_intersect() |
| 683 | - |
|
| 684 | 683 | * @param Array|static $intersect_with |
| 685 | 684 | * @return static $this or a new static. |
| 686 | 685 | */ |
@@ -21,7 +21,7 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 | |
@@ -26,8 +26,9 @@ discard block |
||
| 26 | 26 | $out = []; |
| 27 | 27 | foreach ($this->data as $key => &$row) { |
| 28 | 28 | |
| 29 | - if ($index_key) |
|
| 30 | - $key = $row[$index_key]; |
|
| 29 | + if ($index_key) { |
|
| 30 | + $key = $row[$index_key]; |
|
| 31 | + } |
|
| 31 | 32 | |
| 32 | 33 | if (is_array($column_names)) { |
| 33 | 34 | $out[$key] = []; |
@@ -42,20 +43,16 @@ discard block |
||
| 42 | 43 | |
| 43 | 44 | $out[$key][$column_name] = $row[$column_name]; |
| 44 | 45 | } |
| 45 | - } |
|
| 46 | - else { |
|
| 46 | + } else { |
|
| 47 | 47 | // This avoids issues with isset, array_key_exists and |
| 48 | 48 | // null entries on objects and arrays. |
| 49 | 49 | if ($row instanceof static) { |
| 50 | 50 | $keys = $row->copy()->keys(); |
| 51 | - } |
|
| 52 | - elseif (is_array($row)) { |
|
| 51 | + } elseif (is_array($row)) { |
|
| 53 | 52 | $keys = array_keys($row); |
| 54 | - } |
|
| 55 | - elseif (is_scalar($row)) { |
|
| 53 | + } elseif (is_scalar($row)) { |
|
| 56 | 54 | $keys = []; |
| 57 | - } |
|
| 58 | - else { |
|
| 55 | + } else { |
|
| 59 | 56 | // todo : handle other classes supporting ArrayAccess? |
| 60 | 57 | $keys = []; |
| 61 | 58 | } |
@@ -101,16 +98,17 @@ discard block |
||
| 101 | 98 | */ |
| 102 | 99 | public function min($default_value=null) |
| 103 | 100 | { |
| 104 | - if ($this->isEmpty() && $default_value !== null) |
|
| 105 | - return $default_value; |
|
| 101 | + if ($this->isEmpty() && $default_value !== null) { |
|
| 102 | + return $default_value; |
|
| 103 | + } |
|
| 106 | 104 | |
| 107 | 105 | try { |
| 108 | 106 | return min($this->data); |
| 109 | - } |
|
| 110 | - catch (\Exception $e) { |
|
| 107 | + } catch (\Exception $e) { |
|
| 111 | 108 | $message = $e->getMessage(); |
| 112 | - if ($e->getMessage() == 'min(): Array must contain at least one element') |
|
| 113 | - $message .= ' or you can set a default value as parameter'; |
|
| 109 | + if ($e->getMessage() == 'min(): Array must contain at least one element') { |
|
| 110 | + $message .= ' or you can set a default value as parameter'; |
|
| 111 | + } |
|
| 114 | 112 | |
| 115 | 113 | $this->throwUsageException($message); |
| 116 | 114 | } |
@@ -124,16 +122,17 @@ discard block |
||
| 124 | 122 | */ |
| 125 | 123 | public function max($default_value=null) |
| 126 | 124 | { |
| 127 | - if ($this->isEmpty() && $default_value !== null) |
|
| 128 | - return $default_value; |
|
| 125 | + if ($this->isEmpty() && $default_value !== null) { |
|
| 126 | + return $default_value; |
|
| 127 | + } |
|
| 129 | 128 | |
| 130 | 129 | try { |
| 131 | 130 | return max($this->data); |
| 132 | - } |
|
| 133 | - catch (\Exception $e) { |
|
| 131 | + } catch (\Exception $e) { |
|
| 134 | 132 | $message = $e->getMessage(); |
| 135 | - if ($e->getMessage() == 'max(): Array must contain at least one element') |
|
| 136 | - $message .= ' or you can set a default value as parameter'; |
|
| 133 | + if ($e->getMessage() == 'max(): Array must contain at least one element') { |
|
| 134 | + $message .= ' or you can set a default value as parameter'; |
|
| 135 | + } |
|
| 137 | 136 | |
| 138 | 137 | $this->throwUsageException($message); |
| 139 | 138 | } |
@@ -200,16 +199,15 @@ discard block |
||
| 200 | 199 | if (PHP_VERSION_ID >= 50600) { |
| 201 | 200 | $out = array_filter($this->data, $callback, |
| 202 | 201 | ARRAY_FILTER_USE_BOTH); |
| 203 | - } |
|
| 204 | - else { |
|
| 202 | + } else { |
|
| 205 | 203 | $out = $this->data; |
| 206 | 204 | foreach ($out as $key => $value) { |
| 207 | - if (!$callback($value, $key)) |
|
| 208 | - unset( $out[$key] ); |
|
| 205 | + if (!$callback($value, $key)) { |
|
| 206 | + unset( $out[$key] ); |
|
| 207 | + } |
|
| 209 | 208 | } |
| 210 | 209 | } |
| 211 | - } |
|
| 212 | - else { |
|
| 210 | + } else { |
|
| 213 | 211 | $out = array_filter($this->data); |
| 214 | 212 | } |
| 215 | 213 | |
@@ -242,8 +240,9 @@ discard block |
||
| 242 | 240 | $out = []; |
| 243 | 241 | foreach ($this->data as $i => $data_item) { |
| 244 | 242 | |
| 245 | - if ($data_item == $item_to_remove) |
|
| 246 | - continue; |
|
| 243 | + if ($data_item == $item_to_remove) { |
|
| 244 | + continue; |
|
| 245 | + } |
|
| 247 | 246 | |
| 248 | 247 | $out[$i] = $data_item; |
| 249 | 248 | } |
@@ -258,11 +257,13 @@ discard block |
||
| 258 | 257 | */ |
| 259 | 258 | public function intersectKey($intersect_with) |
| 260 | 259 | { |
| 261 | - if (!$this->argumentIsArrayOrArrayObject($intersect_with)) |
|
| 262 | - self::throwUsageException("First argument must be an array or a ".static::class."."); |
|
| 260 | + if (!$this->argumentIsArrayOrArrayObject($intersect_with)) { |
|
| 261 | + self::throwUsageException("First argument must be an array or a ".static::class."."); |
|
| 262 | + } |
|
| 263 | 263 | |
| 264 | - if ($intersect_with instanceof static) |
|
| 265 | - $intersect_with = $intersect_with->getArray(); |
|
| 264 | + if ($intersect_with instanceof static) { |
|
| 265 | + $intersect_with = $intersect_with->getArray(); |
|
| 266 | + } |
|
| 266 | 267 | |
| 267 | 268 | $out = array_intersect_key($this->data, $intersect_with); |
| 268 | 269 | |
@@ -351,8 +352,9 @@ discard block |
||
| 351 | 352 | */ |
| 352 | 353 | public function diff($compare_with, $check_keys=false, $strict_comparison=false) |
| 353 | 354 | { |
| 354 | - if (!$this->argumentIsArrayOrArrayObject($compare_with)) |
|
| 355 | - self::throwUsageException("First argument must be an iterable"); |
|
| 355 | + if (!$this->argumentIsArrayOrArrayObject($compare_with)) { |
|
| 356 | + self::throwUsageException("First argument must be an iterable"); |
|
| 357 | + } |
|
| 356 | 358 | |
| 357 | 359 | $kept_values = $this->data; |
| 358 | 360 | |
@@ -368,21 +370,18 @@ discard block |
||
| 368 | 370 | && $kept_value === $compared_value ) { |
| 369 | 371 | $is_equal = true; |
| 370 | 372 | } |
| 371 | - } |
|
| 372 | - else { |
|
| 373 | + } else { |
|
| 373 | 374 | if ( $kept_key == $compared_key |
| 374 | 375 | && $kept_value == $compared_value ) { |
| 375 | 376 | $is_equal = true; |
| 376 | 377 | } |
| 377 | 378 | } |
| 378 | - } |
|
| 379 | - else { |
|
| 379 | + } else { |
|
| 380 | 380 | if ($strict_comparison) { |
| 381 | 381 | if ($kept_value === $compared_value) { |
| 382 | 382 | $is_equal = true; |
| 383 | 383 | } |
| 384 | - } |
|
| 385 | - else { |
|
| 384 | + } else { |
|
| 386 | 385 | if ($kept_value == $compared_value) { |
| 387 | 386 | $is_equal = true; |
| 388 | 387 | } |
@@ -421,11 +420,13 @@ discard block |
||
| 421 | 420 | */ |
| 422 | 421 | public function fillKeys($keys, $value) |
| 423 | 422 | { |
| 424 | - if (!$this->argumentIsArrayOrArrayObject($keys)) |
|
| 425 | - self::throwUsageException("First argument must be an array or a ".static::class."."); |
|
| 423 | + if (!$this->argumentIsArrayOrArrayObject($keys)) { |
|
| 424 | + self::throwUsageException("First argument must be an array or a ".static::class."."); |
|
| 425 | + } |
|
| 426 | 426 | |
| 427 | - if ($keys instanceof static) |
|
| 428 | - $keys = $keys->getArray(); |
|
| 427 | + if ($keys instanceof static) { |
|
| 428 | + $keys = $keys->getArray(); |
|
| 429 | + } |
|
| 429 | 430 | |
| 430 | 431 | $out = array_fill_keys($keys, $value); |
| 431 | 432 | return $this->returnConstant($out); |
@@ -470,8 +471,9 @@ discard block |
||
| 470 | 471 | callable $step_generator, |
| 471 | 472 | $max_interations_count=1000 |
| 472 | 473 | ){ |
| 473 | - if ($max_interations_count < 0) |
|
| 474 | - throw new \InvalidArgumentException("$maximum_interations_count must be positive"); |
|
| 474 | + if ($max_interations_count < 0) { |
|
| 475 | + throw new \InvalidArgumentException("$maximum_interations_count must be positive"); |
|
| 476 | + } |
|
| 475 | 477 | |
| 476 | 478 | $out = []; |
| 477 | 479 | $previous_step_value = null; |
@@ -488,16 +490,14 @@ discard block |
||
| 488 | 490 | |
| 489 | 491 | if ($current_step_key === null) { |
| 490 | 492 | $out[] = $current_step_value; |
| 491 | - } |
|
| 492 | - elseif (!is_int($current_step_key)) { |
|
| 493 | + } elseif (!is_int($current_step_key)) { |
|
| 493 | 494 | // Set the local as en_US tu have floats formatted with |
| 494 | 495 | // "." as separator |
| 495 | 496 | // TODO : could it be useful for dates to? |
| 496 | 497 | $current_locale = setlocale(LC_NUMERIC, 'en_US'); |
| 497 | 498 | $out[(string) $current_step_key] = $current_step_value; |
| 498 | 499 | setlocale(LC_NUMERIC, $current_locale); |
| 499 | - } |
|
| 500 | - else { |
|
| 500 | + } else { |
|
| 501 | 501 | $out[$current_step_key] = $current_step_value; |
| 502 | 502 | } |
| 503 | 503 | |
@@ -508,8 +508,7 @@ discard block |
||
| 508 | 508 | if ((string) $current_step_key == (string) $end_key) { |
| 509 | 509 | break; |
| 510 | 510 | } |
| 511 | - } |
|
| 512 | - elseif ($current_step_key == $end_key) { |
|
| 511 | + } elseif ($current_step_key == $end_key) { |
|
| 513 | 512 | break; |
| 514 | 513 | } |
| 515 | 514 | |
@@ -529,10 +528,11 @@ discard block |
||
| 529 | 528 | */ |
| 530 | 529 | public function keys($search_value=null, $strict=false) |
| 531 | 530 | { |
| 532 | - if ($search_value) |
|
| 533 | - return array_keys($this->data, $search_value, $strict); |
|
| 534 | - else |
|
| 535 | - return array_keys($this->data); |
|
| 531 | + if ($search_value) { |
|
| 532 | + return array_keys($this->data, $search_value, $strict); |
|
| 533 | + } else { |
|
| 534 | + return array_keys($this->data); |
|
| 535 | + } |
|
| 536 | 536 | } |
| 537 | 537 | |
| 538 | 538 | /** |
@@ -640,8 +640,9 @@ discard block |
||
| 640 | 640 | |
| 641 | 641 | if ($callback === null) { |
| 642 | 642 | $callback = function($a, $b) { |
| 643 | - if ($a == $b) |
|
| 644 | - return 0; |
|
| 643 | + if ($a == $b) { |
|
| 644 | + return 0; |
|
| 645 | + } |
|
| 645 | 646 | |
| 646 | 647 | return $a > $b ? -1 : 1; |
| 647 | 648 | }; |
@@ -649,8 +650,9 @@ discard block |
||
| 649 | 650 | |
| 650 | 651 | $arguments = Arrays::merge( [&$data], [$callback] ); |
| 651 | 652 | |
| 652 | - if ( ! call_user_func_array('uasort', $arguments) ) |
|
| 653 | - throw new \ErrorException('Unable to apply usort'); |
|
| 653 | + if ( ! call_user_func_array('uasort', $arguments) ) { |
|
| 654 | + throw new \ErrorException('Unable to apply usort'); |
|
| 655 | + } |
|
| 654 | 656 | |
| 655 | 657 | return $this->returnConstant($data); |
| 656 | 658 | } |
@@ -672,8 +674,9 @@ discard block |
||
| 672 | 674 | |
| 673 | 675 | $arguments = Arrays::merge( [&$data], [$callback] ); |
| 674 | 676 | |
| 675 | - if ( ! call_user_func_array('uksort', $arguments) ) |
|
| 676 | - throw new \ErrorException('Unable to apply uksort'); |
|
| 677 | + if ( ! call_user_func_array('uksort', $arguments) ) { |
|
| 678 | + throw new \ErrorException('Unable to apply uksort'); |
|
| 679 | + } |
|
| 677 | 680 | |
| 678 | 681 | return $this->returnConstant($data); |
| 679 | 682 | } |
@@ -1,5 +1,5 @@ discard block |
||
| 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 |
||
| 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 |
@@ -60,7 +60,7 @@ discard block |
||
| 60 | 60 | }, |
| 61 | 61 | formatted_values: [ ] |
| 62 | 62 | } |
| 63 | - * |
|
| 63 | + * |
|
| 64 | 64 | => |
| 65 | 65 | * action_calculate_paid_impressions: { |
| 66 | 66 | values: [ ], |
@@ -69,9 +69,9 @@ discard block |
||
| 69 | 69 | }, |
| 70 | 70 | formatted_values: [ ] |
| 71 | 71 | } |
| 72 | - * |
|
| 73 | - * |
|
| 74 | - *data: [ |
|
| 72 | + * |
|
| 73 | + * |
|
| 74 | + *data: [ |
|
| 75 | 75 | { |
| 76 | 76 | paidImpressions: { |
| 77 | 77 | value: 246367, |
@@ -91,7 +91,7 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 | ), |
@@ -91,8 +91,9 @@ discard block |
||
| 91 | 91 | { |
| 92 | 92 | $column_name = $key_column_names->shift(); |
| 93 | 93 | |
| 94 | - if (!$column_name) |
|
| 95 | - return $rows; |
|
| 94 | + if (!$column_name) { |
|
| 95 | + return $rows; |
|
| 96 | + } |
|
| 96 | 97 | |
| 97 | 98 | // $out = new static; |
| 98 | 99 | $out = []; |
@@ -107,10 +108,10 @@ discard block |
||
| 107 | 108 | |
| 108 | 109 | foreach ($sub_rows as $row) { |
| 109 | 110 | try { |
| 110 | - if (is_array($row)) |
|
| 111 | - $row[$column_name] = $key; |
|
| 112 | - } |
|
| 113 | - catch (\Exception $e) { |
|
| 111 | + if (is_array($row)) { |
|
| 112 | + $row[$column_name] = $key; |
|
| 113 | + } |
|
| 114 | + } catch (\Exception $e) { |
|
| 114 | 115 | echo json_encode($column_name); |
| 115 | 116 | echo json_encode($key); |
| 116 | 117 | echo json_encode($e); |
@@ -118,13 +119,12 @@ discard block |
||
| 118 | 119 | } |
| 119 | 120 | $out[] = $row; |
| 120 | 121 | } |
| 121 | - } |
|
| 122 | - else { |
|
| 122 | + } else { |
|
| 123 | 123 | try { |
| 124 | - if (is_array($sub_rows)) |
|
| 125 | - $sub_rows[$column_name] = $key; |
|
| 126 | - } |
|
| 127 | - catch (\Exception $e) { |
|
| 124 | + if (is_array($sub_rows)) { |
|
| 125 | + $sub_rows[$column_name] = $key; |
|
| 126 | + } |
|
| 127 | + } catch (\Exception $e) { |
|
| 128 | 128 | echo json_encode($sub_rows); |
| 129 | 129 | echo json_encode($column_name); |
| 130 | 130 | echo json_encode($key); |
@@ -299,8 +299,9 @@ discard block |
||
| 299 | 299 | ), |
| 300 | 300 | ); |
| 301 | 301 | |
| 302 | - if ($expected != $tableized->getArray()) |
|
| 303 | - throw new \Exception("test failed"); |
|
| 302 | + if ($expected != $tableized->getArray()) { |
|
| 303 | + throw new \Exception("test failed"); |
|
| 304 | + } |
|
| 304 | 305 | |
| 305 | 306 | echo 'Helper_Tabe->tableize tested successfully'; |
| 306 | 307 | } |
@@ -327,13 +328,15 @@ discard block |
||
| 327 | 328 | */ |
| 328 | 329 | private function piramidize_aux($key_column_names, $rows) |
| 329 | 330 | { |
| 330 | - if (!is_array($rows)) |
|
| 331 | - return $rows; |
|
| 331 | + if (!is_array($rows)) { |
|
| 332 | + return $rows; |
|
| 333 | + } |
|
| 332 | 334 | |
| 333 | 335 | $column_name = $key_column_names->shift(); |
| 334 | 336 | |
| 335 | - if (!$column_name) |
|
| 336 | - return $rows; |
|
| 337 | + if (!$column_name) { |
|
| 338 | + return $rows; |
|
| 339 | + } |
|
| 337 | 340 | |
| 338 | 341 | // $out = new static; |
| 339 | 342 | $out = []; |
@@ -348,12 +351,12 @@ discard block |
||
| 348 | 351 | unset($row[$column_name]); |
| 349 | 352 | |
| 350 | 353 | if ($key_column_names->count()) { |
| 351 | - if (!isset($out[$key])) |
|
| 352 | - $out[$key] = []; |
|
| 354 | + if (!isset($out[$key])) { |
|
| 355 | + $out[$key] = []; |
|
| 356 | + } |
|
| 353 | 357 | |
| 354 | 358 | $out[$key][] = $row; |
| 355 | - } |
|
| 356 | - else { |
|
| 359 | + } else { |
|
| 357 | 360 | $out[$key] = $row; |
| 358 | 361 | } |
| 359 | 362 | } |
@@ -529,8 +532,9 @@ discard block |
||
| 529 | 532 | // echo var_export($values->getArray()); |
| 530 | 533 | // $values->dumpJson(true); |
| 531 | 534 | |
| 532 | - if ($expected != $values->getArray()) |
|
| 533 | - throw new \Exception("test failed"); |
|
| 535 | + if ($expected != $values->getArray()) { |
|
| 536 | + throw new \Exception("test failed"); |
|
| 537 | + } |
|
| 534 | 538 | |
| 535 | 539 | echo 'Helper_Tabe->piramidize tested successfully'; |
| 536 | 540 | } |
@@ -18,8 +18,7 @@ discard block |
||
| 18 | 18 | { |
| 19 | 19 | if (is_null($offset)) { |
| 20 | 20 | $this->data[] = $value; |
| 21 | - } |
|
| 22 | - else { |
|
| 21 | + } else { |
|
| 23 | 22 | $this->data[$offset] = $value; |
| 24 | 23 | } |
| 25 | 24 | } |
@@ -31,8 +30,7 @@ discard block |
||
| 31 | 30 | { |
| 32 | 31 | try { |
| 33 | 32 | return isset($this->data[$offset]); |
| 34 | - } |
|
| 35 | - catch (\Exception $e) { |
|
| 33 | + } catch (\Exception $e) { |
|
| 36 | 34 | if (property_exists($this, 'defaultRowGenerator')) { |
| 37 | 35 | return true; |
| 38 | 36 | } |
@@ -77,8 +75,7 @@ discard block |
||
| 77 | 75 | // support but wouldn't throw exception if it doesn't exist |
| 78 | 76 | $returnValue = &$this->data[$offset]; |
| 79 | 77 | return $returnValue; |
| 80 | - } |
|
| 81 | - catch (\Exception $e) { |
|
| 78 | + } catch (\Exception $e) { |
|
| 82 | 79 | // here we simply move the Exception location at the one |
| 83 | 80 | // of the caller as the isset() method is called at its |
| 84 | 81 | // location. |
@@ -158,10 +155,11 @@ discard block |
||
| 158 | 155 | */ |
| 159 | 156 | protected function generateDefaultRow($offset) |
| 160 | 157 | { |
| 161 | - if (property_exists($this, 'defaultRow')) |
|
| 162 | - return $this->defaultRow; |
|
| 163 | - elseif (property_exists($this, 'defaultRowGenerator')) |
|
| 164 | - return call_user_func($this->defaultRowGenerator, $offset); |
|
| 158 | + if (property_exists($this, 'defaultRow')) { |
|
| 159 | + return $this->defaultRow; |
|
| 160 | + } elseif (property_exists($this, 'defaultRowGenerator')) { |
|
| 161 | + return call_user_func($this->defaultRowGenerator, $offset); |
|
| 162 | + } |
|
| 165 | 163 | } |
| 166 | 164 | |
| 167 | 165 | /**/ |
@@ -86,7 +86,7 @@ |
||
| 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'])) { |
@@ -64,14 +64,12 @@ discard block |
||
| 64 | 64 | ) |
| 65 | 65 | { |
| 66 | 66 | $array1[$key] = self::merge($array1[$key], $value); |
| 67 | - } |
|
| 68 | - else |
|
| 67 | + } else |
|
| 69 | 68 | { |
| 70 | 69 | $array1[$key] = $value; |
| 71 | 70 | } |
| 72 | 71 | } |
| 73 | - } |
|
| 74 | - else |
|
| 72 | + } else |
|
| 75 | 73 | { |
| 76 | 74 | foreach ($array2 as $value) |
| 77 | 75 | { |
@@ -96,14 +94,12 @@ discard block |
||
| 96 | 94 | ) |
| 97 | 95 | { |
| 98 | 96 | $array1[$key] = self::merge($array1[$key], $value); |
| 99 | - } |
|
| 100 | - else |
|
| 97 | + } else |
|
| 101 | 98 | { |
| 102 | 99 | $array1[$key] = $value; |
| 103 | 100 | } |
| 104 | 101 | } |
| 105 | - } |
|
| 106 | - else |
|
| 102 | + } else |
|
| 107 | 103 | { |
| 108 | 104 | foreach ($array2 as $value) |
| 109 | 105 | { |