@@ -240,12 +240,12 @@ |
||
240 | 240 | $eTime = max($sDateTime, $eDateTime); |
241 | 241 | |
242 | 242 | // Strip: No overlap && Passed: --$sTime--$eTime--$tp0--$tp1-- |
243 | - $timePeriods = array_filter($timePeriods, function ($tp) use ($sTime, $eTime) { |
|
243 | + $timePeriods = array_filter($timePeriods, function($tp) use ($sTime, $eTime) { |
|
244 | 244 | return $eTime <= $tp[0] && $sTime < $tp[0] ? false : true; |
245 | 245 | }); |
246 | 246 | |
247 | 247 | // Strip: No overlap: --$tp0--$tp1--$sTime--$eTime-- |
248 | - $timePeriods = array_filter($timePeriods, function ($tp) use ($sTime, $eTime) { |
|
248 | + $timePeriods = array_filter($timePeriods, function($tp) use ($sTime, $eTime) { |
|
249 | 249 | return $tp[1] <= $sTime ? false : true; |
250 | 250 | }); |
251 | 251 |
@@ -32,7 +32,7 @@ discard block |
||
32 | 32 | public static function sort(array $timePeriods) |
33 | 33 | { |
34 | 34 | // Closure in PHP 7.0.X loop maybe die |
35 | - usort($timePeriods, function ($a, $b) { |
|
35 | + usort($timePeriods, function($a, $b) { |
|
36 | 36 | if ($a[0] == $b[0]) { |
37 | 37 | // Start time is equal, compare end time |
38 | 38 | $r = $a[1] < $b[1] ? -1 : 1; |
@@ -333,7 +333,7 @@ discard block |
||
333 | 333 | // If not array, throw exception. |
334 | 334 | !is_array($timePeriods) && self::throwException('Time periods format error !', 400); |
335 | 335 | |
336 | - array_walk($timePeriods, function ($tp) { |
|
336 | + array_walk($timePeriods, function($tp) { |
|
337 | 337 | // filter format |
338 | 338 | !is_array($tp) && self::throwException('Time periods format error !', 400); |
339 | 339 | |
@@ -368,22 +368,22 @@ discard block |
||
368 | 368 | } |
369 | 369 | |
370 | 370 | // filter format, number |
371 | - $timePeriods = array_filter($timePeriods, function ($tp) { |
|
371 | + $timePeriods = array_filter($timePeriods, function($tp) { |
|
372 | 372 | return !is_array($tp) || sizeof($tp) != 2 ? false : true; |
373 | 373 | }); |
374 | 374 | |
375 | 375 | // filter time period |
376 | - $timePeriods = array_filter($timePeriods, function ($tp) { |
|
376 | + $timePeriods = array_filter($timePeriods, function($tp) { |
|
377 | 377 | return $tp[0] >= $tp[1] ? false : true; |
378 | 378 | }); |
379 | 379 | |
380 | 380 | // filter time format |
381 | - $timePeriods = array_filter($timePeriods, function ($tp) { |
|
381 | + $timePeriods = array_filter($timePeriods, function($tp) { |
|
382 | 382 | return self::getFilterDatetime() && (!self::isDatetime($tp[0]) || !self::isDatetime($tp[1])) ? false : true; |
383 | 383 | }); |
384 | 384 | |
385 | 385 | // Time carry: ex: 2019-06-01 24:10:22 => 2019-06-02 00:10:22 |
386 | - $timePeriods = array_map(function ($tp) { |
|
386 | + $timePeriods = array_map(function($tp) { |
|
387 | 387 | $tp[0] = substr($tp[0], 11, 2) == '24' ? self::extendTime($tp[0], 0) : $tp[0]; |
388 | 388 | $tp[1] = substr($tp[1], 11, 2) == '24' ? self::extendTime($tp[1], 0) : $tp[1]; |
389 | 389 | return $tp; |