Merge pull request #11202 from firefly-iii/release-1762676397

🤖 Automatically merge the PR into the develop branch.
🤖 Auto commit for release 'develop' on 2025-11-09
2025-11-09 11:18:10 +00:00 · 2025-11-09 09:20:04 +01:00 · 2025-11-09 09:19:57 +01:00 · 2025-11-09 09:15:29 +01:00 · 2025-11-09 09:12:04 +01:00 · 2025-11-09 09:11:55 +01:00
500 changed files with 2052 additions and 2564 deletions
--- a/app/Api/V1/Controllers/Autocomplete/AccountController.php
+++ b/app/Api/V1/Controllers/Autocomplete/AccountController.php
@@ -24,6 +24,7 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Controllers\Autocomplete;

+use Illuminate\Http\Request;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteApiRequest;
 use FireflyIII\Enums\AccountTypeEnum;
@@ -60,7 +61,7 @@ class AccountController extends Controller
    {
        parent::__construct();
        $this->middleware(
-            function ($request, $next) {
+            function (Request $request, $next) {
                $this->validateUserGroup($request);
                $this->repository = app(AccountRepositoryInterface::class);
                $this->repository->setUser($this->user);
@@ -138,7 +139,7 @@ class AccountController extends Controller
        // custom order.
        usort(
            $return,
-            static function (array $left, array $right) {
+            static function (array $left, array $right): int {
                $order = [AccountTypeEnum::ASSET->value, AccountTypeEnum::REVENUE->value, AccountTypeEnum::EXPENSE->value];
                $posA  = (int)array_search($left['type'], $order, true);
                $posB  = (int)array_search($right['type'], $order, true);
--- a/app/Api/V1/Controllers/Autocomplete/BillController.php
+++ b/app/Api/V1/Controllers/Autocomplete/BillController.php
@@ -24,6 +24,7 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Controllers\Autocomplete;

+use Illuminate\Http\Request;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteApiRequest;
 use FireflyIII\Enums\UserRoleEnum;
@@ -46,7 +47,7 @@ class BillController extends Controller
    {
        parent::__construct();
        $this->middleware(
-            function ($request, $next) {
+            function (Request $request, $next) {
                $this->validateUserGroup($request);
                $this->repository = app(BillRepositoryInterface::class);
                $this->repository->setUser($this->user);
@@ -65,7 +66,7 @@ class BillController extends Controller
    {
        $result   = $this->repository->searchBill($request->attributes->get('query'), $request->attributes->get('limit'));
        $filtered = $result->map(
-            static fn (Bill $item) => [
+            static fn (Bill $item): array => [
                'id'     => (string) $item->id,
                'name'   => $item->name,
                'active' => $item->active,
--- a/app/Api/V1/Controllers/Autocomplete/BudgetController.php
+++ b/app/Api/V1/Controllers/Autocomplete/BudgetController.php
@@ -24,6 +24,7 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Controllers\Autocomplete;

+use Illuminate\Http\Request;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteApiRequest;
 use FireflyIII\Enums\UserRoleEnum;
@@ -46,7 +47,7 @@ class BudgetController extends Controller
    {
        parent::__construct();
        $this->middleware(
-            function ($request, $next) {
+            function (Request $request, $next) {
                $this->validateUserGroup($request);
                $this->repository = app(BudgetRepositoryInterface::class);
                $this->repository->setUser($this->user);
@@ -65,7 +66,7 @@ class BudgetController extends Controller
    {
        $result   = $this->repository->searchBudget($request->attributes->get('query'), $request->attributes->get('limit'));
        $filtered = $result->map(
-            static fn (Budget $item) => [
+            static fn (Budget $item): array => [
                'id'     => (string) $item->id,
                'name'   => $item->name,
                'active' => $item->active,
--- a/app/Api/V1/Controllers/Autocomplete/CategoryController.php
+++ b/app/Api/V1/Controllers/Autocomplete/CategoryController.php
@@ -24,6 +24,7 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Controllers\Autocomplete;

+use Illuminate\Http\Request;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteApiRequest;
 use FireflyIII\Enums\UserRoleEnum;
@@ -46,7 +47,7 @@ class CategoryController extends Controller
    {
        parent::__construct();
        $this->middleware(
-            function ($request, $next) {
+            function (Request $request, $next) {
                $this->validateUserGroup($request);
                $this->repository = app(CategoryRepositoryInterface::class);
                $this->repository->setUser($this->user);
@@ -65,7 +66,7 @@ class CategoryController extends Controller
    {
        $result   = $this->repository->searchCategory($request->attributes->get('query'), $request->attributes->get('limit'));
        $filtered = $result->map(
-            static fn (Category $item) => [
+            static fn (Category $item): array => [
                'id'   => (string) $item->id,
                'name' => $item->name,
            ]
--- a/app/Api/V1/Controllers/Autocomplete/CurrencyController.php
+++ b/app/Api/V1/Controllers/Autocomplete/CurrencyController.php
@@ -24,6 +24,7 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Controllers\Autocomplete;

+use Illuminate\Http\Request;
 use Deprecated;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteApiRequest;
@@ -48,7 +49,7 @@ class CurrencyController extends Controller
    {
        parent::__construct();
        $this->middleware(
-            function ($request, $next) {
+            function (Request $request, $next) {
                $this->validateUserGroup($request);
                $this->repository = app(CurrencyRepositoryInterface::class);
                $this->repository->setUser($this->user);
--- a/app/Api/V1/Controllers/Autocomplete/ObjectGroupController.php
+++ b/app/Api/V1/Controllers/Autocomplete/ObjectGroupController.php
@@ -24,6 +24,7 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Controllers\Autocomplete;

+use Illuminate\Http\Request;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteApiRequest;
 use FireflyIII\Enums\UserRoleEnum;
@@ -46,7 +47,7 @@ class ObjectGroupController extends Controller
    {
        parent::__construct();
        $this->middleware(
-            function ($request, $next) {
+            function (Request $request, $next) {
                $this->validateUserGroup($request);
                $this->repository = app(ObjectGroupRepositoryInterface::class);
                $this->repository->setUser($this->user);
--- a/app/Api/V1/Controllers/Autocomplete/PiggyBankController.php
+++ b/app/Api/V1/Controllers/Autocomplete/PiggyBankController.php
@@ -24,6 +24,7 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Controllers\Autocomplete;

+use Illuminate\Http\Request;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteApiRequest;
 use FireflyIII\Enums\UserRoleEnum;
@@ -50,7 +51,7 @@ class PiggyBankController extends Controller
    {
        parent::__construct();
        $this->middleware(
-            function ($request, $next) {
+            function (Request $request, $next) {
                $this->validateUserGroup($request);
                $this->piggyRepository   = app(PiggyBankRepositoryInterface::class);
                $this->accountRepository = app(AccountRepositoryInterface::class);
--- a/app/Api/V1/Controllers/Autocomplete/RecurrenceController.php
+++ b/app/Api/V1/Controllers/Autocomplete/RecurrenceController.php
@@ -24,6 +24,7 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Controllers\Autocomplete;

+use Illuminate\Http\Request;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteApiRequest;
 use FireflyIII\Enums\UserRoleEnum;
@@ -46,7 +47,7 @@ class RecurrenceController extends Controller
    {
        parent::__construct();
        $this->middleware(
-            function ($request, $next) {
+            function (Request $request, $next) {
                $this->validateUserGroup($request);
                $this->repository = app(RecurringRepositoryInterface::class);
                $this->repository->setUser($this->user);
--- a/app/Api/V1/Controllers/Autocomplete/RuleController.php
+++ b/app/Api/V1/Controllers/Autocomplete/RuleController.php
@@ -24,6 +24,7 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Controllers\Autocomplete;

+use Illuminate\Http\Request;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteApiRequest;
 use FireflyIII\Enums\UserRoleEnum;
@@ -46,7 +47,7 @@ class RuleController extends Controller
    {
        parent::__construct();
        $this->middleware(
-            function ($request, $next) {
+            function (Request $request, $next) {
                $this->validateUserGroup($request);
                $this->repository = app(RuleRepositoryInterface::class);
                $this->repository->setUser($this->user);
--- a/app/Api/V1/Controllers/Autocomplete/RuleGroupController.php
+++ b/app/Api/V1/Controllers/Autocomplete/RuleGroupController.php
@@ -24,6 +24,7 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Controllers\Autocomplete;

+use Illuminate\Http\Request;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteApiRequest;
 use FireflyIII\Enums\UserRoleEnum;
@@ -46,7 +47,7 @@ class RuleGroupController extends Controller
    {
        parent::__construct();
        $this->middleware(
-            function ($request, $next) {
+            function (Request $request, $next) {
                $this->validateUserGroup($request);
                $this->repository = app(RuleGroupRepositoryInterface::class);
                $this->repository->setUser($this->user);
--- a/app/Api/V1/Controllers/Autocomplete/TagController.php
+++ b/app/Api/V1/Controllers/Autocomplete/TagController.php
@@ -24,6 +24,7 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Controllers\Autocomplete;

+use Illuminate\Http\Request;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteApiRequest;
 use FireflyIII\Enums\UserRoleEnum;
@@ -46,7 +47,7 @@ class TagController extends Controller
    {
        parent::__construct();
        $this->middleware(
-            function ($request, $next) {
+            function (Request $request, $next) {
                $this->validateUserGroup($request);
                $this->repository = app(TagRepositoryInterface::class);
                $this->repository->setUser($this->user);
--- a/app/Api/V1/Controllers/Autocomplete/TransactionController.php
+++ b/app/Api/V1/Controllers/Autocomplete/TransactionController.php
@@ -24,6 +24,7 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Controllers\Autocomplete;

+use Illuminate\Http\Request;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteApiRequest;
 use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteTransactionApiRequest;
@@ -51,7 +52,7 @@ class TransactionController extends Controller
    {
        parent::__construct();
        $this->middleware(
-            function ($request, $next) {
+            function (Request $request, $next) {
                $this->validateUserGroup($request);
                $this->repository      = app(JournalRepositoryInterface::class);
                $this->groupRepository = app(TransactionGroupRepositoryInterface::class);
--- a/app/Api/V1/Controllers/Autocomplete/TransactionTypeController.php
+++ b/app/Api/V1/Controllers/Autocomplete/TransactionTypeController.php
@@ -24,6 +24,7 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Controllers\Autocomplete;

+use Illuminate\Http\Request;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteApiRequest;
 use FireflyIII\Enums\UserRoleEnum;
@@ -46,7 +47,7 @@ class TransactionTypeController extends Controller
    {
        parent::__construct();
        $this->middleware(
-            function ($request, $next) {
+            function (Request $request, $next) {
                $this->validateUserGroup($request);
                $this->repository = app(TransactionTypeRepositoryInterface::class);

--- a/app/Api/V1/Controllers/Chart/AccountController.php
+++ b/app/Api/V1/Controllers/Chart/AccountController.php
@@ -24,6 +24,7 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Controllers\Chart;

+use Illuminate\Http\Request;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Chart\ChartRequest;
 use FireflyIII\Enums\UserRoleEnum;
@@ -59,7 +60,7 @@ class AccountController extends Controller
    {
        parent::__construct();
        $this->middleware(
-            function ($request, $next) {
+            function (Request $request, $next) {
                $this->repository = app(AccountRepositoryInterface::class);
                $this->validateUserGroup($request);
                $this->repository->setUserGroup($this->userGroup);
--- a/app/Api/V1/Controllers/Chart/BalanceController.php
+++ b/app/Api/V1/Controllers/Chart/BalanceController.php
@@ -25,6 +25,7 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Controllers\Chart;

+use Illuminate\Http\Request;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Chart\ChartRequest;
 use FireflyIII\Enums\TransactionTypeEnum;
@@ -56,7 +57,7 @@ class BalanceController extends Controller
    {
        parent::__construct();
        $this->middleware(
-            function ($request, $next) {
+            function (Request $request, $next) {
                $this->validateUserGroup($request);
                $this->repository = app(AccountRepositoryInterface::class);
                $this->collector  = app(GroupCollectorInterface::class);
--- a/app/Api/V1/Controllers/Chart/BudgetController.php
+++ b/app/Api/V1/Controllers/Chart/BudgetController.php
@@ -24,6 +24,7 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Controllers\Chart;

+use Illuminate\Http\Request;
 use Carbon\Carbon;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\DateRangeRequest;
@@ -61,7 +62,7 @@ class BudgetController extends Controller
    {
        parent::__construct();
        $this->middleware(
-            function ($request, $next) {
+            function (Request $request, $next) {
                $this->validateUserGroup($request);
                $this->repository    = app(BudgetRepositoryInterface::class);
                $this->blRepository  = app(BudgetLimitRepositoryInterface::class);
@@ -140,14 +141,14 @@ class BudgetController extends Controller
            }

            // convert data if necessary.
-            if (true === $this->convertToPrimary && $currencyId !== $this->primaryCurrency->id) {
+            if ($this->convertToPrimary && $currencyId !== $this->primaryCurrency->id) {
                $currencies[$currencyId] ??= Amount::getTransactionCurrencyById($currencyId);
                $row['pc_budgeted']  = $converter->convert($currencies[$currencyId], $this->primaryCurrency, $start, $row['budgeted']);
                $row['pc_spent']     = $converter->convert($currencies[$currencyId], $this->primaryCurrency, $start, $row['spent']);
                $row['pc_left']      = $converter->convert($currencies[$currencyId], $this->primaryCurrency, $start, $row['left']);
                $row['pc_overspent'] = $converter->convert($currencies[$currencyId], $this->primaryCurrency, $start, $row['overspent']);
            }
-            if (true === $this->convertToPrimary && $currencyId === $this->primaryCurrency->id) {
+            if ($this->convertToPrimary && $currencyId === $this->primaryCurrency->id) {
                $row['pc_budgeted']  = $row['budgeted'];
                $row['pc_spent']     = $row['spent'];
                $row['pc_left']      = $row['left'];
@@ -265,7 +266,7 @@ class BudgetController extends Controller

        /** @var BudgetLimit $current */
        foreach ($limits as $current) {
-            if (true === $this->convertToPrimary) {
+            if ($this->convertToPrimary) {
                if ($current->transaction_currency_id === $this->primaryCurrency->id) {
                    // simply add it.
                    $amount = bcadd($amount, (string)$current->amount);
@@ -283,7 +284,7 @@ class BudgetController extends Controller
                $limit = $current;
            }
        }
-        if (null !== $limit && true === $this->convertToPrimary) {
+        if (null !== $limit && $this->convertToPrimary) {
            // convert and add all amounts.
            $limit->amount = app('steam')->positive($amount);
            Log::debug(sprintf('Final amount in limit with converted amount %s', $limit->amount));
--- a/app/Api/V1/Controllers/Chart/CategoryController.php
+++ b/app/Api/V1/Controllers/Chart/CategoryController.php
@@ -24,6 +24,7 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Controllers\Chart;

+use Illuminate\Http\Request;
 use Carbon\Carbon;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\DateRangeRequest;
@@ -58,7 +59,7 @@ class CategoryController extends Controller
    {
        parent::__construct();
        $this->middleware(
-            function ($request, $next) {
+            function (Request $request, $next) {
                $this->validateUserGroup($request);
                $this->accountRepos  = app(AccountRepositoryInterface::class);
                $this->currencyRepos = app(CurrencyRepositoryInterface::class);
@@ -181,7 +182,7 @@ class CategoryController extends Controller
        $return     = array_values($return);

        // order by amount
-        usort($return, static fn (array $a, array $b) => ((float)$a['entries']['spent'] + (float)$a['entries']['earned']) < ((float)$b['entries']['spent'] + (float)$b['entries']['earned']) ? 1 : -1);
+        usort($return, static fn (array $a, array $b): int => ((float)$a['entries']['spent'] + (float)$a['entries']['earned']) < ((float)$b['entries']['spent'] + (float)$b['entries']['earned']) ? 1 : -1);

        return response()->json($this->clean($return));
    }
--- a/app/Api/V1/Controllers/Controller.php
+++ b/app/Api/V1/Controllers/Controller.php
@@ -24,6 +24,7 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Controllers;

+use Deprecated;
 use Carbon\Carbon;
 use Carbon\Exceptions\InvalidFormatException;
 use FireflyIII\Exceptions\BadHttpHeaderException;
@@ -100,10 +101,10 @@ abstract class Controller extends BaseController
        );
    }

-    /**
-     * @deprecated use Request classes
-     * Method to grab all parameters from the URL
-     */
+    #[Deprecated(message: <<<'TXT'
+        use Request classes
+         Method to grab all parameters from the URL
+        TXT)]
    private function getParameters(): ParameterBag
    {
        $bag      = new ParameterBag();
--- a/app/Api/V1/Controllers/Data/Bulk/TransactionController.php
+++ b/app/Api/V1/Controllers/Data/Bulk/TransactionController.php
@@ -24,6 +24,7 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Controllers\Data\Bulk;

+use Illuminate\Http\Request;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Data\Bulk\TransactionRequest;
 use FireflyIII\Enums\UserRoleEnum;
@@ -51,7 +52,7 @@ class TransactionController extends Controller
    {
        parent::__construct();
        $this->middleware(
-            function ($request, $next) {
+            function (Request $request, $next) {
                $this->validateUserGroup($request);
                $this->repository = app(AccountRepositoryInterface::class);
                $this->repository->setUserGroup($this->userGroup);
--- a/app/Api/V1/Controllers/Data/DestroyController.php
+++ b/app/Api/V1/Controllers/Data/DestroyController.php
@@ -24,6 +24,7 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Controllers\Data;

+use Illuminate\Http\Request;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Data\DestroyRequest;
 use FireflyIII\Enums\AccountTypeEnum;
@@ -63,7 +64,7 @@ class DestroyController extends Controller
    {
        parent::__construct();
        $this->middleware(
-            function ($request, $next) {
+            function (Request $request, $next) {
                $this->validateUserGroup($request);

                return $next($request);
@@ -185,7 +186,7 @@ class DestroyController extends Controller
        /** @var Account $account */
        foreach ($collection as $account) {
            $count = $account->transactions()->count();
-            if (true === $this->unused && 0 === $count) {
+            if ($this->unused && 0 === $count) {
                Log::info(sprintf('Deleted unused account #%d "%s"', $account->id, $account->name));
                Log::channel('audit')->info(sprintf('Deleted unused account #%d "%s"', $account->id, $account->name));
                $service->destroy($account, null);
--- a/app/Api/V1/Controllers/Data/Export/ExportController.php
+++ b/app/Api/V1/Controllers/Data/Export/ExportController.php
@@ -24,6 +24,7 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Controllers\Data\Export;

+use Illuminate\Http\Request;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Data\Export\ExportRequest;
 use FireflyIII\Enums\UserRoleEnum;
@@ -49,7 +50,7 @@ class ExportController extends Controller
    {
        parent::__construct();
        $this->middleware(
-            function ($request, $next) {
+            function (Request $request, $next) {
                $this->validateUserGroup($request);
                $this->exporter = app(ExportDataGenerator::class);
                $this->exporter->setUserGroup($this->userGroup);
--- a/app/Api/V1/Controllers/Data/PurgeController.php
+++ b/app/Api/V1/Controllers/Data/PurgeController.php
@@ -24,6 +24,7 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Controllers\Data;

+use Illuminate\Http\Request;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Enums\UserRoleEnum;
 use FireflyIII\Models\Account;
@@ -51,7 +52,7 @@ class PurgeController extends Controller
    {
        parent::__construct();
        $this->middleware(
-            function ($request, $next) {
+            function (Request $request, $next) {
                $this->validateUserGroup($request);

                return $next($request);
--- a/app/Api/V1/Controllers/Models/CurrencyExchangeRate/DestroyController.php
+++ b/app/Api/V1/Controllers/Models/CurrencyExchangeRate/DestroyController.php
@@ -24,6 +24,7 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Controllers\Models\CurrencyExchangeRate;

+use Illuminate\Http\Request;
 use Carbon\Carbon;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Models\CurrencyExchangeRate\DestroyRequest;
@@ -47,7 +48,7 @@ class DestroyController extends Controller
    {
        parent::__construct();
        $this->middleware(
-            function ($request, $next) {
+            function (Request $request, $next) {
                $this->repository = app(ExchangeRateRepositoryInterface::class);
                $this->repository->setUserGroup($this->validateUserGroup($request));

--- a/app/Api/V1/Controllers/Models/CurrencyExchangeRate/IndexController.php
+++ b/app/Api/V1/Controllers/Models/CurrencyExchangeRate/IndexController.php
@@ -24,6 +24,7 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Controllers\Models\CurrencyExchangeRate;

+use Illuminate\Http\Request;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Enums\UserRoleEnum;
 use FireflyIII\Repositories\ExchangeRate\ExchangeRateRepositoryInterface;
@@ -47,7 +48,7 @@ class IndexController extends Controller
    {
        parent::__construct();
        $this->middleware(
-            function ($request, $next) {
+            function (Request $request, $next) {
                $this->repository = app(ExchangeRateRepositoryInterface::class);
                $this->repository->setUserGroup($this->validateUserGroup($request));

--- a/app/Api/V1/Controllers/Models/CurrencyExchangeRate/ShowController.php
+++ b/app/Api/V1/Controllers/Models/CurrencyExchangeRate/ShowController.php
@@ -24,6 +24,7 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Controllers\Models\CurrencyExchangeRate;

+use Illuminate\Http\Request;
 use Carbon\Carbon;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Enums\UserRoleEnum;
@@ -51,7 +52,7 @@ class ShowController extends Controller
    {
        parent::__construct();
        $this->middleware(
-            function ($request, $next) {
+            function (Request $request, $next) {
                $this->repository = app(ExchangeRateRepositoryInterface::class);
                $this->repository->setUserGroup($this->validateUserGroup($request));

--- a/app/Api/V1/Controllers/Models/CurrencyExchangeRate/StoreController.php
+++ b/app/Api/V1/Controllers/Models/CurrencyExchangeRate/StoreController.php
@@ -24,6 +24,7 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Controllers\Models\CurrencyExchangeRate;

+use Illuminate\Http\Request;
 use Carbon\Carbon;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Models\CurrencyExchangeRate\StoreByCurrenciesRequest;
@@ -52,7 +53,7 @@ class StoreController extends Controller
    {
        parent::__construct();
        $this->middleware(
-            function ($request, $next) {
+            function (Request $request, $next) {
                $this->repository = app(ExchangeRateRepositoryInterface::class);
                $this->repository->setUserGroup($this->validateUserGroup($request));

--- a/app/Api/V1/Controllers/Models/CurrencyExchangeRate/UpdateController.php
+++ b/app/Api/V1/Controllers/Models/CurrencyExchangeRate/UpdateController.php
@@ -24,6 +24,7 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Controllers\Models\CurrencyExchangeRate;

+use Illuminate\Http\Request;
 use Carbon\Carbon;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Models\CurrencyExchangeRate\UpdateRequest;
@@ -48,7 +49,7 @@ class UpdateController extends Controller
    {
        parent::__construct();
        $this->middleware(
-            function ($request, $next) {
+            function (Request $request, $next) {
                $this->repository = app(ExchangeRateRepositoryInterface::class);
                $this->repository->setUserGroup($this->validateUserGroup($request));

--- a/app/Api/V1/Controllers/Models/Transaction/StoreController.php
+++ b/app/Api/V1/Controllers/Models/Transaction/StoreController.php
@@ -24,6 +24,7 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Controllers\Models\Transaction;

+use Illuminate\Http\Request;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Models\Transaction\StoreRequest;
 use FireflyIII\Enums\UserRoleEnum;
@@ -61,7 +62,7 @@ class StoreController extends Controller
    {
        parent::__construct();
        $this->middleware(
-            function ($request, $next) {
+            function (Request $request, $next) {
                /** @var User $admin */
                $admin                 = auth()->user();
                $userGroup             = $this->validateUserGroup($request);
--- a/app/Api/V1/Controllers/Models/TransactionCurrency/ListController.php
+++ b/app/Api/V1/Controllers/Models/TransactionCurrency/ListController.php
@@ -90,7 +90,7 @@ class ListController extends Controller

        // filter list on currency preference:
        $collection        = $unfiltered->filter(
-            static function (Account $account) use ($currency, $accountRepository) {
+            static function (Account $account) use ($currency, $accountRepository): bool {
                $currencyId = (int) $accountRepository->getMetaValue($account, 'currency_id');

                return $currencyId === $currency->id;
@@ -178,7 +178,7 @@ class ListController extends Controller

        // filter and paginate list:
        $collection  = $unfiltered->filter(
-            static fn (Bill $bill) => $bill->transaction_currency_id === $currency->id
+            static fn (Bill $bill): bool => $bill->transaction_currency_id === $currency->id
        );
        $count       = $collection->count();
        $bills       = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
@@ -261,8 +261,8 @@ class ListController extends Controller

        // filter selection
        $collection     = $unfiltered->filter(
-            static function (Recurrence $recurrence) use ($currency) {  // @phpstan-ignore-line
-                if (array_any($recurrence->recurrenceTransactions, fn ($transaction) => $transaction->transaction_currency_id === $currency->id || $transaction->foreign_currency_id === $currency->id)) {
+            static function (Recurrence $recurrence) use ($currency): ?Recurrence {  // @phpstan-ignore-line
+                if (array_any($recurrence->recurrenceTransactions, fn ($transaction): bool => $transaction->transaction_currency_id === $currency->id || $transaction->foreign_currency_id === $currency->id)) {
                    return $recurrence;
                }

@@ -310,8 +310,8 @@ class ListController extends Controller
        $unfiltered  = $ruleRepos->getAll();

        $collection  = $unfiltered->filter(
-            static function (Rule $rule) use ($currency) { // @phpstan-ignore-line
-                if (array_any($rule->ruleTriggers, fn ($trigger) => 'currency_is' === $trigger->trigger_type && $currency->name === $trigger->trigger_value)) {
+            static function (Rule $rule) use ($currency): ?Rule { // @phpstan-ignore-line
+                if (array_any($rule->ruleTriggers, fn ($trigger): bool => 'currency_is' === $trigger->trigger_type && $currency->name === $trigger->trigger_value)) {
                    return $rule;
                }

--- a/app/Api/V1/Controllers/Search/AccountController.php
+++ b/app/Api/V1/Controllers/Search/AccountController.php
@@ -45,18 +45,17 @@ class AccountController extends Controller
 {
    use AccountFilter;

-    private array $validFields;
+    private array $validFields = [
+        AccountSearch::SEARCH_ALL,
+        AccountSearch::SEARCH_ID,
+        AccountSearch::SEARCH_NAME,
+        AccountSearch::SEARCH_IBAN,
+        AccountSearch::SEARCH_NUMBER,
+    ];

    public function __construct()
    {
        parent::__construct();
-        $this->validFields = [
-            AccountSearch::SEARCH_ALL,
-            AccountSearch::SEARCH_ID,
-            AccountSearch::SEARCH_NAME,
-            AccountSearch::SEARCH_IBAN,
-            AccountSearch::SEARCH_NUMBER,
-        ];
    }

    /**
--- a/app/Api/V1/Controllers/Summary/BasicController.php
+++ b/app/Api/V1/Controllers/Summary/BasicController.php
@@ -591,7 +591,7 @@ class BasicController extends Controller

        // filter list on preference of being included.
        $filtered       = $allAccounts->filter(
-            function (Account $account) {
+            function (Account $account): bool {
                $includeNetWorth = $this->accountRepository->getMetaValue($account, 'include_net_worth');

                return null === $includeNetWorth || '1' === $includeNetWorth;
@@ -651,11 +651,8 @@ class BasicController extends Controller
        if ($start->greaterThanOrEqualTo($date) && $end->greaterThanOrEqualTo($date)) {
            return true;
        }
-        // start and end in the past? use $end
-        if ($start->lessThanOrEqualTo($date) && $end->lessThanOrEqualTo($date)) {
-            return true;
-        }

-        return false;
+        // start and end in the past? use $end
+        return $start->lessThanOrEqualTo($date) && $end->lessThanOrEqualTo($date);
    }
 }
--- a/app/Api/V1/Requests/AggregateFormRequest.php
+++ b/app/Api/V1/Requests/AggregateFormRequest.php
@@ -23,10 +23,11 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Requests;

+use Override;
+use Illuminate\Contracts\Validation\Validator;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Log;
-use Illuminate\Validation\Validator;
 use RuntimeException;

 abstract class AggregateFormRequest extends ApiRequest
@@ -39,6 +40,7 @@ abstract class AggregateFormRequest extends ApiRequest
    /** @return array<array|string> */
    abstract protected function getRequests(): array;

+    #[Override]
    public function initialize(array $query = [], array $request = [], array $attributes = [], array $cookies = [], array $files = [], array $server = [], $content = null): void
    {
        parent::initialize($query, $request, $attributes, $cookies, $files, $server, $content);
@@ -76,7 +78,7 @@ abstract class AggregateFormRequest extends ApiRequest
        // check all subrequests for rules and combine them
        return array_reduce(
            $this->requests,
-            static fn (array $rules, FormRequest $request) => $rules
+            static fn (array $rules, FormRequest $request): array => $rules
                + (
                    method_exists($request, 'rules')
                    ? $request->rules()
@@ -91,7 +93,7 @@ abstract class AggregateFormRequest extends ApiRequest
        // register all subrequests' validators
        foreach ($this->requests as $request) {
            if (method_exists($request, 'withValidator')) {
-                Log::debug(sprintf('Process withValidator from class %s', get_class($request)));
+                Log::debug(sprintf('Process withValidator from class %s', $request::class));
                $request->withValidator($validator);
            }
        }
--- a/app/Api/V1/Requests/Chart/ChartRequest.php
+++ b/app/Api/V1/Requests/Chart/ChartRequest.php
@@ -24,13 +24,13 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Requests\Chart;

+use Illuminate\Contracts\Validation\Validator;
 use FireflyIII\Enums\UserRoleEnum;
 use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait;
 use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Facades\Log;
-use Illuminate\Validation\Validator;

 /**
 * Class ChartRequest
--- a/app/Api/V1/Requests/Data/Bulk/MoveTransactionsRequest.php
+++ b/app/Api/V1/Requests/Data/Bulk/MoveTransactionsRequest.php
@@ -24,12 +24,12 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Requests\Data\Bulk;

+use Illuminate\Contracts\Validation\Validator;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Facades\Log;
-use Illuminate\Validation\Validator;

 /**
 * Class MoveTransactionsRequest
--- a/app/Api/V1/Requests/Data/Bulk/TransactionRequest.php
+++ b/app/Api/V1/Requests/Data/Bulk/TransactionRequest.php
@@ -24,6 +24,7 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Requests\Data\Bulk;

+use Illuminate\Contracts\Validation\Validator;
 use FireflyIII\Enums\ClauseType;
 use FireflyIII\Rules\IsValidBulkClause;
 use FireflyIII\Support\Request\ChecksLogin;
@@ -31,7 +32,6 @@ use FireflyIII\Support\Request\ConvertsDataTypes;
 use FireflyIII\Validation\Api\Data\Bulk\ValidatesBulkTransactionQuery;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Facades\Log;
-use Illuminate\Validation\Validator;
 use JsonException;

 use function Safe\json_decode;
--- a/app/Api/V1/Requests/DateRangeRequest.php
+++ b/app/Api/V1/Requests/DateRangeRequest.php
@@ -23,7 +23,7 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Requests;

-use Illuminate\Validation\Validator;
+use Illuminate\Contracts\Validation\Validator;

 class DateRangeRequest extends ApiRequest
 {
--- a/app/Api/V1/Requests/DateRequest.php
+++ b/app/Api/V1/Requests/DateRequest.php
@@ -23,8 +23,8 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Requests;

+use Illuminate\Contracts\Validation\Validator;
 use Carbon\Carbon;
-use Illuminate\Validation\Validator;

 class DateRequest extends ApiRequest
 {
--- a/app/Api/V1/Requests/Generic/ObjectTypeApiRequest.php
+++ b/app/Api/V1/Requests/Generic/ObjectTypeApiRequest.php
@@ -23,6 +23,8 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Requests\Generic;

+use Override;
+use Illuminate\Contracts\Validation\Validator;
 use FireflyIII\Api\V1\Requests\ApiRequest;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\Transaction;
@@ -30,7 +32,6 @@ use FireflyIII\Rules\Account\IsValidAccountTypeList;
 use FireflyIII\Rules\TransactionType\IsValidTransactionTypeList;
 use FireflyIII\Support\Http\Api\AccountFilter;
 use FireflyIII\Support\Http\Api\TransactionFilter;
-use Illuminate\Validation\Validator;
 use RuntimeException;

 class ObjectTypeApiRequest extends ApiRequest
@@ -40,6 +41,7 @@ class ObjectTypeApiRequest extends ApiRequest

    private ?string $objectType = null;

+    #[Override]
    public function handleConfig(array $config): void
    {
        parent::handleConfig($config);
--- a/app/Api/V1/Requests/Generic/QueryRequest.php
+++ b/app/Api/V1/Requests/Generic/QueryRequest.php
@@ -23,10 +23,10 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Requests\Generic;

+use Illuminate\Contracts\Validation\Validator;
 use FireflyIII\Api\V1\Requests\ApiRequest;
 use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
-use Illuminate\Validation\Validator;

 class QueryRequest extends ApiRequest
 {
--- a/app/Api/V1/Requests/Models/Account/AccountTypeApiRequest.php
+++ b/app/Api/V1/Requests/Models/Account/AccountTypeApiRequest.php
@@ -23,9 +23,9 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Requests\Models\Account;

+use Illuminate\Contracts\Validation\Validator;
 use FireflyIII\Api\V1\Requests\ApiRequest;
 use FireflyIII\Support\Http\Api\AccountFilter;
-use Illuminate\Validation\Validator;

 class AccountTypeApiRequest extends ApiRequest
 {
--- a/app/Api/V1/Requests/Models/Account/AccountTypesApiRequest.php
+++ b/app/Api/V1/Requests/Models/Account/AccountTypesApiRequest.php
@@ -23,10 +23,10 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Requests\Models\Account;

+use Illuminate\Contracts\Validation\Validator;
 use FireflyIII\Api\V1\Requests\ApiRequest;
 use FireflyIII\Rules\Account\IsValidAccountTypeList;
 use FireflyIII\Support\Http\Api\AccountFilter;
-use Illuminate\Validation\Validator;

 class AccountTypesApiRequest extends ApiRequest
 {
--- a/app/Api/V1/Requests/Models/Account/ShowRequest.php
+++ b/app/Api/V1/Requests/Models/Account/ShowRequest.php
@@ -26,7 +26,6 @@ namespace FireflyIII\Api\V1\Requests\Models\Account;
 use FireflyIII\Api\V1\Requests\AggregateFormRequest;
 use FireflyIII\Api\V1\Requests\DateRangeRequest;
 use FireflyIII\Api\V1\Requests\DateRequest;
-use FireflyIII\Api\V1\Requests\Generic\ObjectTypeApiRequest;
 use FireflyIII\Api\V1\Requests\PaginationRequest;
 use FireflyIII\Models\Account;

--- a/app/Api/V1/Requests/Models/Account/UpdateRequest.php
+++ b/app/Api/V1/Requests/Models/Account/UpdateRequest.php
@@ -24,6 +24,7 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Requests\Models\Account;

+use Illuminate\Contracts\Validation\Validator;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\Location;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
@@ -35,7 +36,6 @@ use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Facades\Log;
-use Illuminate\Validation\Validator;

 /**
 * Class UpdateRequest
--- a/app/Api/V1/Requests/Models/Attachment/StoreRequest.php
+++ b/app/Api/V1/Requests/Models/Attachment/StoreRequest.php
@@ -58,7 +58,7 @@ class StoreRequest extends FormRequest
    {
        $models = config('firefly.valid_attachment_models');
        $models = array_map(
-            static fn (string $className) => str_replace('FireflyIII\Models\\', '', $className),
+            static fn (string $className): string => str_replace('FireflyIII\Models\\', '', $className),
            $models
        );
        $models = implode(',', $models);
--- a/app/Api/V1/Requests/Models/Attachment/UpdateRequest.php
+++ b/app/Api/V1/Requests/Models/Attachment/UpdateRequest.php
@@ -60,7 +60,7 @@ class UpdateRequest extends FormRequest
    {
        $models = config('firefly.valid_attachment_models');
        $models = array_map(
-            static fn (string $className) => str_replace('FireflyIII\Models\\', '', $className),
+            static fn (string $className): string => str_replace('FireflyIII\Models\\', '', $className),
            $models
        );
        $models = implode(',', $models);
--- a/app/Api/V1/Requests/Models/AvailableBudget/Request.php
+++ b/app/Api/V1/Requests/Models/AvailableBudget/Request.php
@@ -24,13 +24,13 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Requests\Models\AvailableBudget;

+use Illuminate\Contracts\Validation\Validator;
 use Carbon\Carbon;
 use FireflyIII\Rules\IsValidPositiveAmount;
 use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Facades\Log;
-use Illuminate\Validation\Validator;

 /**
 * Class Request
--- a/app/Api/V1/Requests/Models/Bill/StoreRequest.php
+++ b/app/Api/V1/Requests/Models/Bill/StoreRequest.php
@@ -24,13 +24,13 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Requests\Models\Bill;

+use Illuminate\Contracts\Validation\Validator;
 use FireflyIII\Rules\IsBoolean;
 use FireflyIII\Rules\IsValidPositiveAmount;
 use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Facades\Log;
-use Illuminate\Validation\Validator;
 use TypeError;
 use ValueError;

--- a/app/Api/V1/Requests/Models/Bill/UpdateRequest.php
+++ b/app/Api/V1/Requests/Models/Bill/UpdateRequest.php
@@ -24,6 +24,7 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Requests\Models\Bill;

+use Illuminate\Contracts\Validation\Validator;
 use FireflyIII\Models\Bill;
 use FireflyIII\Rules\IsBoolean;
 use FireflyIII\Rules\IsValidPositiveAmount;
@@ -31,7 +32,6 @@ use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Facades\Log;
-use Illuminate\Validation\Validator;

 /**
 * Class UpdateRequest
--- a/app/Api/V1/Requests/Models/Budget/StoreRequest.php
+++ b/app/Api/V1/Requests/Models/Budget/StoreRequest.php
@@ -24,6 +24,7 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Requests\Models\Budget;

+use Illuminate\Contracts\Validation\Validator;
 use FireflyIII\Rules\IsBoolean;
 use FireflyIII\Rules\IsValidPositiveAmount;
 use FireflyIII\Support\Request\ChecksLogin;
@@ -31,7 +32,6 @@ use FireflyIII\Support\Request\ConvertsDataTypes;
 use FireflyIII\Validation\AutoBudget\ValidatesAutoBudgetRequest;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Facades\Log;
-use Illuminate\Validation\Validator;

 /**
 * Class StoreRequest
--- a/app/Api/V1/Requests/Models/Budget/UpdateRequest.php
+++ b/app/Api/V1/Requests/Models/Budget/UpdateRequest.php
@@ -24,6 +24,7 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Requests\Models\Budget;

+use Illuminate\Contracts\Validation\Validator;
 use FireflyIII\Models\Budget;
 use FireflyIII\Rules\IsBoolean;
 use FireflyIII\Rules\IsValidPositiveAmount;
@@ -32,7 +33,6 @@ use FireflyIII\Support\Request\ConvertsDataTypes;
 use FireflyIII\Validation\AutoBudget\ValidatesAutoBudgetRequest;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Facades\Log;
-use Illuminate\Validation\Validator;

 /**
 * Class UpdateRequest
--- a/app/Api/V1/Requests/Models/BudgetLimit/StoreRequest.php
+++ b/app/Api/V1/Requests/Models/BudgetLimit/StoreRequest.php
@@ -24,6 +24,7 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Requests\Models\BudgetLimit;

+use Illuminate\Contracts\Validation\Validator;
 use Carbon\Carbon;
 use FireflyIII\Factory\TransactionCurrencyFactory;
 use FireflyIII\Rules\IsBoolean;
@@ -33,7 +34,6 @@ use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Facades\Log;
-use Illuminate\Validation\Validator;

 /**
 * Class StoreRequest
--- a/app/Api/V1/Requests/Models/BudgetLimit/UpdateRequest.php
+++ b/app/Api/V1/Requests/Models/BudgetLimit/UpdateRequest.php
@@ -24,6 +24,7 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Requests\Models\BudgetLimit;

+use Illuminate\Contracts\Validation\Validator;
 use Carbon\Carbon;
 use FireflyIII\Rules\IsBoolean;
 use FireflyIII\Rules\IsValidPositiveAmount;
@@ -31,7 +32,6 @@ use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Facades\Log;
-use Illuminate\Validation\Validator;

 /**
 * Class UpdateRequest
--- a/app/Api/V1/Requests/Models/CurrencyExchangeRate/StoreByCurrenciesRequest.php
+++ b/app/Api/V1/Requests/Models/CurrencyExchangeRate/StoreByCurrenciesRequest.php
@@ -24,12 +24,12 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Requests\Models\CurrencyExchangeRate;

+use Illuminate\Contracts\Validation\Validator;
 use Carbon\Carbon;
 use Carbon\Exceptions\InvalidFormatException;
 use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Validation\Validator;

 class StoreByCurrenciesRequest extends FormRequest
 {
--- a/app/Api/V1/Requests/Models/CurrencyExchangeRate/StoreByDateRequest.php
+++ b/app/Api/V1/Requests/Models/CurrencyExchangeRate/StoreByDateRequest.php
@@ -24,13 +24,13 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Requests\Models\CurrencyExchangeRate;

+use Illuminate\Contracts\Validation\Validator;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Support\Facades\Amount;
 use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Validation\Validator;

 class StoreByDateRequest extends FormRequest
 {
--- a/app/Api/V1/Requests/Models/PiggyBank/StoreRequest.php
+++ b/app/Api/V1/Requests/Models/PiggyBank/StoreRequest.php
@@ -24,6 +24,7 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Requests\Models\PiggyBank;

+use Illuminate\Contracts\Validation\Validator;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Rules\IsValidZeroOrMoreAmount;
@@ -32,7 +33,6 @@ use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Facades\Log;
-use Illuminate\Validation\Validator;

 /**
 * Class StoreRequest
--- a/app/Api/V1/Requests/Models/Recurrence/StoreRequest.php
+++ b/app/Api/V1/Requests/Models/Recurrence/StoreRequest.php
@@ -24,6 +24,7 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Requests\Models\Recurrence;

+use Illuminate\Contracts\Validation\Validator;
 use FireflyIII\Rules\BelongsUser;
 use FireflyIII\Rules\IsBoolean;
 use FireflyIII\Rules\IsValidPositiveAmount;
@@ -35,7 +36,6 @@ use FireflyIII\Validation\RecurrenceValidation;
 use FireflyIII\Validation\TransactionValidation;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Facades\Log;
-use Illuminate\Validation\Validator;

 /**
 * Class StoreRequest
--- a/app/Api/V1/Requests/Models/Recurrence/UpdateRequest.php
+++ b/app/Api/V1/Requests/Models/Recurrence/UpdateRequest.php
@@ -24,6 +24,7 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Requests\Models\Recurrence;

+use Illuminate\Contracts\Validation\Validator;
 use FireflyIII\Models\Recurrence;
 use FireflyIII\Rules\BelongsUser;
 use FireflyIII\Rules\IsBoolean;
@@ -36,7 +37,6 @@ use FireflyIII\Validation\RecurrenceValidation;
 use FireflyIII\Validation\TransactionValidation;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Facades\Log;
-use Illuminate\Validation\Validator;

 /**
 * Class UpdateRequest
--- a/app/Api/V1/Requests/Models/Rule/StoreRequest.php
+++ b/app/Api/V1/Requests/Models/Rule/StoreRequest.php
@@ -24,6 +24,7 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Requests\Models\Rule;

+use Illuminate\Contracts\Validation\Validator;
 use FireflyIII\Rules\IsBoolean;
 use FireflyIII\Rules\IsValidActionExpression;
 use FireflyIII\Support\Request\ChecksLogin;
@@ -31,7 +32,6 @@ use FireflyIII\Support\Request\ConvertsDataTypes;
 use FireflyIII\Support\Request\GetRuleConfiguration;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Facades\Log;
-use Illuminate\Validation\Validator;

 /**
 * Class StoreRequest
@@ -202,7 +202,7 @@ class StoreRequest extends FormRequest
                $inactiveIndex = $index;
            }
        }
-        if (true === $allInactive) {
+        if ($allInactive) {
            $validator->errors()->add(sprintf('triggers.%d.active', $inactiveIndex), (string) trans('validation.at_least_one_active_trigger'));
        }
    }
@@ -231,7 +231,7 @@ class StoreRequest extends FormRequest
                $inactiveIndex = $index;
            }
        }
-        if (true === $allInactive) {
+        if ($allInactive) {
            $validator->errors()->add(sprintf('actions.%d.active', $inactiveIndex), (string) trans('validation.at_least_one_active_action'));
        }
    }
--- a/app/Api/V1/Requests/Models/Rule/UpdateRequest.php
+++ b/app/Api/V1/Requests/Models/Rule/UpdateRequest.php
@@ -24,6 +24,7 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Requests\Models\Rule;

+use Illuminate\Contracts\Validation\Validator;
 use FireflyIII\Models\Rule;
 use FireflyIII\Rules\IsBoolean;
 use FireflyIII\Rules\IsValidActionExpression;
@@ -32,7 +33,6 @@ use FireflyIII\Support\Request\ConvertsDataTypes;
 use FireflyIII\Support\Request\GetRuleConfiguration;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Facades\Log;
-use Illuminate\Validation\Validator;

 /**
 * Class UpdateRequest
@@ -207,7 +207,7 @@ class UpdateRequest extends FormRequest
                $inactiveIndex = $index;
            }
        }
-        if (true === $allInactive) {
+        if ($allInactive) {
            $validator->errors()->add(sprintf('triggers.%d.active', $inactiveIndex), (string) trans('validation.at_least_one_active_trigger'));
        }
    }
@@ -248,7 +248,7 @@ class UpdateRequest extends FormRequest
                $inactiveIndex = $index;
            }
        }
-        if (true === $allInactive) {
+        if ($allInactive) {
            $validator->errors()->add(sprintf('actions.%d.active', $inactiveIndex), (string) trans('validation.at_least_one_active_action'));
        }
    }
--- a/app/Api/V1/Requests/Models/Transaction/StoreRequest.php
+++ b/app/Api/V1/Requests/Models/Transaction/StoreRequest.php
@@ -24,6 +24,7 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Requests\Models\Transaction;

+use Illuminate\Contracts\Validation\Validator;
 use FireflyIII\Models\Location;
 use FireflyIII\Rules\BelongsUser;
 use FireflyIII\Rules\IsBoolean;
@@ -39,7 +40,6 @@ use FireflyIII\Validation\GroupValidation;
 use FireflyIII\Validation\TransactionValidation;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Facades\Log;
-use Illuminate\Validation\Validator;

 /**
 * Class StoreRequest
--- a/app/Api/V1/Requests/Models/Transaction/UpdateRequest.php
+++ b/app/Api/V1/Requests/Models/Transaction/UpdateRequest.php
@@ -24,6 +24,7 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Requests\Models\Transaction;

+use Illuminate\Contracts\Validation\Validator;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\TransactionGroup;
 use FireflyIII\Rules\BelongsUser;
@@ -37,7 +38,6 @@ use FireflyIII\Validation\GroupValidation;
 use FireflyIII\Validation\TransactionValidation;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Facades\Log;
-use Illuminate\Validation\Validator;

 /**
 * Class UpdateRequest
--- a/app/Api/V1/Requests/Models/TransactionCurrency/CurrencyCodeRequest.php
+++ b/app/Api/V1/Requests/Models/TransactionCurrency/CurrencyCodeRequest.php
@@ -23,8 +23,8 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Requests\Models\TransactionCurrency;

+use Illuminate\Contracts\Validation\Validator;
 use FireflyIII\Api\V1\Requests\ApiRequest;
-use Illuminate\Validation\Validator;

 class CurrencyCodeRequest extends ApiRequest
 {
--- a/app/Api/V1/Requests/Models/TransactionLink/StoreRequest.php
+++ b/app/Api/V1/Requests/Models/TransactionLink/StoreRequest.php
@@ -24,6 +24,7 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Requests\Models\TransactionLink;

+use Illuminate\Contracts\Validation\Validator;
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use FireflyIII\Repositories\LinkType\LinkTypeRepositoryInterface;
 use FireflyIII\Support\Request\ChecksLogin;
@@ -31,7 +32,6 @@ use FireflyIII\Support\Request\ConvertsDataTypes;
 use FireflyIII\User;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Facades\Log;
-use Illuminate\Validation\Validator;

 /**
 * Class StoreRequest
--- a/app/Api/V1/Requests/Models/TransactionLink/UpdateRequest.php
+++ b/app/Api/V1/Requests/Models/TransactionLink/UpdateRequest.php
@@ -24,6 +24,7 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Requests\Models\TransactionLink;

+use Illuminate\Contracts\Validation\Validator;
 use FireflyIII\Models\TransactionJournalLink;
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use FireflyIII\Repositories\LinkType\LinkTypeRepositoryInterface;
@@ -31,7 +32,6 @@ use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Facades\Log;
-use Illuminate\Validation\Validator;

 /**
 * Class UpdateRequest
--- a/app/Api/V1/Requests/Models/Webhook/CreateRequest.php
+++ b/app/Api/V1/Requests/Models/Webhook/CreateRequest.php
@@ -52,7 +52,7 @@ class CreateRequest extends FormRequest
        $responses            = $this->get('responses', []);
        $deliveries           = $this->get('deliveries', []);

-        if (0 === count($triggers) || 0 === count($responses) || 0 === count($deliveries)) {
+        if (in_array(0, [count($triggers), count($responses), count($deliveries)], true)) {
            throw new FireflyException('Unexpectedly got no responses, triggers or deliveries.');
        }

--- a/app/Api/V1/Requests/Models/Webhook/UpdateRequest.php
+++ b/app/Api/V1/Requests/Models/Webhook/UpdateRequest.php
@@ -53,7 +53,7 @@ class UpdateRequest extends FormRequest
        $responses            = $this->get('responses', []);
        $deliveries           = $this->get('deliveries', []);

-        if (0 === count($triggers) || 0 === count($responses) || 0 === count($deliveries)) {
+        if (in_array(0, [count($triggers), count($responses), count($deliveries)], true)) {
            throw new FireflyException('Unexpectedly got no responses, triggers or deliveries.');
        }

--- a/app/Api/V1/Requests/PaginationRequest.php
+++ b/app/Api/V1/Requests/PaginationRequest.php
@@ -23,16 +23,18 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Requests;

+use Override;
+use Illuminate\Contracts\Validation\Validator;
 use FireflyIII\Rules\IsValidSortInstruction;
 use FireflyIII\Support\Facades\Preferences;
 use FireflyIII\User;
-use Illuminate\Validation\Validator;
 use RuntimeException;

 class PaginationRequest extends ApiRequest
 {
    private ?string $sortClass = null;

+    #[Override]
    public function handleConfig(array $config): void
    {
        parent::handleConfig($config);
--- a/app/Api/V1/Requests/System/UserUpdateRequest.php
+++ b/app/Api/V1/Requests/System/UserUpdateRequest.php
@@ -24,13 +24,13 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Requests\System;

+use Illuminate\Contracts\Validation\Validator;
 use FireflyIII\Rules\IsBoolean;
 use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use FireflyIII\User;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Facades\Log;
-use Illuminate\Validation\Validator;

 /**
 * Class UserUpdateRequest
--- a/app/Console/Commands/Correction/CorrectsAmounts.php
+++ b/app/Console/Commands/Correction/CorrectsAmounts.php
@@ -220,7 +220,7 @@ class CorrectsAmounts extends Command
        /** @var RuleTrigger $item */
        foreach ($set as $item) {
            $result = $this->fixRuleTrigger($item);
-            if (true === $result) {
+            if ($result) {
                ++$fixed;
            }
        }
--- a/app/Console/Commands/Correction/CorrectsCurrencies.php
+++ b/app/Console/Commands/Correction/CorrectsCurrencies.php
@@ -115,7 +115,7 @@ class CorrectsCurrencies extends Command
        $found           = array_values(
            array_filter(
                $found,
-                static fn (int $currencyId) => 0 !== $currencyId
+                static fn (int $currencyId): bool => 0 !== $currencyId
            )
        );

--- a/app/Console/Commands/Correction/CorrectsGroupInformation.php
+++ b/app/Console/Commands/Correction/CorrectsGroupInformation.php
@@ -55,10 +55,8 @@ class CorrectsGroupInformation extends Command

    /**
     * Execute the console command.
-     *
-     * @return int
     */
-    public function handle()
+    public function handle(): int
    {
        // objects: accounts, attachments, available budgets, bills, budgets, categories, currency_exchange_rates
        // recurrences, rule groups, rules, tags, transaction groups, transaction journals, webhooks
--- a/app/Console/Commands/Correction/CorrectsIbans.php
+++ b/app/Console/Commands/Correction/CorrectsIbans.php
@@ -93,25 +93,20 @@ class CorrectsIbans extends Command
            if (in_array($type, [AccountTypeEnum::LOAN->value, AccountTypeEnum::DEBT->value, AccountTypeEnum::MORTGAGE->value], true)) {
                $type = 'liabilities';
            }
-            if (array_key_exists($iban, $set[$userId])) {
-                // iban already in use! two exceptions exist:
-                if (
-                    !(AccountTypeEnum::EXPENSE->value === $set[$userId][$iban] && AccountTypeEnum::REVENUE->value === $type) // allowed combination
-                    && !(AccountTypeEnum::REVENUE->value === $set[$userId][$iban] && AccountTypeEnum::EXPENSE->value === $type) // also allowed combination.
-                ) {
-                    $this->friendlyWarning(
-                        sprintf(
-                            'IBAN "%s" is used more than once and will be removed from %s #%d ("%s")',
-                            $iban,
-                            $account->accountType->type,
-                            $account->id,
-                            $account->name
-                        )
-                    );
-                    $account->iban = null;
-                    $account->save();
-                    ++$this->count;
-                }
+            // iban already in use! two exceptions exist:
+            if (array_key_exists($iban, $set[$userId]) && (!AccountTypeEnum::EXPENSE->value === $set[$userId][$iban] && AccountTypeEnum::REVENUE->value === $type && !(AccountTypeEnum::REVENUE->value === $set[$userId][$iban] && AccountTypeEnum::EXPENSE->value === $type))) {
+                $this->friendlyWarning(
+                    sprintf(
+                        'IBAN "%s" is used more than once and will be removed from %s #%d ("%s")',
+                        $iban,
+                        $account->accountType->type,
+                        $account->id,
+                        $account->name
+                    )
+                );
+                $account->iban = null;
+                $account->save();
+                ++$this->count;
            }

            if (!array_key_exists($iban, $set[$userId])) {
--- a/app/Console/Commands/Correction/CorrectsPrimaryCurrencyAmounts.php
+++ b/app/Console/Commands/Correction/CorrectsPrimaryCurrencyAmounts.php
@@ -130,7 +130,7 @@ class CorrectsPrimaryCurrencyAmounts extends Command
        $repository->setUserGroup($userGroup);
        $set        = $repository->getPiggyBanks();
        $set        = $set->filter(
-            static fn (PiggyBank $piggyBank) => $currency->id !== $piggyBank->transaction_currency_id
+            static fn (PiggyBank $piggyBank): bool => $currency->id !== $piggyBank->transaction_currency_id
        );
        foreach ($set as $piggyBank) {
            $piggyBank->encrypted = false;
--- a/app/Console/Commands/Correction/CorrectsTransactionTypes.php
+++ b/app/Console/Commands/Correction/CorrectsTransactionTypes.php
@@ -53,7 +53,7 @@ class CorrectsTransactionTypes extends Command
        /** @var TransactionJournal $journal */
        foreach ($journals as $journal) {
            $fixed = $this->fixJournal($journal);
-            if (true === $fixed) {
+            if ($fixed) {
                ++$count;
            }
        }
@@ -115,7 +115,7 @@ class CorrectsTransactionTypes extends Command
    private function getSourceAccount(TransactionJournal $journal): Account
    {
        $collection  = $journal->transactions->filter(
-            static fn (Transaction $transaction) => $transaction->amount < 0
+            static fn (Transaction $transaction): bool => $transaction->amount < 0
        );
        if (0 === $collection->count()) {
            throw new FireflyException(sprintf('300001: Journal #%d has no source transaction.', $journal->id));
@@ -142,7 +142,7 @@ class CorrectsTransactionTypes extends Command
    private function getDestinationAccount(TransactionJournal $journal): Account
    {
        $collection  = $journal->transactions->filter(
-            static fn (Transaction $transaction) => $transaction->amount > 0
+            static fn (Transaction $transaction): bool => $transaction->amount > 0
        );
        if (0 === $collection->count()) {
            throw new FireflyException(sprintf('300004: Journal #%d has no destination transaction.', $journal->id));
--- a/app/Console/Commands/Correction/CorrectsUnevenAmount.php
+++ b/app/Console/Commands/Correction/CorrectsUnevenAmount.php
@@ -257,21 +257,14 @@ class CorrectsUnevenAmount extends Command
        // source currency = dest foreign currency
        // dest amount = source foreign currency
        // dest currency = source foreign currency
-
        //        Log::debug(sprintf('[a] %s', bccomp(app('steam')->positive($source->amount), app('steam')->positive($destination->foreign_amount))));
        //        Log::debug(sprintf('[b] %s', bccomp(app('steam')->positive($destination->amount), app('steam')->positive($source->foreign_amount))));
        //        Log::debug(sprintf('[c] %s', var_export($source->transaction_currency_id === $destination->foreign_currency_id,true)));
        //        Log::debug(sprintf('[d] %s', var_export((int) $destination->transaction_currency_id ===(int)  $source->foreign_currency_id, true)));
-
-        if (0 === bccomp(Steam::positive($source->amount), Steam::positive($destination->foreign_amount))
+        return 0 === bccomp(Steam::positive($source->amount), Steam::positive($destination->foreign_amount))
            && $source->transaction_currency_id === $destination->foreign_currency_id
            && 0 === bccomp(Steam::positive($destination->amount), Steam::positive($source->foreign_amount))
-            && (int) $destination->transaction_currency_id === (int) $source->foreign_currency_id
-        ) {
-            return true;
-        }
-
-        return false;
+            && (int) $destination->transaction_currency_id === (int) $source->foreign_currency_id;
    }

    private function matchCurrencies(): void
--- a/app/Console/Commands/Correction/RestoresOAuthKeys.php
+++ b/app/Console/Commands/Correction/RestoresOAuthKeys.php
@@ -56,7 +56,7 @@ class RestoresOAuthKeys extends Command
        }
        if ($this->keysInDatabase() && !$this->keysOnDrive()) {
            $result = $this->restoreKeysFromDB();
-            if (true === $result) {
+            if ($result) {
                $this->friendlyInfo('Restored OAuth keys from database.');

                return;
--- a/app/Console/Commands/Export/ExportsData.php
+++ b/app/Console/Commands/Export/ExportsData.php
@@ -206,7 +206,7 @@ class ExportsData extends Command
            $error = true;
        }

-        if (true === $error && 'start' === $field) {
+        if ($error && 'start' === $field) {
            $journal = $this->journalRepository->firstNull();
            $date    = $journal instanceof TransactionJournal ? $journal->date : today(config('app.timezone'))->subYear();
            $date->startOfDay();
@@ -214,7 +214,7 @@ class ExportsData extends Command
            return $date;
        }
        // field can only be 'end' at this point, so no need to include it in the check.
-        if (true === $error) {
+        if ($error) {
            $date = today(config('app.timezone'));
            $date->endOfDay();

--- a/app/Console/Commands/System/CreatesDatabase.php
+++ b/app/Console/Commands/System/CreatesDatabase.php
@@ -86,7 +86,7 @@ class CreatesDatabase extends Command
            $pdo->exec(sprintf('CREATE DATABASE `%s` CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;', env('DB_DATABASE')));
            $this->friendlyInfo(sprintf('Created database "%s"', env('DB_DATABASE')));
        }
-        if (true === $exists) {
+        if ($exists) {
            $this->friendlyInfo(sprintf('Database "%s" exists.', env('DB_DATABASE')));
        }

--- a/app/Console/Commands/System/ForcesDecimalSize.php
+++ b/app/Console/Commands/System/ForcesDecimalSize.php
@@ -132,11 +132,11 @@ class ForcesDecimalSize extends Command
    {
        // if sqlite, add function?
        if ('sqlite' === (string) config('database.default')) {
-            DB::connection()->getPdo()->sqliteCreateFunction('REGEXP', static function ($pattern, $value) {
+            DB::connection()->getPdo()->sqliteCreateFunction('REGEXP', static function ($pattern, $value): int {
                mb_regex_encoding('UTF-8');
                $pattern = trim($pattern, '"');

-                return (false !== mb_ereg($pattern, (string) $value)) ? 1 : 0;
+                return (mb_ereg($pattern, (string) $value)) ? 1 : 0;
            });
        }

--- a/app/Console/Commands/Tools/ApplyRules.php
+++ b/app/Console/Commands/Tools/ApplyRules.php
@@ -314,7 +314,7 @@ class ApplyRules extends Command
            foreach ($rules as $rule) {
                // if in rule selection, or group in selection or all rules, it's included.
                $test = $this->includeRule($rule, $group);
-                if (true === $test) {
+                if ($test) {
                    Log::debug(sprintf('Will include rule #%d "%s"', $rule->id, $rule->title));
                    $rulesToApply->push($rule);
                }
--- a/app/Console/Commands/Upgrade/UpgradesLiabilitiesEight.php
+++ b/app/Console/Commands/Upgrade/UpgradesLiabilitiesEight.php
@@ -136,11 +136,8 @@ class UpgradesLiabilitiesEight extends Command
        if (null === $liabilityJournal) {
            return false;
        }
-        if (!$openingJournal->date->isSameDay($liabilityJournal->date)) {
-            return false;
-        }

-        return true;
+        return (bool) $openingJournal->date->isSameDay($liabilityJournal->date);
    }

    private function deleteCreditTransaction(Account $account): void
--- a/app/Console/Commands/Upgrade/UpgradesTagLocations.php
+++ b/app/Console/Commands/Upgrade/UpgradesTagLocations.php
@@ -77,7 +77,7 @@ class UpgradesTagLocations extends Command

    private function hasLocationDetails(Tag $tag): bool
    {
-        return null !== $tag->latitude && null !== $tag->longitude && null !== $tag->zoomLevel;
+        return !in_array(null, [$tag->latitude, $tag->longitude, $tag->zoomLevel], true);
    }

    private function migrateLocationDetails(Tag $tag): void
--- a/app/Console/Commands/Upgrade/UpgradesToGroups.php
+++ b/app/Console/Commands/Upgrade/UpgradesToGroups.php
@@ -180,7 +180,7 @@ class UpgradesToGroups extends Command
    private function getDestinationTransactions(TransactionJournal $journal): Collection
    {
        return $journal->transactions->filter(
-            static fn (Transaction $transaction) => $transaction->amount > 0
+            static fn (Transaction $transaction): bool => $transaction->amount > 0
        );
    }

@@ -278,7 +278,7 @@ class UpgradesToGroups extends Command
    private function findOpposingTransaction(TransactionJournal $journal, Transaction $transaction): ?Transaction
    {
        $set = $journal->transactions->filter(
-            static function (Transaction $subject) use ($transaction) {
+            static function (Transaction $subject) use ($transaction): bool {
                $amount     = (float) $transaction->amount * -1 === (float) $subject->amount;  // intentional float
                $identifier = $transaction->identifier === $subject->identifier;
                Log::debug(sprintf('Amount the same? %s', var_export($amount, true)));
--- a/app/Console/Commands/Upgrade/UpgradesVariousCurrencyInformation.php
+++ b/app/Console/Commands/Upgrade/UpgradesVariousCurrencyInformation.php
@@ -211,7 +211,6 @@ class UpgradesVariousCurrencyInformation extends Command
                break;
        }

-        /** @var null|Transaction */
        return $lead;
    }

--- a/app/Console/Commands/Upgrade/UpgradesWebhooks.php
+++ b/app/Console/Commands/Upgrade/UpgradesWebhooks.php
@@ -84,7 +84,7 @@ class UpgradesWebhooks extends Command
        $delivery          = WebhookDelivery::tryFrom((int)$webhook->delivery);
        $response          = WebhookResponse::tryFrom((int)$webhook->response);
        $trigger           = WebhookTrigger::tryFrom((int)$webhook->trigger);
-        if (null === $delivery || null === $response || null === $trigger) {
+        if (in_array(null, [$delivery, $response, $trigger], true)) {
            $this->friendlyError(sprintf('[a] Webhook #%d has an invalid delivery, response or trigger value. Will not upgrade.', $webhook->id));

            return;
@@ -92,7 +92,7 @@ class UpgradesWebhooks extends Command
        $deliveryModel     = WebhookDeliveryModel::where('key', $delivery->value)->first();
        $responseModel     = WebhookResponseModel::where('key', $response->value)->first();
        $triggerModel      = WebhookTriggerModel::where('key', $trigger->value)->first();
-        if (null === $deliveryModel || null === $responseModel || null === $triggerModel) {
+        if (in_array(null, [$deliveryModel, $responseModel, $triggerModel], true)) {
            $this->friendlyError(sprintf('[b] Webhook #%d has an invalid delivery, response or trigger model. Will not upgrade.', $webhook->id));

            return;
--- a/app/Events/RequestedReportOnJournals.php
+++ b/app/Events/RequestedReportOnJournals.php
@@ -50,10 +50,8 @@ class RequestedReportOnJournals

    /**
     * Get the channels the event should broadcast on.
-     *
-     * @return PrivateChannel
     */
-    public function broadcastOn()
+    public function broadcastOn(): PrivateChannel
    {
        return new PrivateChannel('channel-name');
    }
--- a/app/Exceptions/GracefulNotFoundHandler.php
+++ b/app/Exceptions/GracefulNotFoundHandler.php
@@ -194,7 +194,7 @@ class GracefulNotFoundHandler extends ExceptionHandler
        $user    = auth()->user();
        $route   = $request->route();
        $param   = $route->parameter('transactionGroup');
-        $groupId = !is_object($param) ? (int) $param : 0;
+        $groupId = is_object($param) ? 0 : (int) $param;

        /** @var null|TransactionGroup $group */
        $group   = $user->transactionGroups()->withTrashed()->find($groupId);
--- a/app/Exceptions/Handler.php
+++ b/app/Exceptions/Handler.php
@@ -274,7 +274,7 @@ class Handler extends ExceptionHandler
    {
        return null !== Arr::first(
            $this->dontReport,
-            static fn ($type) => $e instanceof $type
+            static fn ($type): bool => $e instanceof $type
        );
    }

--- a/app/Exceptions/IntervalException.php
+++ b/app/Exceptions/IntervalException.php
@@ -33,17 +33,15 @@ use Throwable;
 */
 final class IntervalException extends Exception
 {
-    public array       $availableIntervals;
-    public Periodicity $periodicity;
+    public array       $availableIntervals = [];
+    public Periodicity $periodicity        = Periodicity::Monthly;

    /** @var mixed */
-    protected $message = 'The periodicity %s is unknown. Choose one of available periodicity: %s';
+    protected $message                     = 'The periodicity %s is unknown. Choose one of available periodicity: %s';

    public function __construct(string $message = '', int $code = 0, ?Throwable $previous = null)
    {
        parent::__construct($message, $code, $previous);
-        $this->availableIntervals = [];
-        $this->periodicity        = Periodicity::Monthly;
    }

    public static function unavailable(
--- a/app/Factory/AccountFactory.php
+++ b/app/Factory/AccountFactory.php
@@ -130,7 +130,7 @@ class AccountFactory
    protected function getAccountType(array $data): ?AccountType
    {
        $accountTypeId   = array_key_exists('account_type_id', $data) ? (int) $data['account_type_id'] : 0;
-        $accountTypeName = array_key_exists('account_type_name', $data) ? $data['account_type_name'] : null;
+        $accountTypeName = $data['account_type_name'] ?? null;
        $result          = null;
        // find by name or ID
        if ($accountTypeId > 0) {
@@ -174,7 +174,7 @@ class AccountFactory
        $this->accountRepository->resetAccountOrder();

        // create it:
-        $virtualBalance = array_key_exists('virtual_balance', $data) ? $data['virtual_balance'] : null;
+        $virtualBalance = $data['virtual_balance'] ?? null;
        $active         = array_key_exists('active', $data) ? $data['active'] : true;
        $databaseData   = [
            'user_id'         => $this->user->id,
--- a/app/Factory/AttachmentFactory.php
+++ b/app/Factory/AttachmentFactory.php
@@ -44,8 +44,8 @@ class AttachmentFactory
    public function create(array $data): ?Attachment
    {
        // append if necessary.
-        $model      = !str_contains((string) $data['attachable_type'], 'FireflyIII') ? sprintf('FireflyIII\Models\%s', $data['attachable_type'])
-            : $data['attachable_type'];
+        $model      = str_contains((string) $data['attachable_type'], 'FireflyIII') ? $data['attachable_type']
+            : sprintf('FireflyIII\Models\%s', $data['attachable_type']);

        // get journal instead of transaction.
        if (Transaction::class === $model) {
--- a/app/Factory/TagFactory.php
+++ b/app/Factory/TagFactory.php
@@ -89,7 +89,7 @@ class TagFactory

        /** @var null|Tag $tag */
        $tag       = Tag::create($array);
-        if (null !== $tag && null !== $latitude && null !== $longitude) {
+        if (!in_array(null, [$tag, $latitude, $longitude], true)) {
            // create location object.
            $location             = new Location();
            $location->latitude   = $latitude;
--- a/app/Factory/TransactionFactory.php
+++ b/app/Factory/TransactionFactory.php
@@ -41,20 +41,11 @@ use Illuminate\Support\Facades\Log;
 class TransactionFactory
 {
    private Account              $account;
-    private array                $accountInformation;
+    private array                $accountInformation = [];
    private TransactionCurrency  $currency;
-    private ?TransactionCurrency $foreignCurrency = null;
+    private ?TransactionCurrency $foreignCurrency    = null;
    private TransactionJournal   $journal;
-    private bool                 $reconciled;
-
-    /**
-     * Constructor.
-     */
-    public function __construct()
-    {
-        $this->reconciled         = false;
-        $this->accountInformation = [];
-    }
+    private bool                 $reconciled         = false;

    /**
     * Create transaction with negative amount (for source accounts).
--- a/app/Factory/TransactionJournalFactory.php
+++ b/app/Factory/TransactionJournalFactory.php
@@ -71,7 +71,7 @@ class TransactionJournalFactory
    private AccountValidator                   $accountValidator;
    private BillRepositoryInterface            $billRepository;
    private CurrencyRepositoryInterface        $currencyRepository;
-    private bool                               $errorOnHash;
+    private bool                               $errorOnHash = false;
    private array                              $fields;
    private PiggyBankEventFactory              $piggyEventFactory;
    private PiggyBankRepositoryInterface       $piggyRepository;
@@ -86,7 +86,6 @@ class TransactionJournalFactory
     */
    public function __construct()
    {
-        $this->errorOnHash        = false;
        $this->fields             = config('firefly.journal_meta_fields');
        $this->currencyRepository = app(CurrencyRepositoryInterface::class);
        $this->typeRepository     = app(TransactionTypeRepositoryInterface::class);
@@ -237,7 +236,7 @@ class TransactionJournalFactory
        Log::debug('Done with getAccount(2x)');

        // there is a safety catch here. If either account is NULL, they will be replaced with the cash account.
-        if (null === $destinationAccount) {
+        if (!$destinationAccount instanceof Account) {
            Log::warning('Destination account is NULL, will replace with cash account.');
            $destinationAccount = $this->accountRepository->getCashAccount();
        }
@@ -615,7 +614,7 @@ class TransactionJournalFactory

    private function storeLocation(TransactionJournal $journal, NullArrayObject $data): void
    {
-        if (null !== $data['longitude'] && null !== $data['latitude'] && null !== $data['zoom_level']) {
+        if (!in_array(null, [$data['longitude'], $data['latitude'], $data['zoom_level']], true)) {
            $location             = new Location();
            $location->longitude  = $data['longitude'];
            $location->latitude   = $data['latitude'];
@@ -628,7 +627,7 @@ class TransactionJournalFactory
    public function setErrorOnHash(bool $errorOnHash): void
    {
        $this->errorOnHash = $errorOnHash;
-        if (true === $errorOnHash) {
+        if ($errorOnHash) {
            Log::info('Will trigger duplication alert for this journal.');
        }
    }
--- a/app/Generator/Report/Account/MonthReportGenerator.php
+++ b/app/Generator/Report/Account/MonthReportGenerator.php
@@ -53,7 +53,7 @@ class MonthReportGenerator implements ReportGeneratorInterface
        $preferredPeriod = $this->preferredPeriod();

        try {
-            $result = view('reports.double.report', compact('accountIds', 'reportType', 'doubleIds', 'preferredPeriod'))
+            $result = view('reports.double.report', ['accountIds' => $accountIds, 'reportType' => $reportType, 'doubleIds' => $doubleIds, 'preferredPeriod' => $preferredPeriod])
                ->with('start', $this->start)->with('end', $this->end)
                ->with('doubles', $this->expense)
                ->render()
--- a/app/Generator/Report/Audit/MonthReportGenerator.php
+++ b/app/Generator/Report/Audit/MonthReportGenerator.php
@@ -100,7 +100,7 @@ class MonthReportGenerator implements ReportGeneratorInterface
        ];

        try {
-            $result = view('reports.audit.report', compact('reportType', 'accountIds', 'auditData', 'hideable', 'defaultShow'))
+            $result = view('reports.audit.report', ['reportType' => $reportType, 'accountIds' => $accountIds, 'auditData' => $auditData, 'hideable' => $hideable, 'defaultShow' => $defaultShow])
                ->with('start', $this->start)->with('end', $this->end)->with('accounts', $this->accounts)
                ->render()
            ;
--- a/app/Generator/Report/Budget/MonthReportGenerator.php
+++ b/app/Generator/Report/Budget/MonthReportGenerator.php
@@ -41,17 +41,9 @@ class MonthReportGenerator implements ReportGeneratorInterface
    private Collection $accounts;
    private Collection $budgets;
    private Carbon     $end;
-    private array      $expenses;
+    private array      $expenses = [];
    private Carbon     $start;

-    /**
-     * MonthReportGenerator constructor.
-     */
-    public function __construct()
-    {
-        $this->expenses = [];
-    }
-
    /**
     * Generates the report.
     *
@@ -65,7 +57,7 @@ class MonthReportGenerator implements ReportGeneratorInterface
        try {
            $result = view(
                'reports.budget.month',
-                compact('accountIds', 'budgetIds')
+                ['accountIds' => $accountIds, 'budgetIds' => $budgetIds]
            )
                ->with('start', $this->start)->with('end', $this->end)
                ->with('budgets', $this->budgets)
--- a/app/Generator/Report/Category/MonthReportGenerator.php
+++ b/app/Generator/Report/Category/MonthReportGenerator.php
@@ -41,19 +41,10 @@ class MonthReportGenerator implements ReportGeneratorInterface
    private Collection $accounts;
    private Collection $categories;
    private Carbon     $end;
-    private array      $expenses;
-    private array      $income;
+    private array      $expenses = [];
+    private array      $income   = [];
    private Carbon     $start;

-    /**
-     * MonthReportGenerator constructor.
-     */
-    public function __construct()
-    {
-        $this->income   = [];
-        $this->expenses = [];
-    }
-
    /**
     * Generates the report.
     *
@@ -67,7 +58,7 @@ class MonthReportGenerator implements ReportGeneratorInterface

        // render!
        try {
-            return view('reports.category.month', compact('accountIds', 'categoryIds', 'reportType'))
+            return view('reports.category.month', ['accountIds' => $accountIds, 'categoryIds' => $categoryIds, 'reportType' => $reportType])
                ->with('start', $this->start)->with('end', $this->end)
                ->with('categories', $this->categories)
                ->with('accounts', $this->accounts)
--- a/app/Generator/Report/Standard/MonthReportGenerator.php
+++ b/app/Generator/Report/Standard/MonthReportGenerator.php
@@ -36,13 +36,13 @@ use Illuminate\Support\Facades\Log;
 class MonthReportGenerator implements ReportGeneratorInterface
 {
    /** @var Collection The accounts involved in the report. */
-    private $accounts;
+    private ?Collection $accounts = null;

    /** @var Carbon The end date. */
-    private $end;
+    private ?Carbon $end          = null;

    /** @var Carbon The start date. */
-    private $start;
+    private ?Carbon $start        = null;

    /**
     * Generates the report.
@@ -55,7 +55,7 @@ class MonthReportGenerator implements ReportGeneratorInterface
        $reportType = 'default';

        try {
-            return view('reports.default.month', compact('accountIds', 'reportType'))->with('start', $this->start)->with('end', $this->end)->render();
+            return view('reports.default.month', ['accountIds' => $accountIds, 'reportType' => $reportType])->with('start', $this->start)->with('end', $this->end)->render();
        } catch (Throwable $e) {
            Log::error(sprintf('Cannot render reports.default.month: %s', $e->getMessage()));
            Log::error($e->getTraceAsString());
--- a/app/Generator/Report/Standard/MultiYearReportGenerator.php
+++ b/app/Generator/Report/Standard/MultiYearReportGenerator.php
@@ -36,13 +36,13 @@ use Illuminate\Support\Facades\Log;
 class MultiYearReportGenerator implements ReportGeneratorInterface
 {
    /** @var Collection The accounts involved. */
-    private $accounts;
+    private ?Collection $accounts = null;

    /** @var Carbon The end date. */
-    private $end;
+    private ?Carbon $end          = null;

    /** @var Carbon The start date. */
-    private $start;
+    private ?Carbon $start        = null;

    /**
     * Generates the report.
@@ -58,7 +58,7 @@ class MultiYearReportGenerator implements ReportGeneratorInterface
        try {
            return view(
                'reports.default.multi-year',
-                compact('accountIds', 'reportType')
+                ['accountIds' => $accountIds, 'reportType' => $reportType]
            )->with('start', $this->start)->with('end', $this->end)->render();
        } catch (Throwable $e) {
            Log::error(sprintf('Cannot render reports.default.multi-year: %s', $e->getMessage()));
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
github-actions[bot]	c43162727f	Merge pull request #11202 from firefly-iii/release-1762676397 🤖 Automatically merge the PR into the develop branch.	2025-11-09 09:20:04 +01:00
JC5	db0c7e4d9a	🤖 Auto commit for release 'develop' on 2025-11-09	2025-11-09 09:19:57 +01:00
James Cole	57ea24e73d	Fix trait compatibility.	2025-11-09 09:15:29 +01:00
github-actions[bot]	e7fe6fdd3a	Merge pull request #11201 from firefly-iii/release-1762675915 🤖 Automatically merge the PR into the develop branch.	2025-11-09 09:12:04 +01:00
JC5	a498169148	🤖 Auto commit for release 'develop' on 2025-11-09	2025-11-09 09:11:55 +01:00
James Cole	68183a0a0e	Fix code quality with rector [skip ci]	2025-11-09 09:08:03 +01:00
James Cole	d2610be790	Fix code quality with rector [skip ci]	2025-11-09 09:07:14 +01:00
James Cole	38691d6fdf	Fix code quality with rector [skip ci]	2025-11-09 09:06:11 +01:00