@@ -130,7 +130,7 @@ discard block |
||
| 130 | 130 | */ |
| 131 | 131 | protected function _setValue($value) |
| 132 | 132 | { |
| 133 | - if($value instanceof NumberInfo) { |
|
| 133 | + if ($value instanceof NumberInfo) { |
|
| 134 | 134 | $value = $value->getValue(); |
| 135 | 135 | } |
| 136 | 136 | |
@@ -170,7 +170,7 @@ discard block |
||
| 170 | 170 | */ |
| 171 | 171 | public function isPositive() : bool |
| 172 | 172 | { |
| 173 | - if($this->isEmpty()) |
|
| 173 | + if ($this->isEmpty()) |
|
| 174 | 174 | { |
| 175 | 175 | return false; |
| 176 | 176 | } |
@@ -185,7 +185,7 @@ discard block |
||
| 185 | 185 | */ |
| 186 | 186 | public function isZero() : bool |
| 187 | 187 | { |
| 188 | - if($this->isEmpty()) |
|
| 188 | + if ($this->isEmpty()) |
|
| 189 | 189 | { |
| 190 | 190 | return false; |
| 191 | 191 | } |
@@ -231,23 +231,23 @@ discard block |
||
| 231 | 231 | { |
| 232 | 232 | // Append the units if the value is a number, |
| 233 | 233 | // so they can be inherited. |
| 234 | - if($this->hasUnits() && is_numeric($number)) |
|
| 234 | + if ($this->hasUnits() && is_numeric($number)) |
|
| 235 | 235 | { |
| 236 | 236 | $number .= $this->getUnits(); |
| 237 | 237 | } |
| 238 | 238 | |
| 239 | 239 | $new = parseNumber($number); |
| 240 | 240 | |
| 241 | - if($new->isEmpty()) |
|
| 241 | + if ($new->isEmpty()) |
|
| 242 | 242 | { |
| 243 | 243 | return $this; |
| 244 | 244 | } |
| 245 | 245 | |
| 246 | - if($new->getUnits() === $this->getUnits()) |
|
| 246 | + if ($new->getUnits() === $this->getUnits()) |
|
| 247 | 247 | { |
| 248 | 248 | $value = $new->getNumber(); |
| 249 | 249 | |
| 250 | - if($this->hasUnits()) { |
|
| 250 | + if ($this->hasUnits()) { |
|
| 251 | 251 | $value .= $this->getUnits(); |
| 252 | 252 | } |
| 253 | 253 | |
@@ -289,7 +289,7 @@ discard block |
||
| 289 | 289 | { |
| 290 | 290 | $number = (float)$this->info['number']; |
| 291 | 291 | |
| 292 | - if($this->hasDecimals()) |
|
| 292 | + if ($this->hasDecimals()) |
|
| 293 | 293 | { |
| 294 | 294 | return $number; |
| 295 | 295 | } |
@@ -325,11 +325,11 @@ discard block |
||
| 325 | 325 | */ |
| 326 | 326 | public function getUnits() : string |
| 327 | 327 | { |
| 328 | - if($this->isEmpty()) { |
|
| 328 | + if ($this->isEmpty()) { |
|
| 329 | 329 | return ''; |
| 330 | 330 | } |
| 331 | 331 | |
| 332 | - if(!$this->hasUnits()) { |
|
| 332 | + if (!$this->hasUnits()) { |
|
| 333 | 333 | return 'px'; |
| 334 | 334 | } |
| 335 | 335 | |
@@ -363,15 +363,15 @@ discard block |
||
| 363 | 363 | */ |
| 364 | 364 | public function toAttribute() : string |
| 365 | 365 | { |
| 366 | - if($this->isEmpty()) { |
|
| 366 | + if ($this->isEmpty()) { |
|
| 367 | 367 | return ''; |
| 368 | 368 | } |
| 369 | 369 | |
| 370 | - if($this->isZero()) { |
|
| 370 | + if ($this->isZero()) { |
|
| 371 | 371 | return '0'; |
| 372 | 372 | } |
| 373 | 373 | |
| 374 | - if($this->isPercent()) { |
|
| 374 | + if ($this->isPercent()) { |
|
| 375 | 375 | return $this->getNumber().$this->getUnits(); |
| 376 | 376 | } |
| 377 | 377 | |
@@ -384,11 +384,11 @@ discard block |
||
| 384 | 384 | */ |
| 385 | 385 | public function toCSS() : string |
| 386 | 386 | { |
| 387 | - if($this->isEmpty()) { |
|
| 387 | + if ($this->isEmpty()) { |
|
| 388 | 388 | return ''; |
| 389 | 389 | } |
| 390 | 390 | |
| 391 | - if($this->isZero()) { |
|
| 391 | + if ($this->isZero()) { |
|
| 392 | 392 | return '0'; |
| 393 | 393 | } |
| 394 | 394 | |
@@ -397,7 +397,7 @@ discard block |
||
| 397 | 397 | |
| 398 | 398 | public function __toString() |
| 399 | 399 | { |
| 400 | - if($this->isEmpty()) { |
|
| 400 | + if ($this->isEmpty()) { |
|
| 401 | 401 | return ''; |
| 402 | 402 | } |
| 403 | 403 | |
@@ -503,7 +503,7 @@ discard block |
||
| 503 | 503 | */ |
| 504 | 504 | public function add($value) |
| 505 | 505 | { |
| 506 | - if($this->isEmpty()) |
|
| 506 | + if ($this->isEmpty()) |
|
| 507 | 507 | { |
| 508 | 508 | $this->setValue($value); |
| 509 | 509 | return $this; |
@@ -511,11 +511,11 @@ discard block |
||
| 511 | 511 | |
| 512 | 512 | $number = parseNumber($value); |
| 513 | 513 | |
| 514 | - if($number->getUnits() === $this->getUnits() || !$number->hasUnits()) |
|
| 514 | + if ($number->getUnits() === $this->getUnits() || !$number->hasUnits()) |
|
| 515 | 515 | { |
| 516 | 516 | $new = $this->getNumber() + $number->getNumber(); |
| 517 | 517 | |
| 518 | - if($this->hasUnits()) |
|
| 518 | + if ($this->hasUnits()) |
|
| 519 | 519 | { |
| 520 | 520 | $new .= $this->getUnits(); |
| 521 | 521 | } |
@@ -536,7 +536,7 @@ discard block |
||
| 536 | 536 | */ |
| 537 | 537 | public function subtract($value) |
| 538 | 538 | { |
| 539 | - if($this->isEmpty()) |
|
| 539 | + if ($this->isEmpty()) |
|
| 540 | 540 | { |
| 541 | 541 | $this->setValue($value); |
| 542 | 542 | return $this; |
@@ -544,11 +544,11 @@ discard block |
||
| 544 | 544 | |
| 545 | 545 | $number = parseNumber($value); |
| 546 | 546 | |
| 547 | - if($number->getUnits() == $this->getUnits() || !$number->hasUnits()) |
|
| 547 | + if ($number->getUnits() == $this->getUnits() || !$number->hasUnits()) |
|
| 548 | 548 | { |
| 549 | 549 | $new = $this->getNumber() - $number->getNumber(); |
| 550 | 550 | |
| 551 | - if($this->hasUnits()) |
|
| 551 | + if ($this->hasUnits()) |
|
| 552 | 552 | { |
| 553 | 553 | $new .= $this->getUnits(); |
| 554 | 554 | } |
@@ -588,13 +588,13 @@ discard block |
||
| 588 | 588 | */ |
| 589 | 589 | protected function percentOperation(string $operation, $percent) |
| 590 | 590 | { |
| 591 | - if($this->isZeroOrEmpty()) { |
|
| 591 | + if ($this->isZeroOrEmpty()) { |
|
| 592 | 592 | return $this; |
| 593 | 593 | } |
| 594 | 594 | |
| 595 | 595 | $percent = parseNumber($percent); |
| 596 | 596 | |
| 597 | - if($percent->hasUnits() && !$percent->isPercent()) |
|
| 597 | + if ($percent->hasUnits() && !$percent->isPercent()) |
|
| 598 | 598 | { |
| 599 | 599 | return $this; |
| 600 | 600 | } |
@@ -602,18 +602,18 @@ discard block |
||
| 602 | 602 | $number = $this->getNumber(); |
| 603 | 603 | $value = $number * $percent->getNumber() / 100; |
| 604 | 604 | |
| 605 | - if($operation == '-') { |
|
| 605 | + if ($operation == '-') { |
|
| 606 | 606 | $number = $number - $value; |
| 607 | 607 | } else { |
| 608 | 608 | $number = $number + $value; |
| 609 | 609 | } |
| 610 | 610 | |
| 611 | - if($this->isUnitInteger()) |
|
| 611 | + if ($this->isUnitInteger()) |
|
| 612 | 612 | { |
| 613 | 613 | $number = intval($number); |
| 614 | 614 | } |
| 615 | 615 | |
| 616 | - if($this->hasUnits()) |
|
| 616 | + if ($this->hasUnits()) |
|
| 617 | 617 | { |
| 618 | 618 | $number .= $this->getUnits(); |
| 619 | 619 | } |
@@ -627,7 +627,7 @@ discard block |
||
| 627 | 627 | { |
| 628 | 628 | $units = $this->getUnits(); |
| 629 | 629 | |
| 630 | - if(isset($this->knownUnits[$units])) |
|
| 630 | + if (isset($this->knownUnits[$units])) |
|
| 631 | 631 | { |
| 632 | 632 | return !$this->knownUnits[$units]; |
| 633 | 633 | } |
@@ -639,7 +639,7 @@ discard block |
||
| 639 | 639 | { |
| 640 | 640 | $units = $this->getUnits(); |
| 641 | 641 | |
| 642 | - if(isset($this->knownUnits[$units])) |
|
| 642 | + if (isset($this->knownUnits[$units])) |
|
| 643 | 643 | { |
| 644 | 644 | return $this->knownUnits[$units]; |
| 645 | 645 | } |
@@ -678,7 +678,7 @@ discard block |
||
| 678 | 678 | |
| 679 | 679 | $key = $this->createValueKey($value); |
| 680 | 680 | |
| 681 | - if(array_key_exists($key, $cache)) { |
|
| 681 | + if (array_key_exists($key, $cache)) { |
|
| 682 | 682 | return $cache[$key]; |
| 683 | 683 | } |
| 684 | 684 | |
@@ -688,13 +688,13 @@ discard block |
||
| 688 | 688 | 'number' => null |
| 689 | 689 | ); |
| 690 | 690 | |
| 691 | - if($key === '_EMPTY_') |
|
| 691 | + if ($key === '_EMPTY_') |
|
| 692 | 692 | { |
| 693 | 693 | $cache[$key]['empty'] = true; |
| 694 | 694 | return $cache[$key]; |
| 695 | 695 | } |
| 696 | 696 | |
| 697 | - if($value === 0 || $value === '0') |
|
| 697 | + if ($value === 0 || $value === '0') |
|
| 698 | 698 | { |
| 699 | 699 | $cache[$key]['number'] = 0; |
| 700 | 700 | $cache[$key] = $this->filterInfo($cache[$key]); |
@@ -703,20 +703,20 @@ discard block |
||
| 703 | 703 | |
| 704 | 704 | $test = trim((string)$value); |
| 705 | 705 | |
| 706 | - if($test === '') |
|
| 706 | + if ($test === '') |
|
| 707 | 707 | { |
| 708 | 708 | $cache[$key]['empty'] = true; |
| 709 | 709 | return $cache[$key]; |
| 710 | 710 | } |
| 711 | 711 | |
| 712 | 712 | // replace comma notation (which is only possible if it's a string) |
| 713 | - if(is_string($value)) |
|
| 713 | + if (is_string($value)) |
|
| 714 | 714 | { |
| 715 | 715 | $test = $this->preProcess($test, $cache, $value); |
| 716 | 716 | } |
| 717 | 717 | |
| 718 | 718 | // convert to a number if it's numeric |
| 719 | - if(is_numeric($test)) |
|
| 719 | + if (is_numeric($test)) |
|
| 720 | 720 | { |
| 721 | 721 | $cache[$key]['number'] = (float)$test * 1; |
| 722 | 722 | $cache[$key] = $this->filterInfo($cache[$key]); |
@@ -742,19 +742,19 @@ discard block |
||
| 742 | 742 | $empty = false; |
| 743 | 743 | |
| 744 | 744 | $found = $this->findUnits($test); |
| 745 | - if($found !== null) |
|
| 745 | + if ($found !== null) |
|
| 746 | 746 | { |
| 747 | 747 | $number = $found['number']; |
| 748 | 748 | $units = $found['units']; |
| 749 | 749 | } |
| 750 | 750 | |
| 751 | 751 | // the filters have to restore the value |
| 752 | - if($this->postProcess) |
|
| 752 | + if ($this->postProcess) |
|
| 753 | 753 | { |
| 754 | 754 | $number = $this->postProcess($number, $test); |
| 755 | 755 | } |
| 756 | 756 | // empty number |
| 757 | - else if($number === '' || $number === null || is_bool($number)) |
|
| 757 | + else if ($number === '' || $number === null || is_bool($number)) |
|
| 758 | 758 | { |
| 759 | 759 | $number = null; |
| 760 | 760 | $empty = true; |
@@ -765,7 +765,7 @@ discard block |
||
| 765 | 765 | $number = trim($number); |
| 766 | 766 | |
| 767 | 767 | // may be an arbitrary string in some cases |
| 768 | - if(!is_numeric($number)) |
|
| 768 | + if (!is_numeric($number)) |
|
| 769 | 769 | { |
| 770 | 770 | $number = null; |
| 771 | 771 | $empty = true; |
@@ -797,17 +797,17 @@ discard block |
||
| 797 | 797 | $vlength = strlen($value); |
| 798 | 798 | $names = array_keys($this->knownUnits); |
| 799 | 799 | |
| 800 | - foreach($names as $unit) |
|
| 800 | + foreach ($names as $unit) |
|
| 801 | 801 | { |
| 802 | 802 | $ulength = strlen($unit); |
| 803 | - $start = $vlength-$ulength; |
|
| 804 | - if($start < 0) { |
|
| 803 | + $start = $vlength - $ulength; |
|
| 804 | + if ($start < 0) { |
|
| 805 | 805 | continue; |
| 806 | 806 | } |
| 807 | 807 | |
| 808 | 808 | $search = substr($value, $start, $ulength); |
| 809 | 809 | |
| 810 | - if($search==$unit) |
|
| 810 | + if ($search == $unit) |
|
| 811 | 811 | { |
| 812 | 812 | return array( |
| 813 | 813 | 'units' => $unit, |
@@ -827,7 +827,7 @@ discard block |
||
| 827 | 827 | */ |
| 828 | 828 | private function createValueKey($value) : string |
| 829 | 829 | { |
| 830 | - if(!is_string($value) && !is_numeric($value)) |
|
| 830 | + if (!is_string($value) && !is_numeric($value)) |
|
| 831 | 831 | { |
| 832 | 832 | return '_EMPTY_'; |
| 833 | 833 | } |
@@ -891,12 +891,12 @@ discard block |
||
| 891 | 891 | protected function filterInfo(array $info) : array |
| 892 | 892 | { |
| 893 | 893 | $useUnits = 'px'; |
| 894 | - if($info['units'] !== null) { |
|
| 894 | + if ($info['units'] !== null) { |
|
| 895 | 895 | $useUnits = $info['units']; |
| 896 | 896 | } |
| 897 | 897 | |
| 898 | 898 | // the units are non-decimal: convert decimal values |
| 899 | - if($this->knownUnits[$useUnits] === false && !$info['empty'] && is_numeric($info['number'])) |
|
| 899 | + if ($this->knownUnits[$useUnits] === false && !$info['empty'] && is_numeric($info['number'])) |
|
| 900 | 900 | { |
| 901 | 901 | $info['number'] = intval($info['number']); |
| 902 | 902 | } |
@@ -922,7 +922,7 @@ discard block |
||
| 922 | 922 | { |
| 923 | 923 | $number = floor($this->getNumber()); |
| 924 | 924 | |
| 925 | - if($number % 2 == 1) $number--; |
|
| 925 | + if ($number % 2 == 1) $number--; |
|
| 926 | 926 | |
| 927 | 927 | return $this->setNumber($number); |
| 928 | 928 | } |
@@ -938,7 +938,7 @@ discard block |
||
| 938 | 938 | { |
| 939 | 939 | $number = ceil($this->getNumber()); |
| 940 | 940 | |
| 941 | - if($number % 2 == 1) $number++; |
|
| 941 | + if ($number % 2 == 1) $number++; |
|
| 942 | 942 | |
| 943 | 943 | return $this->setNumber($number); |
| 944 | 944 | } |
@@ -769,8 +769,7 @@ discard block |
||
| 769 | 769 | { |
| 770 | 770 | $number = null; |
| 771 | 771 | $empty = true; |
| 772 | - } |
|
| 773 | - else |
|
| 772 | + } else |
|
| 774 | 773 | { |
| 775 | 774 | $number = (float)$number * 1; |
| 776 | 775 | } |
@@ -922,7 +921,9 @@ discard block |
||
| 922 | 921 | { |
| 923 | 922 | $number = floor($this->getNumber()); |
| 924 | 923 | |
| 925 | - if($number % 2 == 1) $number--; |
|
| 924 | + if($number % 2 == 1) { |
|
| 925 | + $number--; |
|
| 926 | + } |
|
| 926 | 927 | |
| 927 | 928 | return $this->setNumber($number); |
| 928 | 929 | } |
@@ -938,7 +939,9 @@ discard block |
||
| 938 | 939 | { |
| 939 | 940 | $number = ceil($this->getNumber()); |
| 940 | 941 | |
| 941 | - if($number % 2 == 1) $number++; |
|
| 942 | + if($number % 2 == 1) { |
|
| 943 | + $number++; |
|
| 944 | + } |
|
| 942 | 945 | |
| 943 | 946 | return $this->setNumber($number); |
| 944 | 947 | } |
@@ -40,19 +40,19 @@ discard block |
||
| 40 | 40 | */ |
| 41 | 41 | class NumberInfo |
| 42 | 42 | { |
| 43 | - /** |
|
| 44 | - * @var string|int|float|null |
|
| 45 | - */ |
|
| 43 | + /** |
|
| 44 | + * @var string|int|float|null |
|
| 45 | + */ |
|
| 46 | 46 | protected $rawValue; |
| 47 | 47 | |
| 48 | - /** |
|
| 49 | - * @var array<string,mixed> |
|
| 50 | - */ |
|
| 48 | + /** |
|
| 49 | + * @var array<string,mixed> |
|
| 50 | + */ |
|
| 51 | 51 | protected array $info; |
| 52 | 52 | |
| 53 | - /** |
|
| 54 | - * @var bool |
|
| 55 | - */ |
|
| 53 | + /** |
|
| 54 | + * @var bool |
|
| 55 | + */ |
|
| 56 | 56 | protected bool $empty = false; |
| 57 | 57 | |
| 58 | 58 | /** |
@@ -62,8 +62,8 @@ discard block |
||
| 62 | 62 | |
| 63 | 63 | /** |
| 64 | 64 | * Units and whether they allow decimal values. |
| 65 | - * @var array<string,bool> |
|
| 66 | - */ |
|
| 65 | + * @var array<string,bool> |
|
| 66 | + */ |
|
| 67 | 67 | protected array $knownUnits = array( |
| 68 | 68 | '%' => true, |
| 69 | 69 | 'rem' => true, |
@@ -141,21 +141,21 @@ discard block |
||
| 141 | 141 | return $this; |
| 142 | 142 | } |
| 143 | 143 | |
| 144 | - /** |
|
| 145 | - * Retrieves the raw, internal information array resulting |
|
| 146 | - * from the parsing of the number. |
|
| 147 | - * |
|
| 148 | - * @return array<string,mixed> |
|
| 149 | - */ |
|
| 144 | + /** |
|
| 145 | + * Retrieves the raw, internal information array resulting |
|
| 146 | + * from the parsing of the number. |
|
| 147 | + * |
|
| 148 | + * @return array<string,mixed> |
|
| 149 | + */ |
|
| 150 | 150 | public function getRawInfo() : array |
| 151 | 151 | { |
| 152 | 152 | return $this->info; |
| 153 | 153 | } |
| 154 | 154 | |
| 155 | - /** |
|
| 156 | - * Whether the number was empty (null or empty string). |
|
| 157 | - * @return boolean |
|
| 158 | - */ |
|
| 155 | + /** |
|
| 156 | + * Whether the number was empty (null or empty string). |
|
| 157 | + * @return boolean |
|
| 158 | + */ |
|
| 159 | 159 | public function isEmpty() : bool |
| 160 | 160 | { |
| 161 | 161 | return $this->empty; |
@@ -729,12 +729,12 @@ discard block |
||
| 729 | 729 | return $cache[$key]; |
| 730 | 730 | } |
| 731 | 731 | |
| 732 | - /** |
|
| 733 | - * Parses a string number notation with units included, e.g. 14px, 50%... |
|
| 734 | - * |
|
| 735 | - * @param string $test |
|
| 736 | - * @return array<string,mixed> |
|
| 737 | - */ |
|
| 732 | + /** |
|
| 733 | + * Parses a string number notation with units included, e.g. 14px, 50%... |
|
| 734 | + * |
|
| 735 | + * @param string $test |
|
| 736 | + * @return array<string,mixed> |
|
| 737 | + */ |
|
| 738 | 738 | private function parseStringValue(string $test) : array |
| 739 | 739 | { |
| 740 | 740 | $number = null; |
@@ -785,13 +785,13 @@ discard block |
||
| 785 | 785 | return $this->filterInfo($result); |
| 786 | 786 | } |
| 787 | 787 | |
| 788 | - /** |
|
| 789 | - * Attempts to determine what kind of units are specified |
|
| 790 | - * in the string. Returns NULL if none could be matched. |
|
| 791 | - * |
|
| 792 | - * @param string $value |
|
| 793 | - * @return array<string,mixed>|NULL |
|
| 794 | - */ |
|
| 788 | + /** |
|
| 789 | + * Attempts to determine what kind of units are specified |
|
| 790 | + * in the string. Returns NULL if none could be matched. |
|
| 791 | + * |
|
| 792 | + * @param string $value |
|
| 793 | + * @return array<string,mixed>|NULL |
|
| 794 | + */ |
|
| 795 | 795 | private function findUnits(string $value) : ?array |
| 796 | 796 | { |
| 797 | 797 | $vlength = strlen($value); |
@@ -819,12 +819,12 @@ discard block |
||
| 819 | 819 | return null; |
| 820 | 820 | } |
| 821 | 821 | |
| 822 | - /** |
|
| 823 | - * Creates the cache key for the specified value. |
|
| 824 | - * |
|
| 825 | - * @param mixed $value |
|
| 826 | - * @return string |
|
| 827 | - */ |
|
| 822 | + /** |
|
| 823 | + * Creates the cache key for the specified value. |
|
| 824 | + * |
|
| 825 | + * @param mixed $value |
|
| 826 | + * @return string |
|
| 827 | + */ |
|
| 828 | 828 | private function createValueKey($value) : string |
| 829 | 829 | { |
| 830 | 830 | if(!is_string($value) && !is_numeric($value)) |
@@ -835,59 +835,59 @@ discard block |
||
| 835 | 835 | return (string)$value; |
| 836 | 836 | } |
| 837 | 837 | |
| 838 | - /** |
|
| 839 | - * Called if explicitly enabled: allows filtering the |
|
| 840 | - * number after the detection process has completed. |
|
| 841 | - * |
|
| 842 | - * @param string|NULL $number The adjusted number |
|
| 843 | - * @param string $originalString The original value before it was parsed |
|
| 844 | - * @return string|null |
|
| 845 | - */ |
|
| 838 | + /** |
|
| 839 | + * Called if explicitly enabled: allows filtering the |
|
| 840 | + * number after the detection process has completed. |
|
| 841 | + * |
|
| 842 | + * @param string|NULL $number The adjusted number |
|
| 843 | + * @param string $originalString The original value before it was parsed |
|
| 844 | + * @return string|null |
|
| 845 | + */ |
|
| 846 | 846 | protected function postProcess(?string $number, /** @scrutinizer ignore-unused */ string $originalString) |
| 847 | 847 | { |
| 848 | 848 | return $number; |
| 849 | 849 | } |
| 850 | 850 | |
| 851 | - /** |
|
| 852 | - * Filters the value before it is parsed, but only if it is a string. |
|
| 853 | - * |
|
| 854 | - * NOTE: This may be overwritten in a subclass, to allow custom filtering |
|
| 855 | - * the values. An example of a use case would be a preprocessor for |
|
| 856 | - * variables in a templating system. |
|
| 857 | - * |
|
| 858 | - * @param string $trimmedString The trimmed value. |
|
| 859 | - * @param array<string,mixed> $cache The internal values cache array. |
|
| 860 | - * @param string $originalValue The original value that the NumberInfo was created for. |
|
| 861 | - * @return string |
|
| 862 | - * |
|
| 863 | - * @see NumberInfo::enablePostProcess() |
|
| 864 | - */ |
|
| 851 | + /** |
|
| 852 | + * Filters the value before it is parsed, but only if it is a string. |
|
| 853 | + * |
|
| 854 | + * NOTE: This may be overwritten in a subclass, to allow custom filtering |
|
| 855 | + * the values. An example of a use case would be a preprocessor for |
|
| 856 | + * variables in a templating system. |
|
| 857 | + * |
|
| 858 | + * @param string $trimmedString The trimmed value. |
|
| 859 | + * @param array<string,mixed> $cache The internal values cache array. |
|
| 860 | + * @param string $originalValue The original value that the NumberInfo was created for. |
|
| 861 | + * @return string |
|
| 862 | + * |
|
| 863 | + * @see NumberInfo::enablePostProcess() |
|
| 864 | + */ |
|
| 865 | 865 | protected function preProcess(string $trimmedString, /** @scrutinizer ignore-unused */ array &$cache, /** @scrutinizer ignore-unused */ string $originalValue) : string |
| 866 | 866 | { |
| 867 | 867 | return str_replace(',', '.', $trimmedString); |
| 868 | 868 | } |
| 869 | 869 | |
| 870 | - /** |
|
| 871 | - * Enables the post-processing so the postProcess method gets called. |
|
| 872 | - * This should be called in the {@link NumberInfo::preProcess()} |
|
| 873 | - * method as needed. |
|
| 874 | - * |
|
| 875 | - * @return $this |
|
| 876 | - * @see NumberInfo::postProcess() |
|
| 877 | - */ |
|
| 870 | + /** |
|
| 871 | + * Enables the post-processing so the postProcess method gets called. |
|
| 872 | + * This should be called in the {@link NumberInfo::preProcess()} |
|
| 873 | + * method as needed. |
|
| 874 | + * |
|
| 875 | + * @return $this |
|
| 876 | + * @see NumberInfo::postProcess() |
|
| 877 | + */ |
|
| 878 | 878 | protected function enablePostProcess() : NumberInfo |
| 879 | 879 | { |
| 880 | 880 | $this->postProcess = true; |
| 881 | 881 | return $this; |
| 882 | 882 | } |
| 883 | 883 | |
| 884 | - /** |
|
| 885 | - * Filters the number info array to adjust the units |
|
| 886 | - * and number according to the required rules. |
|
| 887 | - * |
|
| 888 | - * @param array<string,mixed> $info |
|
| 889 | - * @return array<string,mixed> |
|
| 890 | - */ |
|
| 884 | + /** |
|
| 885 | + * Filters the number info array to adjust the units |
|
| 886 | + * and number according to the required rules. |
|
| 887 | + * |
|
| 888 | + * @param array<string,mixed> $info |
|
| 889 | + * @return array<string,mixed> |
|
| 890 | + */ |
|
| 891 | 891 | protected function filterInfo(array $info) : array |
| 892 | 892 | { |
| 893 | 893 | $useUnits = 'px'; |
@@ -104,11 +104,11 @@ discard block |
||
| 104 | 104 | */ |
| 105 | 105 | public static function fromClosure(Closure $closure, $origin) : NamedClosure |
| 106 | 106 | { |
| 107 | - if(is_object($origin)) |
|
| 107 | + if (is_object($origin)) |
|
| 108 | 108 | { |
| 109 | 109 | $description = get_class($origin); |
| 110 | 110 | } |
| 111 | - else if(is_array($origin)) |
|
| 111 | + else if (is_array($origin)) |
|
| 112 | 112 | { |
| 113 | 113 | $description = ConvertHelper::callback2string($origin); |
| 114 | 114 | } |
@@ -126,7 +126,7 @@ discard block |
||
| 126 | 126 | * @param string|object $origin Optional origin. If not specified, the object and method name are used instead. |
| 127 | 127 | * @return NamedClosure |
| 128 | 128 | */ |
| 129 | - public static function fromObject(object $object, string $method, $origin='') : NamedClosure |
|
| 129 | + public static function fromObject(object $object, string $method, $origin = '') : NamedClosure |
|
| 130 | 130 | { |
| 131 | 131 | return self::fromArray(array($object, $method), $origin); |
| 132 | 132 | } |
@@ -136,11 +136,11 @@ discard block |
||
| 136 | 136 | * @param string|object $origin |
| 137 | 137 | * @return NamedClosure |
| 138 | 138 | */ |
| 139 | - public static function fromArray(array $callback, $origin='') : NamedClosure |
|
| 139 | + public static function fromArray(array $callback, $origin = '') : NamedClosure |
|
| 140 | 140 | { |
| 141 | - if(empty($origin)) { |
|
| 141 | + if (empty($origin)) { |
|
| 142 | 142 | $origin = ConvertHelper::callback2string($callback); |
| 143 | - } else if(is_object($origin)) { |
|
| 143 | + } else if (is_object($origin)) { |
|
| 144 | 144 | $origin = get_class($origin); |
| 145 | 145 | } |
| 146 | 146 | |
@@ -107,12 +107,10 @@ |
||
| 107 | 107 | if(is_object($origin)) |
| 108 | 108 | { |
| 109 | 109 | $description = get_class($origin); |
| 110 | - } |
|
| 111 | - else if(is_array($origin)) |
|
| 110 | + } else if(is_array($origin)) |
|
| 112 | 111 | { |
| 113 | 112 | $description = ConvertHelper::callback2string($origin); |
| 114 | - } |
|
| 115 | - else |
|
| 113 | + } else |
|
| 116 | 114 | { |
| 117 | 115 | $description = $origin; |
| 118 | 116 | } |
@@ -26,9 +26,9 @@ discard block |
||
| 26 | 26 | */ |
| 27 | 27 | class OperationResult_Collection extends OperationResult |
| 28 | 28 | { |
| 29 | - /** |
|
| 30 | - * @var OperationResult[] |
|
| 31 | - */ |
|
| 29 | + /** |
|
| 30 | + * @var OperationResult[] |
|
| 31 | + */ |
|
| 32 | 32 | protected $results = array(); |
| 33 | 33 | |
| 34 | 34 | /** |
@@ -123,9 +123,9 @@ discard block |
||
| 123 | 123 | return $this; |
| 124 | 124 | } |
| 125 | 125 | |
| 126 | - /** |
|
| 127 | - * @return OperationResult[] |
|
| 128 | - */ |
|
| 126 | + /** |
|
| 127 | + * @return OperationResult[] |
|
| 128 | + */ |
|
| 129 | 129 | public function getResults() : array |
| 130 | 130 | { |
| 131 | 131 | return $this->results; |
@@ -36,7 +36,7 @@ discard block |
||
| 36 | 36 | * @param int $code |
| 37 | 37 | * @return $this |
| 38 | 38 | */ |
| 39 | - public function makeError(string $message, int $code=0) : OperationResult |
|
| 39 | + public function makeError(string $message, int $code = 0) : OperationResult |
|
| 40 | 40 | { |
| 41 | 41 | return $this->add('makeError', $message, $code); |
| 42 | 42 | } |
@@ -46,7 +46,7 @@ discard block |
||
| 46 | 46 | * @param int $code |
| 47 | 47 | * @return $this |
| 48 | 48 | */ |
| 49 | - public function makeSuccess(string $message, int $code=0) : OperationResult |
|
| 49 | + public function makeSuccess(string $message, int $code = 0) : OperationResult |
|
| 50 | 50 | { |
| 51 | 51 | return $this->add('makeSuccess', $message, $code); |
| 52 | 52 | } |
@@ -56,7 +56,7 @@ discard block |
||
| 56 | 56 | * @param int $code |
| 57 | 57 | * @return $this |
| 58 | 58 | */ |
| 59 | - public function makeWarning(string $message, int $code=0) : OperationResult |
|
| 59 | + public function makeWarning(string $message, int $code = 0) : OperationResult |
|
| 60 | 60 | { |
| 61 | 61 | return $this->add('makeWarning', $message, $code); |
| 62 | 62 | } |
@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | * @param int $code |
| 67 | 67 | * @return $this |
| 68 | 68 | */ |
| 69 | - public function makeNotice(string $message, int $code=0) : OperationResult |
|
| 69 | + public function makeNotice(string $message, int $code = 0) : OperationResult |
|
| 70 | 70 | { |
| 71 | 71 | return $this->add('makeNotice', $message, $code); |
| 72 | 72 | } |
@@ -77,7 +77,7 @@ discard block |
||
| 77 | 77 | * @param int $code |
| 78 | 78 | * @return $this |
| 79 | 79 | */ |
| 80 | - protected function add(string $method, string $message, int $code=0) : OperationResult |
|
| 80 | + protected function add(string $method, string $message, int $code = 0) : OperationResult |
|
| 81 | 81 | { |
| 82 | 82 | $result = new OperationResult($this->subject); |
| 83 | 83 | $result->$method($message, $code); |
@@ -95,7 +95,7 @@ discard block |
||
| 95 | 95 | */ |
| 96 | 96 | public function addResult(OperationResult $result) : OperationResult_Collection |
| 97 | 97 | { |
| 98 | - if($result instanceof OperationResult_Collection) |
|
| 98 | + if ($result instanceof OperationResult_Collection) |
|
| 99 | 99 | { |
| 100 | 100 | return $this->importCollection($result); |
| 101 | 101 | } |
@@ -115,7 +115,7 @@ discard block |
||
| 115 | 115 | { |
| 116 | 116 | $results = $collection->getResults(); |
| 117 | 117 | |
| 118 | - foreach($results as $result) |
|
| 118 | + foreach ($results as $result) |
|
| 119 | 119 | { |
| 120 | 120 | $this->addResult($result); |
| 121 | 121 | } |
@@ -133,9 +133,9 @@ discard block |
||
| 133 | 133 | |
| 134 | 134 | public function isValid() : bool |
| 135 | 135 | { |
| 136 | - foreach($this->results as $result) |
|
| 136 | + foreach ($this->results as $result) |
|
| 137 | 137 | { |
| 138 | - if(!$result->isValid()) |
|
| 138 | + if (!$result->isValid()) |
|
| 139 | 139 | { |
| 140 | 140 | return false; |
| 141 | 141 | } |
@@ -146,9 +146,9 @@ discard block |
||
| 146 | 146 | |
| 147 | 147 | public function hasCode() : bool |
| 148 | 148 | { |
| 149 | - foreach($this->results as $result) |
|
| 149 | + foreach ($this->results as $result) |
|
| 150 | 150 | { |
| 151 | - if($result->hasCode()) |
|
| 151 | + if ($result->hasCode()) |
|
| 152 | 152 | { |
| 153 | 153 | return true; |
| 154 | 154 | } |
@@ -159,9 +159,9 @@ discard block |
||
| 159 | 159 | |
| 160 | 160 | public function getCode() : int |
| 161 | 161 | { |
| 162 | - foreach($this->results as $result) |
|
| 162 | + foreach ($this->results as $result) |
|
| 163 | 163 | { |
| 164 | - if($result->hasCode()) |
|
| 164 | + if ($result->hasCode()) |
|
| 165 | 165 | { |
| 166 | 166 | return $result->getCode(); |
| 167 | 167 | } |
@@ -170,13 +170,13 @@ discard block |
||
| 170 | 170 | return 0; |
| 171 | 171 | } |
| 172 | 172 | |
| 173 | - public function getMessage(string $type='') : string |
|
| 173 | + public function getMessage(string $type = '') : string |
|
| 174 | 174 | { |
| 175 | - foreach($this->results as $result) |
|
| 175 | + foreach ($this->results as $result) |
|
| 176 | 176 | { |
| 177 | 177 | $msg = $result->getMessage($type); |
| 178 | 178 | |
| 179 | - if(!empty($msg)) |
|
| 179 | + if (!empty($msg)) |
|
| 180 | 180 | { |
| 181 | 181 | return $msg; |
| 182 | 182 | } |
@@ -187,9 +187,9 @@ discard block |
||
| 187 | 187 | |
| 188 | 188 | public function containsCode(int $code) : bool |
| 189 | 189 | { |
| 190 | - foreach($this->results as $result) |
|
| 190 | + foreach ($this->results as $result) |
|
| 191 | 191 | { |
| 192 | - if($result->getCode() === $code) |
|
| 192 | + if ($result->getCode() === $code) |
|
| 193 | 193 | { |
| 194 | 194 | return true; |
| 195 | 195 | } |
@@ -222,9 +222,9 @@ discard block |
||
| 222 | 222 | { |
| 223 | 223 | $amount = 0; |
| 224 | 224 | |
| 225 | - foreach($this->results as $result) |
|
| 225 | + foreach ($this->results as $result) |
|
| 226 | 226 | { |
| 227 | - if($result->isType($type)) |
|
| 227 | + if ($result->isType($type)) |
|
| 228 | 228 | { |
| 229 | 229 | $amount++; |
| 230 | 230 | } |
@@ -262,9 +262,9 @@ discard block |
||
| 262 | 262 | { |
| 263 | 263 | $results = array(); |
| 264 | 264 | |
| 265 | - foreach($this->results as $result) |
|
| 265 | + foreach ($this->results as $result) |
|
| 266 | 266 | { |
| 267 | - if($result->isType($type)) |
|
| 267 | + if ($result->isType($type)) |
|
| 268 | 268 | { |
| 269 | 269 | $results[] = $result; |
| 270 | 270 | } |
@@ -275,9 +275,9 @@ discard block |
||
| 275 | 275 | |
| 276 | 276 | public function isType(string $type) : bool |
| 277 | 277 | { |
| 278 | - foreach($this->results as $result) |
|
| 278 | + foreach ($this->results as $result) |
|
| 279 | 279 | { |
| 280 | - if($result->isType($type)) |
|
| 280 | + if ($result->isType($type)) |
|
| 281 | 281 | { |
| 282 | 282 | return true; |
| 283 | 283 | } |
@@ -293,7 +293,7 @@ discard block |
||
| 293 | 293 | $lines[] = 'Collection #'.$this->getID(); |
| 294 | 294 | $lines[] = 'Subject: '.get_class($this->subject); |
| 295 | 295 | |
| 296 | - foreach($this->results as $result) |
|
| 296 | + foreach ($this->results as $result) |
|
| 297 | 297 | { |
| 298 | 298 | $lines[] = ' - '.$result->getType().' #'.$result->getCode().' "'.$result->getMessage($result->getType()).'"'; |
| 299 | 299 | } |
@@ -144,7 +144,7 @@ discard block |
||
| 144 | 144 | * @param string $message Should not contain a date, just the system specific info. |
| 145 | 145 | * @return $this |
| 146 | 146 | */ |
| 147 | - public function makeSuccess(string $message, int $code=0) : OperationResult |
|
| 147 | + public function makeSuccess(string $message, int $code = 0) : OperationResult |
|
| 148 | 148 | { |
| 149 | 149 | return $this->setMessage(self::TYPE_SUCCESS, $message, $code, true); |
| 150 | 150 | } |
@@ -155,7 +155,7 @@ discard block |
||
| 155 | 155 | * @param string $message Should be as detailed as possible. |
| 156 | 156 | * @return $this |
| 157 | 157 | */ |
| 158 | - public function makeError(string $message, int $code=0) : OperationResult |
|
| 158 | + public function makeError(string $message, int $code = 0) : OperationResult |
|
| 159 | 159 | { |
| 160 | 160 | return $this->setMessage(self::TYPE_ERROR, $message, $code, false); |
| 161 | 161 | } |
@@ -252,11 +252,11 @@ discard block |
||
| 252 | 252 | return $this->code; |
| 253 | 253 | } |
| 254 | 254 | |
| 255 | - public function getMessage(string $type='') : string |
|
| 255 | + public function getMessage(string $type = '') : string |
|
| 256 | 256 | { |
| 257 | - if(!empty($type)) |
|
| 257 | + if (!empty($type)) |
|
| 258 | 258 | { |
| 259 | - if($this->type === $type) |
|
| 259 | + if ($this->type === $type) |
|
| 260 | 260 | { |
| 261 | 261 | return $this->message; |
| 262 | 262 | } |
@@ -280,11 +280,11 @@ discard block |
||
| 280 | 280 | * |
| 281 | 281 | * @throws ConvertHelper_Exception |
| 282 | 282 | */ |
| 283 | - public function makeException(Throwable $e, int $code=0, bool $withDeveloperInfo=false) : OperationResult |
|
| 283 | + public function makeException(Throwable $e, int $code = 0, bool $withDeveloperInfo = false) : OperationResult |
|
| 284 | 284 | { |
| 285 | 285 | $info = parseThrowable($e); |
| 286 | 286 | |
| 287 | - if($code === 0) |
|
| 287 | + if ($code === 0) |
|
| 288 | 288 | { |
| 289 | 289 | $code = $info->getCode(); |
| 290 | 290 | } |
@@ -34,46 +34,46 @@ discard block |
||
| 34 | 34 | public const TYPE_ERROR = 'error'; |
| 35 | 35 | public const TYPE_SUCCESS = 'success'; |
| 36 | 36 | |
| 37 | - /** |
|
| 38 | - * @var string |
|
| 39 | - */ |
|
| 37 | + /** |
|
| 38 | + * @var string |
|
| 39 | + */ |
|
| 40 | 40 | protected $message = ''; |
| 41 | 41 | |
| 42 | - /** |
|
| 43 | - * @var bool |
|
| 44 | - */ |
|
| 42 | + /** |
|
| 43 | + * @var bool |
|
| 44 | + */ |
|
| 45 | 45 | protected $valid = true; |
| 46 | 46 | |
| 47 | - /** |
|
| 48 | - * @var object |
|
| 49 | - */ |
|
| 47 | + /** |
|
| 48 | + * @var object |
|
| 49 | + */ |
|
| 50 | 50 | protected $subject; |
| 51 | 51 | |
| 52 | - /** |
|
| 53 | - * @var integer |
|
| 54 | - */ |
|
| 52 | + /** |
|
| 53 | + * @var integer |
|
| 54 | + */ |
|
| 55 | 55 | protected $code = 0; |
| 56 | 56 | |
| 57 | - /** |
|
| 58 | - * @var string |
|
| 59 | - */ |
|
| 57 | + /** |
|
| 58 | + * @var string |
|
| 59 | + */ |
|
| 60 | 60 | protected $type = ''; |
| 61 | 61 | |
| 62 | - /** |
|
| 63 | - * @var integer |
|
| 64 | - */ |
|
| 62 | + /** |
|
| 63 | + * @var integer |
|
| 64 | + */ |
|
| 65 | 65 | private static $counter = 0; |
| 66 | 66 | |
| 67 | - /** |
|
| 68 | - * @var int |
|
| 69 | - */ |
|
| 67 | + /** |
|
| 68 | + * @var int |
|
| 69 | + */ |
|
| 70 | 70 | private $id; |
| 71 | 71 | |
| 72 | - /** |
|
| 73 | - * The subject being validated. |
|
| 74 | - * |
|
| 75 | - * @param object $subject |
|
| 76 | - */ |
|
| 72 | + /** |
|
| 73 | + * The subject being validated. |
|
| 74 | + * |
|
| 75 | + * @param object $subject |
|
| 76 | + */ |
|
| 77 | 77 | public function __construct(object $subject) |
| 78 | 78 | { |
| 79 | 79 | $this->subject = $subject; |
@@ -83,21 +83,21 @@ discard block |
||
| 83 | 83 | $this->id = self::$counter; |
| 84 | 84 | } |
| 85 | 85 | |
| 86 | - /** |
|
| 87 | - * Retrieves the ID of the result, which is unique within a request. |
|
| 88 | - * |
|
| 89 | - * @return int |
|
| 90 | - */ |
|
| 86 | + /** |
|
| 87 | + * Retrieves the ID of the result, which is unique within a request. |
|
| 88 | + * |
|
| 89 | + * @return int |
|
| 90 | + */ |
|
| 91 | 91 | public function getID() : int |
| 92 | 92 | { |
| 93 | 93 | return $this->id; |
| 94 | 94 | } |
| 95 | 95 | |
| 96 | - /** |
|
| 97 | - * Whether the validation was successful. |
|
| 98 | - * |
|
| 99 | - * @return bool |
|
| 100 | - */ |
|
| 96 | + /** |
|
| 97 | + * Whether the validation was successful. |
|
| 98 | + * |
|
| 99 | + * @return bool |
|
| 100 | + */ |
|
| 101 | 101 | public function isValid() : bool |
| 102 | 102 | { |
| 103 | 103 | return $this->valid; |
@@ -128,33 +128,33 @@ discard block |
||
| 128 | 128 | return $this->type === $type; |
| 129 | 129 | } |
| 130 | 130 | |
| 131 | - /** |
|
| 132 | - * Retrieves the subject that was validated. |
|
| 133 | - * |
|
| 134 | - * @return object |
|
| 135 | - */ |
|
| 131 | + /** |
|
| 132 | + * Retrieves the subject that was validated. |
|
| 133 | + * |
|
| 134 | + * @return object |
|
| 135 | + */ |
|
| 136 | 136 | public function getSubject() : object |
| 137 | 137 | { |
| 138 | 138 | return $this->subject; |
| 139 | 139 | } |
| 140 | 140 | |
| 141 | - /** |
|
| 142 | - * Makes the result a success, with the specified message. |
|
| 143 | - * |
|
| 144 | - * @param string $message Should not contain a date, just the system specific info. |
|
| 145 | - * @return $this |
|
| 146 | - */ |
|
| 141 | + /** |
|
| 142 | + * Makes the result a success, with the specified message. |
|
| 143 | + * |
|
| 144 | + * @param string $message Should not contain a date, just the system specific info. |
|
| 145 | + * @return $this |
|
| 146 | + */ |
|
| 147 | 147 | public function makeSuccess(string $message, int $code=0) : OperationResult |
| 148 | 148 | { |
| 149 | 149 | return $this->setMessage(self::TYPE_SUCCESS, $message, $code, true); |
| 150 | 150 | } |
| 151 | 151 | |
| 152 | - /** |
|
| 153 | - * Sets the result as an error. |
|
| 154 | - * |
|
| 155 | - * @param string $message Should be as detailed as possible. |
|
| 156 | - * @return $this |
|
| 157 | - */ |
|
| 152 | + /** |
|
| 153 | + * Sets the result as an error. |
|
| 154 | + * |
|
| 155 | + * @param string $message Should be as detailed as possible. |
|
| 156 | + * @return $this |
|
| 157 | + */ |
|
| 158 | 158 | public function makeError(string $message, int $code=0) : OperationResult |
| 159 | 159 | { |
| 160 | 160 | return $this->setMessage(self::TYPE_ERROR, $message, $code, false); |
@@ -202,21 +202,21 @@ discard block |
||
| 202 | 202 | return $this->type; |
| 203 | 203 | } |
| 204 | 204 | |
| 205 | - /** |
|
| 206 | - * Retrieves the error message, if an error occurred. |
|
| 207 | - * |
|
| 208 | - * @return string The error message, or an empty string if no error occurred. |
|
| 209 | - */ |
|
| 205 | + /** |
|
| 206 | + * Retrieves the error message, if an error occurred. |
|
| 207 | + * |
|
| 208 | + * @return string The error message, or an empty string if no error occurred. |
|
| 209 | + */ |
|
| 210 | 210 | public function getErrorMessage() : string |
| 211 | 211 | { |
| 212 | 212 | return $this->getMessage(self::TYPE_ERROR); |
| 213 | 213 | } |
| 214 | 214 | |
| 215 | - /** |
|
| 216 | - * Retrieves the success message, if one has been provided. |
|
| 217 | - * |
|
| 218 | - * @return string |
|
| 219 | - */ |
|
| 215 | + /** |
|
| 216 | + * Retrieves the success message, if one has been provided. |
|
| 217 | + * |
|
| 218 | + * @return string |
|
| 219 | + */ |
|
| 220 | 220 | public function getSuccessMessage() : string |
| 221 | 221 | { |
| 222 | 222 | return $this->getMessage(self::TYPE_SUCCESS); |
@@ -232,21 +232,21 @@ discard block |
||
| 232 | 232 | return $this->getMessage(self::TYPE_WARNING); |
| 233 | 233 | } |
| 234 | 234 | |
| 235 | - /** |
|
| 236 | - * Whether a specific error/success code has been specified. |
|
| 237 | - * |
|
| 238 | - * @return bool |
|
| 239 | - */ |
|
| 235 | + /** |
|
| 236 | + * Whether a specific error/success code has been specified. |
|
| 237 | + * |
|
| 238 | + * @return bool |
|
| 239 | + */ |
|
| 240 | 240 | public function hasCode() : bool |
| 241 | 241 | { |
| 242 | 242 | return $this->code > 0; |
| 243 | 243 | } |
| 244 | 244 | |
| 245 | - /** |
|
| 246 | - * Retrieves the error/success code, if any. |
|
| 247 | - * |
|
| 248 | - * @return int The error code, or 0 if none. |
|
| 249 | - */ |
|
| 245 | + /** |
|
| 246 | + * Retrieves the error/success code, if any. |
|
| 247 | + * |
|
| 248 | + * @return int The error code, or 0 if none. |
|
| 249 | + */ |
|
| 250 | 250 | public function getCode() : int |
| 251 | 251 | { |
| 252 | 252 | return $this->code; |
@@ -119,8 +119,7 @@ discard block |
||
| 119 | 119 | if($datetime instanceof Microtime_ParseResult) |
| 120 | 120 | { |
| 121 | 121 | $parsed = $datetime; |
| 122 | - } |
|
| 123 | - else |
|
| 122 | + } else |
|
| 124 | 123 | { |
| 125 | 124 | $parsed = $this->parseDate($datetime, $timeZone); |
| 126 | 125 | } |
@@ -128,8 +127,7 @@ discard block |
||
| 128 | 127 | try |
| 129 | 128 | { |
| 130 | 129 | parent::__construct($parsed->getDateTime(), $parsed->getTimeZone()); |
| 131 | - } |
|
| 132 | - catch (Exception $e) |
|
| 130 | + } catch (Exception $e) |
|
| 133 | 131 | { |
| 134 | 132 | throw new Microtime_Exception( |
| 135 | 133 | 'Failed to create date from string.', |
@@ -51,9 +51,9 @@ discard block |
||
| 51 | 51 | * @see Microtime::createFromString() |
| 52 | 52 | * @see Microtime::createNow() |
| 53 | 53 | */ |
| 54 | - public function __construct($datetime=self::DATETIME_NOW, ?DateTimeZone $timeZone=null) |
|
| 54 | + public function __construct($datetime = self::DATETIME_NOW, ?DateTimeZone $timeZone = null) |
|
| 55 | 55 | { |
| 56 | - if($datetime instanceof Microtime_ParseResult) |
|
| 56 | + if ($datetime instanceof Microtime_ParseResult) |
|
| 57 | 57 | { |
| 58 | 58 | $parsed = $datetime; |
| 59 | 59 | } |
@@ -86,9 +86,9 @@ discard block |
||
| 86 | 86 | * @return Microtime_ParseResult |
| 87 | 87 | * @throws Microtime_Exception |
| 88 | 88 | */ |
| 89 | - private function parseDate($datetime, ?DateTimeZone $timeZone=null) : Microtime_ParseResult |
|
| 89 | + private function parseDate($datetime, ?DateTimeZone $timeZone = null) : Microtime_ParseResult |
|
| 90 | 90 | { |
| 91 | - if($datetime instanceof self) |
|
| 91 | + if ($datetime instanceof self) |
|
| 92 | 92 | { |
| 93 | 93 | return new Microtime_ParseResult( |
| 94 | 94 | $datetime->getISODate(), |
@@ -96,7 +96,7 @@ discard block |
||
| 96 | 96 | ); |
| 97 | 97 | } |
| 98 | 98 | |
| 99 | - if($datetime instanceof DateTime) |
|
| 99 | + if ($datetime instanceof DateTime) |
|
| 100 | 100 | { |
| 101 | 101 | return new Microtime_ParseResult( |
| 102 | 102 | $datetime->format(self::FORMAT_ISO), |
@@ -104,17 +104,17 @@ discard block |
||
| 104 | 104 | ); |
| 105 | 105 | } |
| 106 | 106 | |
| 107 | - if($timeZone === null) |
|
| 107 | + if ($timeZone === null) |
|
| 108 | 108 | { |
| 109 | 109 | $timeZone = new DateTimeZone(date_default_timezone_get()); |
| 110 | 110 | } |
| 111 | 111 | |
| 112 | - if(empty($datetime) || $datetime === self::DATETIME_NOW) |
|
| 112 | + if (empty($datetime) || $datetime === self::DATETIME_NOW) |
|
| 113 | 113 | { |
| 114 | 114 | return self::parseNow($timeZone); |
| 115 | 115 | } |
| 116 | 116 | |
| 117 | - if(is_string($datetime)) |
|
| 117 | + if (is_string($datetime)) |
|
| 118 | 118 | { |
| 119 | 119 | return new Microtime_ParseResult( |
| 120 | 120 | $datetime, |
@@ -141,7 +141,7 @@ discard block |
||
| 141 | 141 | { |
| 142 | 142 | $dateObj = DateTime::createFromFormat('0.u00 U', microtime(), new DateTimeZone('America/Denver')); |
| 143 | 143 | |
| 144 | - if($dateObj !== false) |
|
| 144 | + if ($dateObj !== false) |
|
| 145 | 145 | { |
| 146 | 146 | $dateObj->setTimezone($timeZone); |
| 147 | 147 | |
@@ -165,9 +165,9 @@ discard block |
||
| 165 | 165 | * @return Microtime |
| 166 | 166 | * @throws Microtime_Exception |
| 167 | 167 | */ |
| 168 | - public static function createNow(?DateTimeZone $timeZone=null) : Microtime |
|
| 168 | + public static function createNow(?DateTimeZone $timeZone = null) : Microtime |
|
| 169 | 169 | { |
| 170 | - if($timeZone === null) |
|
| 170 | + if ($timeZone === null) |
|
| 171 | 171 | { |
| 172 | 172 | $timeZone = new DateTimeZone(date_default_timezone_get()); |
| 173 | 173 | } |
@@ -184,9 +184,9 @@ discard block |
||
| 184 | 184 | * @return Microtime |
| 185 | 185 | * @throws Microtime_Exception |
| 186 | 186 | */ |
| 187 | - public static function createFromString(string $date, ?DateTimeZone $timeZone=null) : Microtime |
|
| 187 | + public static function createFromString(string $date, ?DateTimeZone $timeZone = null) : Microtime |
|
| 188 | 188 | { |
| 189 | - if($timeZone === null) |
|
| 189 | + if ($timeZone === null) |
|
| 190 | 190 | { |
| 191 | 191 | $timeZone = new DateTimeZone(date_default_timezone_get()); |
| 192 | 192 | } |
@@ -80,7 +80,7 @@ discard block |
||
| 80 | 80 | */ |
| 81 | 81 | protected function __construct($subject) |
| 82 | 82 | { |
| 83 | - if(is_array($subject)) |
|
| 83 | + if (is_array($subject)) |
|
| 84 | 84 | { |
| 85 | 85 | $this->parseSerialized($subject); |
| 86 | 86 | } |
@@ -139,7 +139,7 @@ discard block |
||
| 139 | 139 | */ |
| 140 | 140 | public function getPrevious() : ConvertHelper_ThrowableInfo |
| 141 | 141 | { |
| 142 | - if(isset($this->previous)) { |
|
| 142 | + if (isset($this->previous)) { |
|
| 143 | 143 | return $this->previous; |
| 144 | 144 | } |
| 145 | 145 | |
@@ -258,7 +258,7 @@ discard block |
||
| 258 | 258 | public function getFolderDepth() : int |
| 259 | 259 | { |
| 260 | 260 | $depth = $this->getOption('folder-depth'); |
| 261 | - if(!empty($depth)) { |
|
| 261 | + if (!empty($depth)) { |
|
| 262 | 262 | return $depth; |
| 263 | 263 | } |
| 264 | 264 | |
@@ -315,7 +315,7 @@ discard block |
||
| 315 | 315 | |
| 316 | 316 | $this->setOptions($serialized[ConvertHelper_ThrowableInfo_Serializer::SERIALIZED_OPTIONS]); |
| 317 | 317 | |
| 318 | - foreach($serialized[ConvertHelper_ThrowableInfo_Serializer::SERIALIZED_CALLS] as $def) |
|
| 318 | + foreach ($serialized[ConvertHelper_ThrowableInfo_Serializer::SERIALIZED_CALLS] as $def) |
|
| 319 | 319 | { |
| 320 | 320 | $this->calls[] = ConvertHelper_ThrowableInfo_Call::fromSerialized($this, $def); |
| 321 | 321 | } |
@@ -326,7 +326,7 @@ discard block |
||
| 326 | 326 | $this->date = new Microtime(); |
| 327 | 327 | $this->class = get_class($e); |
| 328 | 328 | |
| 329 | - if($e instanceof BaseException) |
|
| 329 | + if ($e instanceof BaseException) |
|
| 330 | 330 | { |
| 331 | 331 | $this->details = $e->getDetails(); |
| 332 | 332 | } |
@@ -359,7 +359,7 @@ discard block |
||
| 359 | 359 | * @return string |
| 360 | 360 | * @throws ConvertHelper_Exception |
| 361 | 361 | */ |
| 362 | - public function renderErrorMessage(bool $withDeveloperInfo=false) : string |
|
| 362 | + public function renderErrorMessage(bool $withDeveloperInfo = false) : string |
|
| 363 | 363 | { |
| 364 | 364 | return (new ConvertHelper_ThrowableInfo_MessageRenderer($this, $withDeveloperInfo)) |
| 365 | 365 | ->render(); |
@@ -435,7 +435,7 @@ discard block |
||
| 435 | 435 | } |
| 436 | 436 | else |
| 437 | 437 | { |
| 438 | - $this->message = 'Original error code: [' . $code . ']. ' . $this->message; |
|
| 438 | + $this->message = 'Original error code: ['.$code.']. '.$this->message; |
|
| 439 | 439 | } |
| 440 | 440 | } |
| 441 | 441 | |
@@ -83,8 +83,7 @@ discard block |
||
| 83 | 83 | if(is_array($subject)) |
| 84 | 84 | { |
| 85 | 85 | $this->parseSerialized($subject); |
| 86 | - } |
|
| 87 | - else |
|
| 86 | + } else |
|
| 88 | 87 | { |
| 89 | 88 | $this->parseException($subject); |
| 90 | 89 | } |
@@ -432,8 +431,7 @@ discard block |
||
| 432 | 431 | if (is_integer($code)) |
| 433 | 432 | { |
| 434 | 433 | $this->code = $code; |
| 435 | - } |
|
| 436 | - else |
|
| 434 | + } else |
|
| 437 | 435 | { |
| 438 | 436 | $this->message = 'Original error code: [' . $code . ']. ' . $this->message; |
| 439 | 437 | } |
@@ -20,48 +20,48 @@ discard block |
||
| 20 | 20 | public const CONTEXT_WEB = 'web'; |
| 21 | 21 | |
| 22 | 22 | /** |
| 23 | - * @var Throwable |
|
| 24 | - */ |
|
| 23 | + * @var Throwable |
|
| 24 | + */ |
|
| 25 | 25 | protected $exception; |
| 26 | 26 | |
| 27 | - /** |
|
| 28 | - * @var ConvertHelper_ThrowableInfo_Call[] |
|
| 29 | - */ |
|
| 27 | + /** |
|
| 28 | + * @var ConvertHelper_ThrowableInfo_Call[] |
|
| 29 | + */ |
|
| 30 | 30 | protected $calls = array(); |
| 31 | 31 | |
| 32 | - /** |
|
| 33 | - * @var integer |
|
| 34 | - */ |
|
| 32 | + /** |
|
| 33 | + * @var integer |
|
| 34 | + */ |
|
| 35 | 35 | protected $code = 0; |
| 36 | 36 | |
| 37 | - /** |
|
| 38 | - * @var string |
|
| 39 | - */ |
|
| 37 | + /** |
|
| 38 | + * @var string |
|
| 39 | + */ |
|
| 40 | 40 | protected $message; |
| 41 | 41 | |
| 42 | - /** |
|
| 43 | - * @var integer |
|
| 44 | - */ |
|
| 42 | + /** |
|
| 43 | + * @var integer |
|
| 44 | + */ |
|
| 45 | 45 | protected $callsCount = 0; |
| 46 | 46 | |
| 47 | - /** |
|
| 48 | - * @var ConvertHelper_ThrowableInfo|NULL |
|
| 49 | - */ |
|
| 47 | + /** |
|
| 48 | + * @var ConvertHelper_ThrowableInfo|NULL |
|
| 49 | + */ |
|
| 50 | 50 | protected $previous = null; |
| 51 | 51 | |
| 52 | - /** |
|
| 53 | - * @var string |
|
| 54 | - */ |
|
| 52 | + /** |
|
| 53 | + * @var string |
|
| 54 | + */ |
|
| 55 | 55 | protected $referer = ''; |
| 56 | 56 | |
| 57 | - /** |
|
| 58 | - * @var Microtime |
|
| 59 | - */ |
|
| 57 | + /** |
|
| 58 | + * @var Microtime |
|
| 59 | + */ |
|
| 60 | 60 | protected $date; |
| 61 | 61 | |
| 62 | - /** |
|
| 63 | - * @var string |
|
| 64 | - */ |
|
| 62 | + /** |
|
| 63 | + * @var string |
|
| 64 | + */ |
|
| 65 | 65 | protected $context = self::CONTEXT_WEB; |
| 66 | 66 | |
| 67 | 67 | /** |
@@ -127,16 +127,16 @@ discard block |
||
| 127 | 127 | return isset($this->previous); |
| 128 | 128 | } |
| 129 | 129 | |
| 130 | - /** |
|
| 131 | - * Retrieves the information on the previous exception. |
|
| 132 | - * |
|
| 133 | - * NOTE: Throws an exception if there is no previous |
|
| 134 | - * exception. Use hasPrevious() first to avoid this. |
|
| 135 | - * |
|
| 136 | - * @throws ConvertHelper_Exception |
|
| 137 | - * @return ConvertHelper_ThrowableInfo |
|
| 138 | - * @see ConvertHelper_ThrowableInfo::ERROR_NO_PREVIOUS_EXCEPTION |
|
| 139 | - */ |
|
| 130 | + /** |
|
| 131 | + * Retrieves the information on the previous exception. |
|
| 132 | + * |
|
| 133 | + * NOTE: Throws an exception if there is no previous |
|
| 134 | + * exception. Use hasPrevious() first to avoid this. |
|
| 135 | + * |
|
| 136 | + * @throws ConvertHelper_Exception |
|
| 137 | + * @return ConvertHelper_ThrowableInfo |
|
| 138 | + * @see ConvertHelper_ThrowableInfo::ERROR_NO_PREVIOUS_EXCEPTION |
|
| 139 | + */ |
|
| 140 | 140 | public function getPrevious() : ConvertHelper_ThrowableInfo |
| 141 | 141 | { |
| 142 | 142 | if(isset($this->previous)) { |
@@ -155,68 +155,68 @@ discard block |
||
| 155 | 155 | return !empty($this->code); |
| 156 | 156 | } |
| 157 | 157 | |
| 158 | - /** |
|
| 159 | - * Improved text-only exception trace. |
|
| 160 | - */ |
|
| 158 | + /** |
|
| 159 | + * Improved text-only exception trace. |
|
| 160 | + */ |
|
| 161 | 161 | public function toString() : string |
| 162 | 162 | { |
| 163 | 163 | return (new ConvertHelper_ThrowableInfo_StringConverter($this)) |
| 164 | 164 | ->toString(); |
| 165 | 165 | } |
| 166 | 166 | |
| 167 | - /** |
|
| 168 | - * Retrieves the URL of the page in which the exception |
|
| 169 | - * was thrown, if applicable: in CLI context, this will |
|
| 170 | - * return an empty string. |
|
| 171 | - * |
|
| 172 | - * @return string |
|
| 173 | - */ |
|
| 167 | + /** |
|
| 168 | + * Retrieves the URL of the page in which the exception |
|
| 169 | + * was thrown, if applicable: in CLI context, this will |
|
| 170 | + * return an empty string. |
|
| 171 | + * |
|
| 172 | + * @return string |
|
| 173 | + */ |
|
| 174 | 174 | public function getReferer() : string |
| 175 | 175 | { |
| 176 | 176 | return $this->referer; |
| 177 | 177 | } |
| 178 | 178 | |
| 179 | - /** |
|
| 180 | - * Whether the exception occurred in a command line context. |
|
| 181 | - * @return bool |
|
| 182 | - */ |
|
| 179 | + /** |
|
| 180 | + * Whether the exception occurred in a command line context. |
|
| 181 | + * @return bool |
|
| 182 | + */ |
|
| 183 | 183 | public function isCommandLine() : bool |
| 184 | 184 | { |
| 185 | 185 | return $this->getContext() === self::CONTEXT_COMMAND_LINE; |
| 186 | 186 | } |
| 187 | 187 | |
| 188 | - /** |
|
| 189 | - * Whether the exception occurred during an http request. |
|
| 190 | - * @return bool |
|
| 191 | - */ |
|
| 188 | + /** |
|
| 189 | + * Whether the exception occurred during an http request. |
|
| 190 | + * @return bool |
|
| 191 | + */ |
|
| 192 | 192 | public function isWebRequest() : bool |
| 193 | 193 | { |
| 194 | 194 | return $this->getContext() === self::CONTEXT_WEB; |
| 195 | 195 | } |
| 196 | 196 | |
| 197 | - /** |
|
| 198 | - * Retrieves the context identifier, i.e. if the exception |
|
| 199 | - * occurred in a command line context or regular web request. |
|
| 200 | - * |
|
| 201 | - * @return string |
|
| 202 | - * |
|
| 203 | - * @see ConvertHelper_ThrowableInfo::isCommandLine() |
|
| 204 | - * @see ConvertHelper_ThrowableInfo::isWebRequest() |
|
| 205 | - * @see ConvertHelper_ThrowableInfo::CONTEXT_COMMAND_LINE |
|
| 206 | - * @see ConvertHelper_ThrowableInfo::CONTEXT_WEB |
|
| 207 | - */ |
|
| 197 | + /** |
|
| 198 | + * Retrieves the context identifier, i.e. if the exception |
|
| 199 | + * occurred in a command line context or regular web request. |
|
| 200 | + * |
|
| 201 | + * @return string |
|
| 202 | + * |
|
| 203 | + * @see ConvertHelper_ThrowableInfo::isCommandLine() |
|
| 204 | + * @see ConvertHelper_ThrowableInfo::isWebRequest() |
|
| 205 | + * @see ConvertHelper_ThrowableInfo::CONTEXT_COMMAND_LINE |
|
| 206 | + * @see ConvertHelper_ThrowableInfo::CONTEXT_WEB |
|
| 207 | + */ |
|
| 208 | 208 | public function getContext() : string |
| 209 | 209 | { |
| 210 | 210 | return $this->context; |
| 211 | 211 | } |
| 212 | 212 | |
| 213 | - /** |
|
| 214 | - * Retrieves the date of the exception, and approximate time: |
|
| 215 | - * since exceptions do not store time, this is captured the |
|
| 216 | - * moment the ThrowableInfo is created. |
|
| 217 | - * |
|
| 218 | - * @return Microtime |
|
| 219 | - */ |
|
| 213 | + /** |
|
| 214 | + * Retrieves the date of the exception, and approximate time: |
|
| 215 | + * since exceptions do not store time, this is captured the |
|
| 216 | + * moment the ThrowableInfo is created. |
|
| 217 | + * |
|
| 218 | + * @return Microtime |
|
| 219 | + */ |
|
| 220 | 220 | public function getDate() : Microtime |
| 221 | 221 | { |
| 222 | 222 | return $this->date; |
@@ -237,24 +237,24 @@ discard block |
||
| 237 | 237 | return ConvertHelper_ThrowableInfo_Serializer::serialize($this); |
| 238 | 238 | } |
| 239 | 239 | |
| 240 | - /** |
|
| 241 | - * Sets the maximum folder depth to show in the |
|
| 242 | - * file paths, to avoid them being too long. |
|
| 243 | - * |
|
| 244 | - * @param int $depth |
|
| 245 | - * @return ConvertHelper_ThrowableInfo |
|
| 246 | - */ |
|
| 240 | + /** |
|
| 241 | + * Sets the maximum folder depth to show in the |
|
| 242 | + * file paths, to avoid them being too long. |
|
| 243 | + * |
|
| 244 | + * @param int $depth |
|
| 245 | + * @return ConvertHelper_ThrowableInfo |
|
| 246 | + */ |
|
| 247 | 247 | public function setFolderDepth(int $depth) : ConvertHelper_ThrowableInfo |
| 248 | 248 | { |
| 249 | 249 | return $this->setOption('folder-depth', $depth); |
| 250 | 250 | } |
| 251 | 251 | |
| 252 | - /** |
|
| 253 | - * Retrieves the current folder depth option value. |
|
| 254 | - * |
|
| 255 | - * @return int |
|
| 256 | - * @see ConvertHelper_ThrowableInfo::setFolderDepth() |
|
| 257 | - */ |
|
| 252 | + /** |
|
| 253 | + * Retrieves the current folder depth option value. |
|
| 254 | + * |
|
| 255 | + * @return int |
|
| 256 | + * @see ConvertHelper_ThrowableInfo::setFolderDepth() |
|
| 257 | + */ |
|
| 258 | 258 | public function getFolderDepth() : int |
| 259 | 259 | { |
| 260 | 260 | $depth = $this->getOption('folder-depth'); |
@@ -265,13 +265,13 @@ discard block |
||
| 265 | 265 | return 2; |
| 266 | 266 | } |
| 267 | 267 | |
| 268 | - /** |
|
| 269 | - * Retrieves all function calls that led to the error, |
|
| 270 | - * ordered from latest to earliest (the first one in |
|
| 271 | - * the stack is actually the last call). |
|
| 272 | - * |
|
| 273 | - * @return ConvertHelper_ThrowableInfo_Call[] |
|
| 274 | - */ |
|
| 268 | + /** |
|
| 269 | + * Retrieves all function calls that led to the error, |
|
| 270 | + * ordered from latest to earliest (the first one in |
|
| 271 | + * the stack is actually the last call). |
|
| 272 | + * |
|
| 273 | + * @return ConvertHelper_ThrowableInfo_Call[] |
|
| 274 | + */ |
|
| 275 | 275 | public function getCalls() |
| 276 | 276 | { |
| 277 | 277 | return $this->calls; |
@@ -287,10 +287,10 @@ discard block |
||
| 287 | 287 | return $this->calls[0]; |
| 288 | 288 | } |
| 289 | 289 | |
| 290 | - /** |
|
| 291 | - * Returns the amount of function and method calls in the stack trace. |
|
| 292 | - * @return int |
|
| 293 | - */ |
|
| 290 | + /** |
|
| 291 | + * Returns the amount of function and method calls in the stack trace. |
|
| 292 | + * @return int |
|
| 293 | + */ |
|
| 294 | 294 | public function countCalls() : int |
| 295 | 295 | { |
| 296 | 296 | return $this->callsCount; |
@@ -38,7 +38,7 @@ discard block |
||
| 38 | 38 | ->t('Message:') |
| 39 | 39 | ->add($this->info->getMessage()); |
| 40 | 40 | |
| 41 | - if($this->developerInfo) |
|
| 41 | + if ($this->developerInfo) |
|
| 42 | 42 | { |
| 43 | 43 | $message |
| 44 | 44 | ->eol() |
@@ -46,7 +46,7 @@ discard block |
||
| 46 | 46 | ->add($finalCall->toString()); |
| 47 | 47 | } |
| 48 | 48 | |
| 49 | - if($this->developerInfo && $this->info->hasDetails()) |
|
| 49 | + if ($this->developerInfo && $this->info->hasDetails()) |
|
| 50 | 50 | { |
| 51 | 51 | $message |
| 52 | 52 | ->t('Developer details:') |
@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | ->add($this->info->getDetails()); |
| 55 | 55 | } |
| 56 | 56 | |
| 57 | - if($this->info->hasPrevious()) |
|
| 57 | + if ($this->info->hasPrevious()) |
|
| 58 | 58 | { |
| 59 | 59 | $message |
| 60 | 60 | ->eol() |
@@ -19,8 +19,8 @@ discard block |
||
| 19 | 19 | public function toString() : string |
| 20 | 20 | { |
| 21 | 21 | return |
| 22 | - $this->renderMessage() . |
|
| 23 | - $this->renderCalls() . |
|
| 22 | + $this->renderMessage(). |
|
| 23 | + $this->renderCalls(). |
|
| 24 | 24 | $this->renderPrevious(); |
| 25 | 25 | } |
| 26 | 26 | |
@@ -33,12 +33,12 @@ discard block |
||
| 33 | 33 | |
| 34 | 34 | if ($this->info->hasCode()) |
| 35 | 35 | { |
| 36 | - $string .= ' #' . $this->info->getCode(); |
|
| 36 | + $string .= ' #'.$this->info->getCode(); |
|
| 37 | 37 | } |
| 38 | 38 | |
| 39 | 39 | $string .= |
| 40 | - ': ' . |
|
| 41 | - $this->info->getMessage() . |
|
| 40 | + ': '. |
|
| 41 | + $this->info->getMessage(). |
|
| 42 | 42 | PHP_EOL; |
| 43 | 43 | |
| 44 | 44 | return $string; |
@@ -55,7 +55,7 @@ discard block |
||
| 55 | 55 | |
| 56 | 56 | foreach ($calls as $call) |
| 57 | 57 | { |
| 58 | - $string .= $call->toString() . PHP_EOL; |
|
| 58 | + $string .= $call->toString().PHP_EOL; |
|
| 59 | 59 | } |
| 60 | 60 | |
| 61 | 61 | return $string; |
@@ -73,11 +73,11 @@ discard block |
||
| 73 | 73 | } |
| 74 | 74 | |
| 75 | 75 | return |
| 76 | - PHP_EOL . |
|
| 77 | - PHP_EOL . |
|
| 78 | - 'Previous error:' . |
|
| 79 | - PHP_EOL . |
|
| 80 | - PHP_EOL . |
|
| 76 | + PHP_EOL. |
|
| 77 | + PHP_EOL. |
|
| 78 | + 'Previous error:'. |
|
| 79 | + PHP_EOL. |
|
| 80 | + PHP_EOL. |
|
| 81 | 81 | $this->info->getPrevious()->toString(); |
| 82 | 82 | } |
| 83 | 83 | } |
@@ -61,7 +61,7 @@ discard block |
||
| 61 | 61 | * @param bool $lowercase |
| 62 | 62 | * @return Transliteration |
| 63 | 63 | */ |
| 64 | - public function setLowercase(bool $lowercase=true) : Transliteration |
|
| 64 | + public function setLowercase(bool $lowercase = true) : Transliteration |
|
| 65 | 65 | { |
| 66 | 66 | $this->setOption(self::OPTION_LOWER_CASE, $lowercase); |
| 67 | 67 | |
@@ -99,8 +99,8 @@ discard block |
||
| 99 | 99 | |
| 100 | 100 | $result = implode('', $keep); |
| 101 | 101 | |
| 102 | - while (strpos($result, $space . $space) !== false) { |
|
| 103 | - $result = str_replace($space . $space, $space, $result); |
|
| 102 | + while (strpos($result, $space.$space) !== false) { |
|
| 103 | + $result = str_replace($space.$space, $space, $result); |
|
| 104 | 104 | } |
| 105 | 105 | |
| 106 | 106 | $result = trim($result, $space); |