From 7aa5eee3aa0742c9eacb5403f63f9e5f989fa216 Mon Sep 17 00:00:00 2001 From: James Cole Date: Tue, 1 Jan 2019 15:29:24 +0100 Subject: [PATCH] Better fix for date. --- app/Helpers/FiscalHelper.php | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/app/Helpers/FiscalHelper.php b/app/Helpers/FiscalHelper.php index cb33d6b46e..19bf74e9d9 100644 --- a/app/Helpers/FiscalHelper.php +++ b/app/Helpers/FiscalHelper.php @@ -74,18 +74,12 @@ class FiscalHelper implements FiscalHelperInterface */ public function startOfFiscalYear(Carbon $date): Carbon { - // because PHP is stupid: - if ($date->day >= 28) { - $date->day = 28; - Log::info(sprintf('Corrected date to %s', $date->format('Y-m-d'))); - } - // get start mm-dd. Then create a start date in the year passed. $startDate = clone $date; if (true === $this->useCustomFiscalYear) { $prefStartStr = app('preferences')->get('fiscalYearStart', '01-01')->data; [$mth, $day] = explode('-', $prefStartStr); - $startDate->month((int)$mth)->day((int)$day); + $startDate->day((int)$day)->month((int)$mth); // if start date is after passed date, sub 1 year. if ($startDate > $date) {