kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Fix round() call for PHP 8.0

Browse Source
This commit is contained in:
James Cole
2020-12-17 17:11:56 +01:00
parent 4a8183e5cc
commit 21619544f5
4 changed files with 25 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
app/Support/Chart/Category/FrontpageChartGenerator.php
View File

@@ -40,20 +40,14 @@ use Illuminate\Support\Collection;
class FrontpageChartGenerator
{
use AugumentData;
/** @var AccountRepositoryInterface */
private $accountRepos;
/** @var array */
private $currencies;
/** @var Carbon */
private $end;
/** @var NoCategoryRepositoryInterface */
private $noCatRepos;
/** @var OperationsRepositoryInterface */
private $opsRepos;
/** @var CategoryRepositoryInterface */
private $repository;
/** @var Carbon */
private $start;
private AccountRepositoryInterface $accountRepos;
private array $currencies;
private Carbon $end;
private NoCategoryRepositoryInterface $noCatRepos;
private OperationsRepositoryInterface $opsRepos;
private CategoryRepositoryInterface $repository;
private Carbon $start;
/**
* FrontpageChartGenerator constructor.
@@ -110,7 +104,7 @@ class FrontpageChartGenerator
*/
private function addCurrency(array $currency): void
{
$currencyId = (int) $currency['currency_id'];
$currencyId = (int)$currency['currency_id'];
$this->currencies[$currencyId] = $this->currencies[$currencyId] ?? [
'currency_id' => $currencyId,
@@ -136,8 +130,8 @@ class FrontpageChartGenerator
$tempData[] = [
'name' => $category->name,
'sum' => $currency['sum'],
'sum_float' => round($currency['sum'], $currency['currency_decimal_places']),
'currency_id' => (int) $currency['currency_id'],
'sum_float' => round((float) $currency['sum'], $currency['currency_decimal_places']),
'currency_id' => (int)$currency['currency_id'],
];
}
@@ -158,8 +152,8 @@ class FrontpageChartGenerator
$tempData[] = [
'name' => trans('firefly.no_category'),
'sum' => $currency['sum'],
'sum_float' => round($currency['sum'], $currency['currency_decimal_places'] ?? 2),
'currency_id' => (int) $currency['currency_id'],
'sum_float' => round((float) $currency['sum'], $currency['currency_decimal_places'] ?? 2),
'currency_id' => (int)$currency['currency_id'],
];
}
@@ -181,7 +175,7 @@ class FrontpageChartGenerator
foreach ($this->currencies as $currencyId => $currency) {
$key = sprintf('spent-%d', $currencyId);
$return[$key] = [
'label' => sprintf('%s (%s)', (string) trans('firefly.spent'), $currency['currency_name']),
'label' => sprintf('%s (%s)', (string)trans('firefly.spent'), $currency['currency_name']),
'type' => 'bar',
'currency_symbol' => $currency['currency_symbol'],
'entries' => $names,