kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-17 07:08:19 +00:00
Code Issues Projects Releases Wiki Activity

Replace direct calls to Carbon class.

Browse Source
This commit is contained in:
James Cole
2023-02-11 07:36:45 +01:00
parent 79e98cf8a2
commit c979cfcd89
44 changed files with 137 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Support/Http/Controllers/DateCalculation.php
View File

@@ -45,7 +45,7 @@ trait DateCalculation
public function activeDaysLeft(Carbon $start, Carbon $end): int
{
$difference = $start->diffInDays($end) + 1;
$today = Carbon::now()->startOfDay();
$today = today(config('app.timezone'))->startOfDay();
if ($start->lte($today) && $end->gte($today)) {
$difference = $today->diffInDays($end);
@@ -67,7 +67,7 @@ trait DateCalculation
protected function activeDaysPassed(Carbon $start, Carbon $end): int
{
$difference = $start->diffInDays($end) + 1;
$today = Carbon::now()->startOfDay();
$today = today(config('app.timezone'))->startOfDay();
if ($start->lte($today) && $end->gte($today)) {
$difference = $start->diffInDays($today) + 1;

8
app/Support/Http/Controllers/GetConfigurationData.php
View File

@@ -140,22 +140,22 @@ trait GetConfigurationData
}
// last seven days:
$seven = Carbon::now()->subDays(7);
$seven = today(config('app.timezone'))->subDays(7);
$index = (string)trans('firefly.last_seven_days');
$ranges[$index] = [$seven, new Carbon()];
// last 30 days:
$thirty = Carbon::now()->subDays(30);
$thirty = today(config('app.timezone'))->subDays(30);
$index = (string)trans('firefly.last_thirty_days');
$ranges[$index] = [$thirty, new Carbon()];
// month to date:
$monthBegin = Carbon::now()->startOfMonth();
$monthBegin = today(config('app.timezone'))->startOfMonth();
$index = (string)trans('firefly.month_to_date');
$ranges[$index] = [$monthBegin, new Carbon()];
// year to date:
$yearBegin = Carbon::now()->startOfYear();
$yearBegin = today(config('app.timezone'))->startOfYear();
$index = (string)trans('firefly.year_to_date');
$ranges[$index] = [$yearBegin, new Carbon()];

8
app/Support/Http/Controllers/RequestInformation.php
View File

@@ -145,9 +145,9 @@ trait RequestInformation
final protected function notInSessionRange(Carbon $date): bool // Validate a preference
{
/** @var Carbon $start */
$start = session('start', Carbon::now()->startOfMonth());
$start = session('start', today(config('app.timezone'))->startOfMonth());
/** @var Carbon $end */
$end = session('end', Carbon::now()->endOfMonth());
$end = session('end', today(config('app.timezone'))->endOfMonth());
$result = false;
if ($start->greaterThanOrEqualTo($date) && $end->greaterThanOrEqualTo($date)) {
$result = true;
@@ -175,7 +175,7 @@ trait RequestInformation
$attributes['startDate'] = Carbon::createFromFormat('Ymd', $attributes['startDate'])->startOfDay();
} catch (InvalidArgumentException $e) {
Log::debug(sprintf('Not important error message: %s', $e->getMessage()));
$date = Carbon::now()->startOfMonth();
$date = today(config('app.timezone'))->startOfMonth();
$attributes['startDate'] = $date;
}
@@ -183,7 +183,7 @@ trait RequestInformation
$attributes['endDate'] = Carbon::createFromFormat('Ymd', $attributes['endDate'])->endOfDay();
} catch (InvalidArgumentException $e) {
Log::debug(sprintf('Not important error message: %s', $e->getMessage()));
$date = Carbon::now()->startOfMonth();
$date = today(config('app.timezone'))->startOfMonth();
$attributes['endDate'] = $date;
}