kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-16 01:06:46 +00:00
Code Issues Projects Releases Wiki Activity

More PHP8.4 updates

Browse Source
This commit is contained in:
James Cole
2025-05-04 13:47:00 +02:00
parent e42107c03c
commit 51e86448c7
195 changed files with 524 additions and 715 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/Http/Controllers/Chart/BudgetController.php
View File

@@ -110,7 +110,7 @@ class BudgetController extends Controller
/** @var Carbon $loopEnd */
$loopEnd = app('navigation')->endOfPeriod($loopStart, $step);
$spent = $this->opsRepository->sumExpenses($loopStart, $loopEnd, null, $collection); // this method already converts to native.
$label = trim(app('navigation')->periodShow($loopStart, $step));
$label = trim((string) app('navigation')->periodShow($loopStart, $step));
foreach ($spent as $row) {
$currencyId = $row['currency_id'];
@@ -133,7 +133,7 @@ class BudgetController extends Controller
'entries' => $defaultEntries,
];
foreach ($currency['spent'] as $label => $spent) {
$chartData[$currencyId]['entries'][$label] = bcmul($spent, '-1');
$chartData[$currencyId]['entries'][$label] = bcmul((string) $spent, '-1');
}
}
$data = $this->generator->multiSet(array_values($chartData));
@@ -180,7 +180,7 @@ class BudgetController extends Controller
$current = clone $start;
$expenses = $this->opsRepository->sumExpenses($current, $current, null, $budgetCollection, $budgetLimit->transactionCurrency, $this->convertToNative);
$spent = $expenses[$currency->id]['sum'] ?? '0';
$amount = bcadd($amount, $spent);
$amount = bcadd((string) $amount, $spent);
$format = $start->isoFormat((string) trans('config.month_and_day_js', [], $locale));
$entries[$format] = $amount;
@@ -257,7 +257,7 @@ class BudgetController extends Controller
'currency_code' => $code,
'currency_name' => $name,
];
$result[$key]['amount'] = bcadd($amount, $result[$key]['amount']);
$result[$key]['amount'] = bcadd((string) $amount, $result[$key]['amount']);
}
$names = $this->getAccountNames(array_keys($result));
@@ -341,7 +341,7 @@ class BudgetController extends Controller
'currency_code' => $code,
'currency_name' => $name,
];
$result[$key]['amount'] = bcadd($amount, $result[$key]['amount']);
$result[$key]['amount'] = bcadd((string) $amount, $result[$key]['amount']);
}
$names = $this->getCategoryNames(array_keys($result));
@@ -424,7 +424,7 @@ class BudgetController extends Controller
'currency_code' => $code,
'currency_name' => $name,
];
$result[$key]['amount'] = bcadd($amount, $result[$key]['amount']);
$result[$key]['amount'] = bcadd((string) $amount, $result[$key]['amount']);
}
$names = $this->getAccountNames(array_keys($result));