Minor refactoring

This commit is contained in:
Meritoo
2019-02-21 21:27:50 +01:00
parent 8c3c85608a
commit 651c4f2259
11 changed files with 126 additions and 130 deletions

View File

@@ -140,7 +140,12 @@ class Date
$dateStart = new DateTime();
$dateEnd = new DateTime();
if (DatePeriod::LAST_YEAR === $period || DatePeriod::NEXT_YEAR === $period) {
$yearPeriod = [
DatePeriod::LAST_YEAR,
DatePeriod::NEXT_YEAR,
];
if (in_array($period, $yearPeriod, true)) {
$yearDifference = 1;
if (DatePeriod::LAST_YEAR === $period) {
@@ -167,7 +172,7 @@ class Date
return null;
}
$dateStart->setTime(0, 0, 0);
$dateStart->setTime(0, 0);
$dateEnd->setTime(23, 59, 59);
return new DatePeriod($dateStart, $dateEnd);
@@ -217,7 +222,8 @@ class Date
return $dateTime
->setTime($hour, $minute, $second)
->format($format);
->format($format)
;
}
/**