From b34f16535cf277fe9522493d126334b84324e15e Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 25 Dec 2020 12:45:34 +0100 Subject: [PATCH] Fix cast error in PHP 8.0 --- app/Http/Controllers/Budget/IndexController.php | 4 +++- app/Repositories/PiggyBank/ModifiesPiggyBanks.php | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Budget/IndexController.php b/app/Http/Controllers/Budget/IndexController.php index c55e0b61e9..b7de0793ec 100644 --- a/app/Http/Controllers/Budget/IndexController.php +++ b/app/Http/Controllers/Budget/IndexController.php @@ -95,7 +95,7 @@ class IndexController extends Controller Log::debug('Start of IndexController::index()'); // collect some basic vars: - $range = app('preferences')->get('viewRange', '1M')->data; + $range = (string) app('preferences')->get('viewRange', '1M')->data; $start = $start ?? session('start', Carbon::now()->startOfMonth()); $end = $end ?? app('navigation')->endOfPeriod($start, $range); $defaultCurrency = app('amount')->getDefaultCurrency(); @@ -276,6 +276,7 @@ class IndexController extends Controller // complement budget with budget limits in range, and expenses in currency X in range. /** @var Budget $current */ foreach ($collection as $current) { + Log::debug(sprintf('Working on budget #%d ("%s")', $current->id, $current->name)); $array = $current->toArray(); $array['spent'] = []; $array['budgeted'] = []; @@ -284,6 +285,7 @@ class IndexController extends Controller $budgetLimits = $this->blRepository->getBudgetLimits($current, $start, $end); /** @var BudgetLimit $limit */ foreach ($budgetLimits as $limit) { + Log::debug(sprintf('Working on budget limit #%d', $limit->id)); $currency = $limit->transactionCurrency ?? $defaultCurrency; $array['budgeted'][] = [ 'id' => $limit->id, diff --git a/app/Repositories/PiggyBank/ModifiesPiggyBanks.php b/app/Repositories/PiggyBank/ModifiesPiggyBanks.php index 4f9852d597..ce01799a0d 100644 --- a/app/Repositories/PiggyBank/ModifiesPiggyBanks.php +++ b/app/Repositories/PiggyBank/ModifiesPiggyBanks.php @@ -105,7 +105,7 @@ trait ModifiesPiggyBanks $leftOnAccount = $this->leftOnAccount($piggyBank, today(config('app.timezone'))); $savedSoFar = (string)$this->getRepetition($piggyBank)->currentamount; $leftToSave = bcsub($piggyBank->targetamount, $savedSoFar); - $maxAmount = (string)min(round((float) $leftOnAccount, 12), round($leftToSave, 12)); + $maxAmount = (string)min(round((float) $leftOnAccount, 12), round((float)$leftToSave, 12)); $compare = bccomp($amount, $maxAmount); $result = $compare <= 0;