@@ -167,12 +167,12 @@ discard block |
||
| 167 | 167 | // Delete internal: --ori0--sub0--sub1--ori1-- |
| 168 | 168 | $opt[]= [$ori[0], $sub[0]]; |
| 169 | 169 | $ori = [$sub[1], $ori[1]]; |
| 170 | - //} elseif ($sub[0] <= $ori[0] && $sub[1] <= $ori[1]) { // Complete condition |
|
| 170 | + //} elseif ($sub[0] <= $ori[0] && $sub[1] <= $ori[1]) { // Complete condition |
|
| 171 | 171 | } elseif ($sub[0] <= $ori[0]) { // Equivalent condition |
| 172 | 172 | // Delete overlap: --sub0--ori0--sub1--ori1-- |
| 173 | 173 | $ori = [$sub[1], $ori[1]]; |
| 174 | - //} elseif ($ori[0] <= $sub[0] && $ori[1] <= $sub[1]) { // Complete condition |
|
| 175 | - //} elseif ($ori[1] <= $sub[1]) { // Equivalent condition |
|
| 174 | + //} elseif ($ori[0] <= $sub[0] && $ori[1] <= $sub[1]) { // Complete condition |
|
| 175 | + //} elseif ($ori[1] <= $sub[1]) { // Equivalent condition |
|
| 176 | 176 | } else { // Equivalent condition |
| 177 | 177 | // Delete overlap: --ori0--sub0--ori1--sub1-- |
| 178 | 178 | $ori = [$ori[0], $sub[0]]; |
@@ -231,13 +231,13 @@ discard block |
||
| 231 | 231 | // Delete internal: --ori0--sub0--sub1--ori1-- |
| 232 | 232 | $opt[] = [$sub[0], $sub[1]]; |
| 233 | 233 | $ori = [$sub[1], $ori[1]]; |
| 234 | - //} elseif ($sub[0] <= $ori[0] && $sub[1] <= $ori[1]) { // Complete condition |
|
| 234 | + //} elseif ($sub[0] <= $ori[0] && $sub[1] <= $ori[1]) { // Complete condition |
|
| 235 | 235 | } elseif ($sub[0] <= $ori[0]) { // Equivalent condition |
| 236 | 236 | // Delete overlap: --sub0--ori0--sub1--ori1-- |
| 237 | 237 | $opt[] = [$ori[0], $sub[1]]; |
| 238 | 238 | $ori = [$sub[1], $ori[1]]; |
| 239 | - //} elseif ($ori[0] <= $sub[0] && $ori[1] <= $sub[1]) { // Complete condition |
|
| 240 | - //} elseif ($ori[1] <= $sub[1]) { // Equivalent condition |
|
| 239 | + //} elseif ($ori[0] <= $sub[0] && $ori[1] <= $sub[1]) { // Complete condition |
|
| 240 | + //} elseif ($ori[1] <= $sub[1]) { // Equivalent condition |
|
| 241 | 241 | } else { // Equivalent condition |
| 242 | 242 | // Delete overlap: --ori0--sub0--ori1--sub1-- |
| 243 | 243 | $opt[] = [$sub[0], $ori[1]]; |
@@ -282,12 +282,12 @@ discard block |
||
| 282 | 282 | } elseif ($ori[0] < $sub[0] && $sub[1] < $ori[1]) { |
| 283 | 283 | // Delete internal: --ori0--sub0--sub1--ori1-- |
| 284 | 284 | return true; |
| 285 | - //} elseif ($sub[0] <= $ori[0] && $sub[1] <= $ori[1]) { // Complete condition |
|
| 285 | + //} elseif ($sub[0] <= $ori[0] && $sub[1] <= $ori[1]) { // Complete condition |
|
| 286 | 286 | } elseif ($sub[0] <= $ori[0]) { // Equivalent condition |
| 287 | 287 | // Delete overlap: --sub0--ori0--sub1--ori1-- |
| 288 | 288 | return true; |
| 289 | - //} elseif ($ori[0] <= $sub[0] && $ori[1] <= $sub[1]) { // Complete condition |
|
| 290 | - //} elseif ($ori[1] <= $sub[1]) { // Equivalent condition |
|
| 289 | + //} elseif ($ori[0] <= $sub[0] && $ori[1] <= $sub[1]) { // Complete condition |
|
| 290 | + //} elseif ($ori[1] <= $sub[1]) { // Equivalent condition |
|
| 291 | 291 | } else { // Equivalent condition |
| 292 | 292 | // Delete overlap: --ori0--sub0--ori1--sub1-- |
| 293 | 293 | return true; |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | public static function sort(Array $timePeriods) |
| 71 | 71 | { |
| 72 | 72 | // Closure in PHP 7.0.X loop maybe die |
| 73 | - usort($timePeriods, function ($a, $b) { |
|
| 73 | + usort($timePeriods, function($a, $b) { |
|
| 74 | 74 | if ($a[0] == $b[0]) { |
| 75 | 75 | // Start time is equal, compare end time |
| 76 | 76 | $r = $a[1] < $b[1] ? -1 : 1; |
@@ -143,7 +143,7 @@ discard block |
||
| 143 | 143 | } |
| 144 | 144 | |
| 145 | 145 | // Data sorting out |
| 146 | - $sortOut = $sortOut === 'default' ? self::getSortOut() : ! ! $sortOut; |
|
| 146 | + $sortOut = $sortOut === 'default' ? self::getSortOut() : !!$sortOut; |
|
| 147 | 147 | if ($sortOut) { |
| 148 | 148 | $timePeriods1 = self::union($timePeriods1); |
| 149 | 149 | $timePeriods2 = self::union($timePeriods2); |
@@ -165,7 +165,7 @@ discard block |
||
| 165 | 165 | break; |
| 166 | 166 | } elseif ($ori[0] < $sub[0] && $sub[1] < $ori[1]) { |
| 167 | 167 | // Delete internal: --ori0--sub0--sub1--ori1-- |
| 168 | - $opt[]= [$ori[0], $sub[0]]; |
|
| 168 | + $opt[] = [$ori[0], $sub[0]]; |
|
| 169 | 169 | $ori = [$sub[1], $ori[1]]; |
| 170 | 170 | //} elseif ($sub[0] <= $ori[0] && $sub[1] <= $ori[1]) { // Complete condition |
| 171 | 171 | } elseif ($sub[0] <= $ori[0]) { // Equivalent condition |
@@ -180,7 +180,7 @@ discard block |
||
| 180 | 180 | } |
| 181 | 181 | |
| 182 | 182 | // All No overlap |
| 183 | - if (! empty($ori)) { |
|
| 183 | + if (!empty($ori)) { |
|
| 184 | 184 | $opt[] = $ori; |
| 185 | 185 | } |
| 186 | 186 | } |
@@ -207,7 +207,7 @@ discard block |
||
| 207 | 207 | } |
| 208 | 208 | |
| 209 | 209 | // Data sorting out |
| 210 | - $sortOut = $sortOut === 'default' ? self::getSortOut() : ! ! $sortOut; |
|
| 210 | + $sortOut = $sortOut === 'default' ? self::getSortOut() : !!$sortOut; |
|
| 211 | 211 | if ($sortOut) { |
| 212 | 212 | $timePeriods1 = self::union($timePeriods1); |
| 213 | 213 | $timePeriods2 = self::union($timePeriods2); |
@@ -320,7 +320,7 @@ discard block |
||
| 320 | 320 | } |
| 321 | 321 | |
| 322 | 322 | // Data sorting out |
| 323 | - $sortOut = $sortOut === 'default' ? self::getSortOut() : ! ! $sortOut; |
|
| 323 | + $sortOut = $sortOut === 'default' ? self::getSortOut() : !!$sortOut; |
|
| 324 | 324 | if ($sortOut) { |
| 325 | 325 | $timePeriods = self::union($timePeriods); |
| 326 | 326 | $sDateTime = min($sDateTime, $eDateTime); |
@@ -364,7 +364,7 @@ discard block |
||
| 364 | 364 | } |
| 365 | 365 | |
| 366 | 366 | // Data sorting out |
| 367 | - $sortOut = $sortOut === 'default' ? self::getSortOut() : ! ! $sortOut; |
|
| 367 | + $sortOut = $sortOut === 'default' ? self::getSortOut() : !!$sortOut; |
|
| 368 | 368 | if ($sortOut) { |
| 369 | 369 | $timePeriods = self::union($timePeriods); |
| 370 | 370 | } |
@@ -405,7 +405,7 @@ discard block |
||
| 405 | 405 | } |
| 406 | 406 | |
| 407 | 407 | // Data sorting out |
| 408 | - $sortOut = $sortOut === 'default' ? self::getSortOut() : ! ! $sortOut; |
|
| 408 | + $sortOut = $sortOut === 'default' ? self::getSortOut() : !!$sortOut; |
|
| 409 | 409 | if ($sortOut) { |
| 410 | 410 | $timePeriods = self::union($timePeriods); |
| 411 | 411 | } |
@@ -449,7 +449,7 @@ discard block |
||
| 449 | 449 | $start = min($start, $tp[0]); |
| 450 | 450 | $end = max($end, $tp[1]); |
| 451 | 451 | } |
| 452 | - $opt = [[$start,$end]]; |
|
| 452 | + $opt = [[$start, $end]]; |
|
| 453 | 453 | } |
| 454 | 454 | |
| 455 | 455 | return $opt; |
@@ -472,15 +472,15 @@ discard block |
||
| 472 | 472 | } |
| 473 | 473 | |
| 474 | 474 | // Data sorting out |
| 475 | - $sortOut = $sortOut === 'default' ? self::getSortOut() : ! ! $sortOut; |
|
| 475 | + $sortOut = $sortOut === 'default' ? self::getSortOut() : !!$sortOut; |
|
| 476 | 476 | if ($sortOut) { |
| 477 | 477 | $timePeriods = self::union($timePeriods); |
| 478 | 478 | } |
| 479 | 479 | |
| 480 | 480 | $opt = []; |
| 481 | 481 | foreach ($timePeriods as $k => $tp) { |
| 482 | - if (isset($timePeriods[$k+1])) { |
|
| 483 | - $opt[] = [$tp[1], $timePeriods[$k+1][0]]; |
|
| 482 | + if (isset($timePeriods[$k + 1])) { |
|
| 483 | + $opt[] = [$tp[1], $timePeriods[$k + 1][0]]; |
|
| 484 | 484 | } |
| 485 | 485 | } |
| 486 | 486 | |
@@ -508,7 +508,7 @@ discard block |
||
| 508 | 508 | } |
| 509 | 509 | |
| 510 | 510 | // Data sorting out |
| 511 | - $sortOut = $sortOut === 'default' ? self::getSortOut() : ! ! $sortOut; |
|
| 511 | + $sortOut = $sortOut === 'default' ? self::getSortOut() : !!$sortOut; |
|
| 512 | 512 | if ($sortOut) { |
| 513 | 513 | $timePeriods = self::union($timePeriods); |
| 514 | 514 | } |
@@ -523,7 +523,7 @@ discard block |
||
| 523 | 523 | switch (self::getUnit('time')) { |
| 524 | 524 | case 'minute': |
| 525 | 525 | if ($precision > 0) { |
| 526 | - $pow = pow(10, (int)$precision); |
|
| 526 | + $pow = pow(10, (int) $precision); |
|
| 527 | 527 | $time = ((int) ($time / 60 * $pow)) / $pow; |
| 528 | 528 | } else { |
| 529 | 529 | $time = (int) ($time / 60); |
@@ -531,7 +531,7 @@ discard block |
||
| 531 | 531 | break; |
| 532 | 532 | case 'hour': |
| 533 | 533 | if ($precision > 0) { |
| 534 | - $pow = pow(10, (int)$precision); |
|
| 534 | + $pow = pow(10, (int) $precision); |
|
| 535 | 535 | $time = ((int) ($time / 3600 * $pow)) / $pow; |
| 536 | 536 | } else { |
| 537 | 537 | $time = (int) ($time / 3600); |
@@ -564,7 +564,7 @@ discard block |
||
| 564 | 564 | } |
| 565 | 565 | |
| 566 | 566 | // Data sorting out |
| 567 | - $sortOut = $sortOut === 'default' ? self::getSortOut() : ! ! $sortOut; |
|
| 567 | + $sortOut = $sortOut === 'default' ? self::getSortOut() : !!$sortOut; |
|
| 568 | 568 | if ($sortOut) { |
| 569 | 569 | $timePeriods = self::union($timePeriods); |
| 570 | 570 | } |
@@ -635,7 +635,7 @@ discard block |
||
| 635 | 635 | } |
| 636 | 636 | |
| 637 | 637 | // Data sorting out |
| 638 | - $sortOut = $sortOut === 'default' ? self::getSortOut() : ! ! $sortOut; |
|
| 638 | + $sortOut = $sortOut === 'default' ? self::getSortOut() : !!$sortOut; |
|
| 639 | 639 | if ($sortOut) { |
| 640 | 640 | $timePeriods = self::union($timePeriods); |
| 641 | 641 | } |
@@ -647,7 +647,7 @@ discard block |
||
| 647 | 647 | // last time period index |
| 648 | 648 | $eIdx = sizeof($timePeriods) - 1; |
| 649 | 649 | |
| 650 | - if (! $interval) { |
|
| 650 | + if (!$interval) { |
|
| 651 | 651 | // No gap, Directly extend the end time |
| 652 | 652 | $timePeriods[$eIdx][1] = self::extendTime($timePeriods[$eIdx][1], $time); |
| 653 | 653 | } else { |
@@ -685,7 +685,7 @@ discard block |
||
| 685 | 685 | } |
| 686 | 686 | |
| 687 | 687 | // Data sorting out |
| 688 | - $sortOut = $sortOut === 'default' ? self::getSortOut() : ! ! $sortOut; |
|
| 688 | + $sortOut = $sortOut === 'default' ? self::getSortOut() : !!$sortOut; |
|
| 689 | 689 | if ($sortOut) { |
| 690 | 690 | $timePeriods = self::union($timePeriods); |
| 691 | 691 | } |
@@ -696,7 +696,7 @@ discard block |
||
| 696 | 696 | // last time period index |
| 697 | 697 | $eIdx = sizeof($timePeriods) - 1; |
| 698 | 698 | |
| 699 | - for ($i = $eIdx; $i>=0; $i--) { |
|
| 699 | + for ($i = $eIdx; $i >= 0; $i--) { |
|
| 700 | 700 | $tps = $timePeriods[$i][0]; |
| 701 | 701 | $tpe = $timePeriods[$i][1]; |
| 702 | 702 | $tTime = strtotime($tpe) - strtotime($tps); |
@@ -707,13 +707,13 @@ discard block |
||
| 707 | 707 | $time -= $tTime; |
| 708 | 708 | } else { |
| 709 | 709 | // Enough, shorten end time. |
| 710 | - $timePeriods[$i][1] = self::extendTime($timePeriods[$i][0], $tTime-$time); |
|
| 710 | + $timePeriods[$i][1] = self::extendTime($timePeriods[$i][0], $tTime - $time); |
|
| 711 | 711 | $time = 0; |
| 712 | 712 | break; |
| 713 | 713 | } |
| 714 | 714 | |
| 715 | 715 | // End or No cross-period |
| 716 | - if ($time <= 0 || ! $crossperiod) { |
|
| 716 | + if ($time <= 0 || !$crossperiod) { |
|
| 717 | 717 | break; |
| 718 | 718 | } |
| 719 | 719 | } |
@@ -767,7 +767,7 @@ discard block |
||
| 767 | 767 | public static function filter($timePeriods, $exception = false) |
| 768 | 768 | { |
| 769 | 769 | // If not array, return. |
| 770 | - if (! is_array($timePeriods)) { |
|
| 770 | + if (!is_array($timePeriods)) { |
|
| 771 | 771 | if ($exception) |
| 772 | 772 | throw new \Exception('Time periods format error !', 400); |
| 773 | 773 | return []; |
@@ -775,7 +775,7 @@ discard block |
||
| 775 | 775 | |
| 776 | 776 | foreach ($timePeriods as $k => $tp) { |
| 777 | 777 | // filter format, number |
| 778 | - if (! is_array($tp) || sizeof($tp) != 2) { |
|
| 778 | + if (!is_array($tp) || sizeof($tp) != 2) { |
|
| 779 | 779 | if ($exception) |
| 780 | 780 | throw new \Exception('Time periods format error !', 400); |
| 781 | 781 | unset($timePeriods[$k]); |
@@ -789,7 +789,7 @@ discard block |
||
| 789 | 789 | continue; |
| 790 | 790 | } |
| 791 | 791 | // filter time format |
| 792 | - if (self::getFilterDatetime() && (! self::isDatetime($tp[0]) || ! self::isDatetime($tp[1]))) { |
|
| 792 | + if (self::getFilterDatetime() && (!self::isDatetime($tp[0]) || !self::isDatetime($tp[1]))) { |
|
| 793 | 793 | if ($exception) |
| 794 | 794 | throw new \Exception('Time periods format error !', 400); |
| 795 | 795 | unset($timePeriods[$k]); |
@@ -833,14 +833,14 @@ discard block |
||
| 833 | 833 | public static function setUnit(string $unit, string $target = 'all') |
| 834 | 834 | { |
| 835 | 835 | /*** Arguments prepare ***/ |
| 836 | - if (! isset(self::$_options['unitMap'][$unit])) { |
|
| 837 | - throw new \Exception('Error Unit: ' . $unit, 400); |
|
| 836 | + if (!isset(self::$_options['unitMap'][$unit])) { |
|
| 837 | + throw new \Exception('Error Unit: '.$unit, 400); |
|
| 838 | 838 | } |
| 839 | 839 | // conv unit |
| 840 | 840 | $unit = self::$_options['unitMap'][$unit]; |
| 841 | 841 | |
| 842 | - if ($target != 'all' && ! isset(self::$_options['unit'][$target])) { |
|
| 843 | - throw new \Exception('Error Target: ' . $target, 400); |
|
| 842 | + if ($target != 'all' && !isset(self::$_options['unit'][$target])) { |
|
| 843 | + throw new \Exception('Error Target: '.$target, 400); |
|
| 844 | 844 | } |
| 845 | 845 | |
| 846 | 846 | /* Setting */ |
@@ -867,7 +867,7 @@ discard block |
||
| 867 | 867 | if (isset(self::$_options['unit'][$target])) { |
| 868 | 868 | return self::$_options['unit'][$target]; |
| 869 | 869 | } else { |
| 870 | - throw new \Exception('Error Target: ' . $target, 400); |
|
| 870 | + throw new \Exception('Error Target: '.$target, 400); |
|
| 871 | 871 | } |
| 872 | 872 | } |
| 873 | 873 | |
@@ -941,7 +941,7 @@ discard block |
||
| 941 | 941 | */ |
| 942 | 942 | public static function isDatetime(string $datetime) |
| 943 | 943 | { |
| 944 | - return (bool)preg_match('|^[0-9]{4}\-[0-9]{2}\-[0-9]{2}\ [0-9]{2}\:[0-9]{2}\:[0-9]{2}$|', $datetime); |
|
| 944 | + return (bool) preg_match('|^[0-9]{4}\-[0-9]{2}\-[0-9]{2}\ [0-9]{2}\:[0-9]{2}\:[0-9]{2}$|', $datetime); |
|
| 945 | 945 | } |
| 946 | 946 | |
| 947 | 947 | /** |
@@ -956,7 +956,7 @@ discard block |
||
| 956 | 956 | */ |
| 957 | 957 | public static function timeFormatConv(string $datetime, $unit = 'default') |
| 958 | 958 | { |
| 959 | - $unit = ! isset(self::$_options['unitMap'][$unit]) ? self::$_options['unit']['format'] : self::$_options['unitMap'][$unit]; |
|
| 959 | + $unit = !isset(self::$_options['unitMap'][$unit]) ? self::$_options['unit']['format'] : self::$_options['unitMap'][$unit]; |
|
| 960 | 960 | |
| 961 | 961 | // fill format |
| 962 | 962 | $strlen = strlen($datetime); |
@@ -1014,7 +1014,7 @@ discard block |
||
| 1014 | 1014 | public static function time2Second($time, $unit = 'default') |
| 1015 | 1015 | { |
| 1016 | 1016 | // Git time unit |
| 1017 | - $unit = ! isset(self::$_options['unitMap'][$unit]) ? self::getUnit('time') : self::$_options['unitMap'][$unit]; |
|
| 1017 | + $unit = !isset(self::$_options['unitMap'][$unit]) ? self::getUnit('time') : self::$_options['unitMap'][$unit]; |
|
| 1018 | 1018 | |
| 1019 | 1019 | // Convert |
| 1020 | 1020 | switch ($unit) { |
@@ -768,30 +768,34 @@ |
||
| 768 | 768 | { |
| 769 | 769 | // If not array, return. |
| 770 | 770 | if (! is_array($timePeriods)) { |
| 771 | - if ($exception) |
|
| 772 | - throw new \Exception('Time periods format error !', 400); |
|
| 771 | + if ($exception) { |
|
| 772 | + throw new \Exception('Time periods format error !', 400); |
|
| 773 | + } |
|
| 773 | 774 | return []; |
| 774 | 775 | } |
| 775 | 776 | |
| 776 | 777 | foreach ($timePeriods as $k => $tp) { |
| 777 | 778 | // filter format, number |
| 778 | 779 | if (! is_array($tp) || sizeof($tp) != 2) { |
| 779 | - if ($exception) |
|
| 780 | - throw new \Exception('Time periods format error !', 400); |
|
| 780 | + if ($exception) { |
|
| 781 | + throw new \Exception('Time periods format error !', 400); |
|
| 782 | + } |
|
| 781 | 783 | unset($timePeriods[$k]); |
| 782 | 784 | continue; |
| 783 | 785 | } |
| 784 | 786 | // filter time period |
| 785 | 787 | if ($tp[0] >= $tp[1]) { |
| 786 | - if ($exception) |
|
| 787 | - throw new \Exception('Time periods format error !', 400); |
|
| 788 | + if ($exception) { |
|
| 789 | + throw new \Exception('Time periods format error !', 400); |
|
| 790 | + } |
|
| 788 | 791 | unset($timePeriods[$k]); |
| 789 | 792 | continue; |
| 790 | 793 | } |
| 791 | 794 | // filter time format |
| 792 | 795 | if (self::getFilterDatetime() && (! self::isDatetime($tp[0]) || ! self::isDatetime($tp[1]))) { |
| 793 | - if ($exception) |
|
| 794 | - throw new \Exception('Time periods format error !', 400); |
|
| 796 | + if ($exception) { |
|
| 797 | + throw new \Exception('Time periods format error !', 400); |
|
| 798 | + } |
|
| 795 | 799 | unset($timePeriods[$k]); |
| 796 | 800 | continue; |
| 797 | 801 | } |