Skip to content

Firefly III: a personal finances manager

Fix various issues and code quality things.

James Cole7c76fc772140
diff --git a/app/Http/Controllers/Chart/CategoryReportController.php b/app/Http/Controllers/Chart/CategoryReportController.php
index 6b79116ae3..08c3cfa97f 100644
--- a/app/Http/Controllers/Chart/CategoryReportController.php
+++ b/app/Http/Controllers/Chart/CategoryReportController.php
@@ -45,11 +45,9 @@ class CategoryReportController extends Controller
use AugumentData;
use TransactionCalculation;
- /** @var GeneratorInterface Chart generation methods. */
- private $generator;
+ private GeneratorInterface $generator;
- /** @var OperationsRepositoryInterface */
- private $opsRepository;
+ private OperationsRepositoryInterface $opsRepository;
/**
* CategoryReportController constructor.
diff --git a/app/Support/Navigation.php b/app/Support/Navigation.php
index 291418b388..4b66cc5e21 100644
--- a/app/Support/Navigation.php
+++ b/app/Support/Navigation.php
@@ -448,7 +448,7 @@ class Navigation
$locale = Steam::getLocale();
// define period to increment
$increment = 'addDay';
- $format = $this->preferredCarbonFormat($start, $end);
+ $format = $this->preferredCarbonLocalizedFormat($start, $end);
$displayFormat = (string) trans('config.month_and_day_js', [], $locale);
$diff = $start->diffInMonths($end, true);
// increment by month (for year)
diff --git a/app/TransactionRules/Actions/UpdatePiggyBank.php b/app/TransactionRules/Actions/UpdatePiggyBank.php
index 0ca2afcb72..6b2c7789f1 100644
--- a/app/TransactionRules/Actions/UpdatePiggyBank.php
+++ b/app/TransactionRules/Actions/UpdatePiggyBank.php
@@ -246,7 +246,7 @@ class UpdatePiggyBank implements ActionInterface
Log::warning(sprintf('Cannot remove %s from piggy bank.', $amount));
$currency = $accountRepository->getAccountCurrency($account) ?? Amount::getPrimaryCurrency();
event(new RuleActionFailedOnArray($this->action, $array, trans('rules.cannot_remove_from_piggy', [
- 'amount' => Amount::formatAnything($amount, $currency, false),
+ 'amount' => Amount::formatAnything($currency, $amount, false),
'name' => $piggyBank->name,
])));