🤖 Auto commit for release 'develop' on 2025-05-24

2025-12-12 01:42:32 +00:00 · 2025-05-24 06:24:17 +02:00
parent 1ec5ee08aa
commit 63d051d9ba
63 changed files with 203 additions and 279 deletions
--- a/app/Http/Controllers/Auth/ForgotPasswordController.php
+++ b/app/Http/Controllers/Auth/ForgotPasswordController.php
@@ -23,7 +23,6 @@ declare(strict_types=1);

 namespace FireflyIII\Http\Controllers\Auth;

-use function Safe\parse_url;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Repositories\User\UserRepositoryInterface;
@@ -35,6 +34,8 @@ use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Log;
 use Illuminate\View\View;

+use function Safe\parse_url;
+
 /**
 * Class ForgotPasswordController
 */
--- a/app/Http/Controllers/Chart/AccountController.php
+++ b/app/Http/Controllers/Chart/AccountController.php
@@ -23,7 +23,6 @@ declare(strict_types=1);

 namespace FireflyIII\Http\Controllers\Chart;

-use function Safe\json_encode;
 use Carbon\Carbon;
 use FireflyIII\Enums\AccountTypeEnum;
 use FireflyIII\Enums\TransactionTypeEnum;
@@ -44,6 +43,8 @@ use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Log;

+use function Safe\json_encode;
+
 /**
 * Class AccountController.
 */
--- a/app/Http/Controllers/DebugController.php
+++ b/app/Http/Controllers/DebugController.php
@@ -24,8 +24,6 @@ declare(strict_types=1);

 namespace FireflyIII\Http\Controllers;

-use function Safe\file_get_contents;
-use function Safe\ini_get;
 use Carbon\Carbon;
 use Exception;
 use FireflyIII\Enums\AccountTypeEnum;
@@ -52,6 +50,9 @@ use Illuminate\View\View;
 use Monolog\Handler\RotatingFileHandler;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;

+use function Safe\file_get_contents;
+use function Safe\ini_get;
+
 /**
 * Class DebugController
 */
@@ -110,7 +111,7 @@ class DebugController extends Controller

        try {
            Artisan::call('twig:clean');
-        } catch (Exception $e) {  // intentional generic exception
+        } catch (\Exception $e) {  // intentional generic exception
            throw new FireflyException($e->getMessage(), 0, $e);
        }

@@ -202,7 +203,7 @@ class DebugController extends Controller
                $return['build'] = trim((string) file_get_contents('/var/www/counter-main.txt'));
                app('log')->debug(sprintf('build is now "%s"', $return['build']));
            }
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
            app('log')->debug('Could not check build counter, but thats ok.');
            app('log')->warning($e->getMessage());
        }
@@ -211,7 +212,7 @@ class DebugController extends Controller
            if (file_exists('/var/www/build-date-main.txt')) {
                $return['build_date'] = trim((string) file_get_contents('/var/www/build-date-main.txt'));
            }
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
            app('log')->debug('Could not check build date, but thats ok.');
            app('log')->warning($e->getMessage());
        }
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -23,7 +23,6 @@ declare(strict_types=1);

 namespace FireflyIII\Http\Controllers;

-use Exception;
 use Carbon\Carbon;
 use Carbon\Exceptions\InvalidFormatException;
 use FireflyIII\Enums\AccountTypeEnum;
@@ -58,7 +57,7 @@ class HomeController extends Controller
    /**
     * Change index date range.
     *
-     * @throws Exception
+     * @throws \Exception
     */
    public function dateRange(Request $request): JsonResponse
    {
--- a/app/Http/Controllers/Json/FrontpageController.php
+++ b/app/Http/Controllers/Json/FrontpageController.php
@@ -23,7 +23,6 @@ declare(strict_types=1);

 namespace FireflyIII\Http\Controllers\Json;

-use Throwable;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\PiggyBank;
@@ -90,7 +89,7 @@ class FrontpageController extends Controller
        if (0 !== count($info)) {
            try {
                $html = view('json.piggy-banks', compact('info', 'convertToNative', 'native'))->render();
-            } catch (Throwable $e) {
+            } catch (\Throwable $e) {
                app('log')->error(sprintf('Cannot render json.piggy-banks: %s', $e->getMessage()));
                app('log')->error($e->getTraceAsString());
                $html = 'Could not render view.';
--- a/app/Http/Controllers/Json/ReconcileController.php
+++ b/app/Http/Controllers/Json/ReconcileController.php
@@ -24,7 +24,6 @@ declare(strict_types=1);

 namespace FireflyIII\Http\Controllers\Json;

-use Throwable;
 use Carbon\Carbon;
 use FireflyIII\Enums\TransactionTypeEnum;
 use FireflyIII\Exceptions\FireflyException;
@@ -131,7 +130,7 @@ class ReconcileController extends Controller

        try {
            $view = view('accounts.reconcile.overview', compact('account', 'start', 'diffCompare', 'difference', 'end', 'clearedAmount', 'startBalance', 'endBalance', 'amount', 'route', 'countCleared', 'reconSum', 'selectedIds'))->render();
-        } catch (Throwable $e) {
+        } catch (\Throwable $e) {
            app('log')->debug(sprintf('View error: %s', $e->getMessage()));
            app('log')->error($e->getTraceAsString());
            $view = sprintf('Could not render accounts.reconcile.overview: %s', $e->getMessage());
@@ -229,7 +228,7 @@ class ReconcileController extends Controller
                'accounts.reconcile.transactions',
                compact('account', 'journals', 'currency', 'start', 'end', 'selectionStart', 'selectionEnd')
            )->render();
-        } catch (Throwable $e) {
+        } catch (\Throwable $e) {
            app('log')->debug(sprintf('Could not render: %s', $e->getMessage()));
            app('log')->error($e->getTraceAsString());
            $html = sprintf('Could not render accounts.reconcile.transactions: %s', $e->getMessage());
--- a/app/Http/Controllers/Json/RuleController.php
+++ b/app/Http/Controllers/Json/RuleController.php
@@ -24,7 +24,6 @@ declare(strict_types=1);

 namespace FireflyIII\Http\Controllers\Json;

-use Throwable;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Http\Controllers\Controller;
 use Illuminate\Http\JsonResponse;
@@ -51,7 +50,7 @@ class RuleController extends Controller

        try {
            $view = view('rules.partials.action', compact('actions', 'count'))->render();
-        } catch (Throwable $e) {
+        } catch (\Throwable $e) {
            app('log')->error(sprintf('Cannot render rules.partials.action: %s', $e->getMessage()));
            app('log')->error($e->getTraceAsString());
            $view = 'Could not render view.';
@@ -81,7 +80,7 @@ class RuleController extends Controller

        try {
            $view = view('rules.partials.trigger', compact('triggers', 'count'))->render();
-        } catch (Throwable $e) {
+        } catch (\Throwable $e) {
            app('log')->error(sprintf('Cannot render rules.partials.trigger: %s', $e->getMessage()));
            app('log')->error($e->getTraceAsString());
            $view = 'Could not render view.';
--- a/app/Http/Controllers/PreferencesController.php
+++ b/app/Http/Controllers/PreferencesController.php
@@ -24,10 +24,6 @@ declare(strict_types=1);
 namespace FireflyIII\Http\Controllers;

 use Carbon\Carbon;
-use JsonException;
-use function Safe\json_decode;
-use function Safe\file_get_contents;
-use function Safe\strtotime;
 use FireflyIII\Enums\AccountTypeEnum;
 use FireflyIII\Events\Preferences\UserGroupChangedDefaultCurrency;
 use FireflyIII\Events\Test\UserTestNotificationChannel;
@@ -45,6 +41,10 @@ use Illuminate\Routing\Redirector;
 use Illuminate\Support\Facades\Log;
 use Illuminate\View\View;

+use function Safe\json_decode;
+use function Safe\file_get_contents;
+use function Safe\strtotime;
+
 /**
 * Class PreferencesController.
 */
@@ -155,7 +155,7 @@ class PreferencesController extends Controller

        try {
            $locales = json_decode((string) file_get_contents(resource_path(sprintf('locales/%s/locales.json', $language))), true, 512, JSON_THROW_ON_ERROR);
-        } catch (JsonException $e) {
+        } catch (\JsonException $e) {
            app('log')->error($e->getMessage());
            $locales = [];
        }
--- a/app/Http/Controllers/Profile/MfaController.php
+++ b/app/Http/Controllers/Profile/MfaController.php
@@ -25,8 +25,6 @@ declare(strict_types=1);
 namespace FireflyIII\Http\Controllers\Profile;

 use Carbon\Carbon;
-use Cookie;
-use Google2FA;
 use FireflyIII\Events\Security\DisabledMFA;
 use FireflyIII\Events\Security\EnabledMFA;
 use FireflyIII\Events\Security\MFANewBackupCodes;
@@ -184,7 +182,7 @@ class MfaController extends Controller

        // also logout current 2FA tokens.
        $cookieName = config('google2fa.cookie_name', 'google2fa_token');
-        Cookie::forget($cookieName);
+        \Cookie::forget($cookieName);

        // send user notification.
        Log::channel('audit')->info(sprintf('User "%s" has disabled MFA', $user->email));
@@ -217,8 +215,8 @@ class MfaController extends Controller
        }

        $domain     = $this->getDomain();
-        $secret     = Google2FA::generateSecretKey();
-        $image      = Google2FA::getQRCodeInline($domain, auth()->user()->email, $secret);
+        $secret     = \Google2FA::generateSecretKey();
+        $image      = \Google2FA::getQRCodeInline($domain, auth()->user()->email, $secret);

        app('preferences')->set('temp-mfa-secret', $secret);

@@ -274,7 +272,7 @@ class MfaController extends Controller

        // make sure MFA is logged out.
        if ('testing' !== config('app.env')) {
-            Google2FA::logout();
+            \Google2FA::logout();
        }

        // drop all info from session:
--- a/app/Http/Controllers/ProfileController.php
+++ b/app/Http/Controllers/ProfileController.php
@@ -23,9 +23,6 @@ declare(strict_types=1);

 namespace FireflyIII\Http\Controllers;

-use Auth;
-use Hash;
-use Exception;
 use FireflyIII\Events\UserChangedEmail;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Exceptions\ValidationException;
@@ -206,7 +203,7 @@ class ProfileController extends Controller
        $existing = $repository->findByEmail($newEmail);
        if ($existing instanceof User) {
            // force user logout.
-            Auth::guard()->logout(); // @phpstan-ignore-line (does not recognize function)
+            \Auth::guard()->logout(); // @phpstan-ignore-line (does not recognize function)
            $request->session()->invalidate();

            session()->flash('success', (string) trans('firefly.email_changed'));
@@ -220,7 +217,7 @@ class ProfileController extends Controller
        event(new UserChangedEmail($user, $newEmail, $oldEmail));

        // force user logout.
-        Auth::guard()->logout(); // @phpstan-ignore-line (does not recognize function)
+        \Auth::guard()->logout(); // @phpstan-ignore-line (does not recognize function)
        $request->session()->invalidate();
        session()->flash('success', (string) trans('firefly.email_changed'));

@@ -313,7 +310,7 @@ class ProfileController extends Controller
            return redirect(route('profile.index'));
        }

-        if (!Hash::check($request->get('password'), auth()->user()->password)) {
+        if (!\Hash::check($request->get('password'), auth()->user()->password)) {
            session()->flash('error', (string) trans('firefly.invalid_password'));

            return redirect(route('profile.delete-account'));
@@ -346,8 +343,8 @@ class ProfileController extends Controller
            'email'    => auth()->user()->email,
            'password' => $request->get('password'),
        ];
-        if (Auth::once($creds)) {
-            Auth::logoutOtherDevices($request->get('password'));
+        if (\Auth::once($creds)) {
+            \Auth::logoutOtherDevices($request->get('password'));
            session()->flash('info', (string) trans('firefly.other_sessions_logged_out'));

            return redirect(route('profile.index'));
@@ -362,7 +359,7 @@ class ProfileController extends Controller
     *
     * @return Redirector|RedirectResponse
     *
-     * @throws Exception
+     * @throws \Exception
     */
    public function regenerate(Request $request)
    {
--- a/app/Http/Controllers/Report/AccountController.php
+++ b/app/Http/Controllers/Report/AccountController.php
@@ -23,7 +23,6 @@ declare(strict_types=1);

 namespace FireflyIII\Http\Controllers\Report;

-use Throwable;
 use Carbon\Carbon;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Http\Controllers\Controller;
@@ -59,7 +58,7 @@ class AccountController extends Controller

        try {
            $result = view('reports.partials.accounts', compact('accountReport'))->render();
-        } catch (Throwable $e) {
+        } catch (\Throwable $e) {
            app('log')->error(sprintf('Could not render reports.partials.accounts: %s', $e->getMessage()));
            app('log')->error($e->getTraceAsString());
            $result = 'Could not render view.';
--- a/app/Http/Controllers/Report/BalanceController.php
+++ b/app/Http/Controllers/Report/BalanceController.php
@@ -23,7 +23,6 @@ declare(strict_types=1);

 namespace FireflyIII\Http\Controllers\Report;

-use Throwable;
 use Carbon\Carbon;
 use FireflyIII\Enums\TransactionTypeEnum;
 use FireflyIII\Exceptions\FireflyException;
@@ -141,7 +140,7 @@ class BalanceController extends Controller

        try {
            $result = view('reports.partials.balance', compact('report'))->render();
-        } catch (Throwable $e) {
+        } catch (\Throwable $e) {
            app('log')->error(sprintf('Could not render reports.partials.balance: %s', $e->getMessage()));
            app('log')->error($e->getTraceAsString());
            $result = 'Could not render view.';
--- a/app/Http/Controllers/Report/BillController.php
+++ b/app/Http/Controllers/Report/BillController.php
@@ -24,7 +24,6 @@ declare(strict_types=1);

 namespace FireflyIII\Http\Controllers\Report;

-use Throwable;
 use Carbon\Carbon;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Helpers\Report\ReportHelperInterface;
@@ -59,7 +58,7 @@ class BillController extends Controller

        try {
            $result = view('reports.partials.bills', compact('report'))->render();
-        } catch (Throwable $e) {
+        } catch (\Throwable $e) {
            app('log')->error(sprintf('Could not render reports.partials.budgets: %s', $e->getMessage()));
            app('log')->error($e->getTraceAsString());
            $result = 'Could not render view.';
--- a/app/Http/Controllers/Report/BudgetController.php
+++ b/app/Http/Controllers/Report/BudgetController.php
@@ -23,7 +23,6 @@ declare(strict_types=1);

 namespace FireflyIII\Http\Controllers\Report;

-use Throwable;
 use Carbon\Carbon;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Http\Controllers\Controller;
@@ -177,7 +176,7 @@ class BudgetController extends Controller

        try {
            $result = view('reports.budget.partials.avg-expenses', compact('result'))->render();
-        } catch (Throwable $e) {
+        } catch (\Throwable $e) {
            app('log')->error(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
            $result = sprintf('Could not render view: %s', $e->getMessage());
            app('log')->error($e->getTraceAsString());
@@ -327,7 +326,7 @@ class BudgetController extends Controller

        try {
            $result = view('reports.partials.budget-period', compact('report', 'periods'))->render();
-        } catch (Throwable $e) {
+        } catch (\Throwable $e) {
            app('log')->error(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
            app('log')->error($e->getTraceAsString());
            $result = 'Could not render view.';
@@ -378,7 +377,7 @@ class BudgetController extends Controller

        try {
            $result = view('reports.budget.partials.top-expenses', compact('result'))->render();
-        } catch (Throwable $e) {
+        } catch (\Throwable $e) {
            app('log')->error(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
            $result = sprintf('Could not render view: %s', $e->getMessage());

--- a/app/Http/Controllers/Report/CategoryController.php
+++ b/app/Http/Controllers/Report/CategoryController.php
@@ -23,7 +23,6 @@ declare(strict_types=1);

 namespace FireflyIII\Http\Controllers\Report;

-use Throwable;
 use Carbon\Carbon;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Http\Controllers\Controller;
@@ -296,7 +295,7 @@ class CategoryController extends Controller

        try {
            $result = view('reports.category.partials.avg-expenses', compact('result'))->render();
-        } catch (Throwable $e) {
+        } catch (\Throwable $e) {
            app('log')->error(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
            $result = sprintf('Could not render view: %s', $e->getMessage());

@@ -346,7 +345,7 @@ class CategoryController extends Controller

        try {
            $result = view('reports.category.partials.avg-income', compact('result'))->render();
-        } catch (Throwable $e) {
+        } catch (\Throwable $e) {
            app('log')->error(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
            $result = sprintf('Could not render view: %s', $e->getMessage());

@@ -528,7 +527,7 @@ class CategoryController extends Controller

        try {
            $result = view('reports.partials.category-period', compact('report', 'periods'))->render();
-        } catch (Throwable $e) {
+        } catch (\Throwable $e) {
            app('log')->error(sprintf('Could not render category::expenses: %s', $e->getMessage()));
            $result = sprintf('An error prevented Firefly III from rendering: %s. Apologies.', $e->getMessage());

@@ -600,7 +599,7 @@ class CategoryController extends Controller

        try {
            $result = view('reports.partials.category-period', compact('report', 'periods'))->render();
-        } catch (Throwable $e) {
+        } catch (\Throwable $e) {
            app('log')->error(sprintf('Could not render category::expenses: %s', $e->getMessage()));
            $result = sprintf('An error prevented Firefly III from rendering: %s. Apologies.', $e->getMessage());

@@ -640,7 +639,7 @@ class CategoryController extends Controller
        try {
            $result = view('reports.partials.categories', compact('report'))->render();
            $cache->store($result);
-        } catch (Throwable $e) {
+        } catch (\Throwable $e) {
            app('log')->error(sprintf('Could not render category::expenses: %s', $e->getMessage()));
            $result = sprintf('An error prevented Firefly III from rendering: %s. Apologies.', $e->getMessage());

@@ -688,7 +687,7 @@ class CategoryController extends Controller

        try {
            $result = view('reports.category.partials.top-expenses', compact('result'))->render();
-        } catch (Throwable $e) {
+        } catch (\Throwable $e) {
            app('log')->debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
            $result = sprintf('Could not render view: %s', $e->getMessage());

@@ -736,7 +735,7 @@ class CategoryController extends Controller

        try {
            $result = view('reports.category.partials.top-income', compact('result'))->render();
-        } catch (Throwable $e) {
+        } catch (\Throwable $e) {
            app('log')->debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
            $result = sprintf('Could not render view: %s', $e->getMessage());

--- a/app/Http/Controllers/Report/DoubleController.php
+++ b/app/Http/Controllers/Report/DoubleController.php
@@ -23,7 +23,6 @@ declare(strict_types=1);

 namespace FireflyIII\Http\Controllers\Report;

-use Throwable;
 use Carbon\Carbon;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Http\Controllers\Controller;
@@ -103,7 +102,7 @@ class DoubleController extends Controller

        try {
            $result = view('reports.double.partials.avg-expenses', compact('result'))->render();
-        } catch (Throwable $e) {
+        } catch (\Throwable $e) {
            app('log')->error(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
            $result = sprintf('Could not render view: %s', $e->getMessage());

@@ -153,7 +152,7 @@ class DoubleController extends Controller

        try {
            $result = view('reports.double.partials.avg-income', compact('result'))->render();
-        } catch (Throwable $e) {
+        } catch (\Throwable $e) {
            app('log')->error(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
            $result = sprintf('Could not render view: %s', $e->getMessage());

@@ -430,7 +429,7 @@ class DoubleController extends Controller

        try {
            $result = view('reports.double.partials.top-expenses', compact('result'))->render();
-        } catch (Throwable $e) {
+        } catch (\Throwable $e) {
            app('log')->error(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
            $result = sprintf('Could not render view: %s', $e->getMessage());

@@ -478,7 +477,7 @@ class DoubleController extends Controller

        try {
            $result = view('reports.double.partials.top-income', compact('result'))->render();
-        } catch (Throwable $e) {
+        } catch (\Throwable $e) {
            app('log')->error(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
            $result = sprintf('Could not render view: %s', $e->getMessage());

--- a/app/Http/Controllers/Report/OperationsController.php
+++ b/app/Http/Controllers/Report/OperationsController.php
@@ -23,7 +23,6 @@ declare(strict_types=1);

 namespace FireflyIII\Http\Controllers\Report;

-use Throwable;
 use Carbon\Carbon;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Http\Controllers\Controller;
@@ -79,7 +78,7 @@ class OperationsController extends Controller

        try {
            $result = view('reports.partials.income-expenses', compact('report', 'type'))->render();
-        } catch (Throwable $e) {
+        } catch (\Throwable $e) {
            app('log')->error(sprintf('Could not render reports.partials.income-expense: %s', $e->getMessage()));
            app('log')->error($e->getTraceAsString());
            $result = 'Could not render view.';
@@ -113,7 +112,7 @@ class OperationsController extends Controller

        try {
            $result = view('reports.partials.income-expenses', compact('report', 'type'))->render();
-        } catch (Throwable $e) {
+        } catch (\Throwable $e) {
            app('log')->error(sprintf('Could not render reports.partials.income-expenses: %s', $e->getMessage()));
            app('log')->error($e->getTraceAsString());
            $result = 'Could not render view.';
@@ -168,7 +167,7 @@ class OperationsController extends Controller

        try {
            $result = view('reports.partials.operations', compact('sums'))->render();
-        } catch (Throwable $e) {
+        } catch (\Throwable $e) {
            app('log')->error(sprintf('Could not render reports.partials.operations: %s', $e->getMessage()));
            app('log')->error($e->getTraceAsString());
            $result = 'Could not render view.';
--- a/app/Http/Controllers/Report/TagController.php
+++ b/app/Http/Controllers/Report/TagController.php
@@ -24,7 +24,6 @@ declare(strict_types=1);

 namespace FireflyIII\Http\Controllers\Report;

-use Throwable;
 use Carbon\Carbon;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Http\Controllers\Controller;
@@ -293,7 +292,7 @@ class TagController extends Controller

        try {
            $result = view('reports.tag.partials.avg-expenses', compact('result'))->render();
-        } catch (Throwable $e) {
+        } catch (\Throwable $e) {
            app('log')->debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
            $result = sprintf('Could not render view: %s', $e->getMessage());

@@ -343,7 +342,7 @@ class TagController extends Controller

        try {
            $result = view('reports.tag.partials.avg-income', compact('result'))->render();
-        } catch (Throwable $e) {
+        } catch (\Throwable $e) {
            app('log')->debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
            $result = sprintf('Could not render view: %s', $e->getMessage());

@@ -491,7 +490,7 @@ class TagController extends Controller

        try {
            $result = view('reports.tag.partials.top-expenses', compact('result'))->render();
-        } catch (Throwable $e) {
+        } catch (\Throwable $e) {
            app('log')->debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
            $result = sprintf('Could not render view: %s', $e->getMessage());

@@ -539,7 +538,7 @@ class TagController extends Controller

        try {
            $result = view('reports.tag.partials.top-income', compact('result'))->render();
-        } catch (Throwable $e) {
+        } catch (\Throwable $e) {
            app('log')->debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
            $result = sprintf('Could not render view: %s', $e->getMessage());

--- a/app/Http/Controllers/Rule/EditController.php
+++ b/app/Http/Controllers/Rule/EditController.php
@@ -24,7 +24,6 @@ declare(strict_types=1);

 namespace FireflyIII\Http\Controllers\Rule;

-use Throwable;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Http\Requests\RuleFormRequest;
@@ -178,7 +177,7 @@ class EditController extends Controller
                        'triggers'   => $triggers,
                    ]
                )->render();
-            } catch (Throwable $e) {
+            } catch (\Throwable $e) {
                $message = sprintf('Throwable was thrown in getPreviousTriggers(): %s', $e->getMessage());
                app('log')->debug($message);
                app('log')->error($e->getTraceAsString());
--- a/app/Http/Controllers/Rule/SelectController.php
+++ b/app/Http/Controllers/Rule/SelectController.php
@@ -24,7 +24,6 @@ declare(strict_types=1);

 namespace FireflyIII\Http\Controllers\Rule;

-use Throwable;
 use Carbon\Carbon;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Http\Controllers\Controller;
@@ -175,7 +174,7 @@ class SelectController extends Controller

        try {
            $view = view('list.journals-array-tiny', ['groups' => $collection])->render();
-        } catch (Throwable $exception) {
+        } catch (\Throwable $exception) {
            app('log')->error(sprintf('Could not render view in testTriggers(): %s', $exception->getMessage()));
            app('log')->error($exception->getTraceAsString());
            $view = sprintf('Could not render list.journals-tiny: %s', $exception->getMessage());
@@ -217,7 +216,7 @@ class SelectController extends Controller

        try {
            $view = view('list.journals-array-tiny', ['groups' => $collection])->render();
-        } catch (Throwable $exception) {
+        } catch (\Throwable $exception) {
            $message = sprintf('Could not render view in testTriggersByRule(): %s', $exception->getMessage());
            app('log')->error($message);
            app('log')->error($exception->getTraceAsString());
--- a/app/Http/Controllers/RuleGroup/ExecutionController.php
+++ b/app/Http/Controllers/RuleGroup/ExecutionController.php
@@ -24,7 +24,6 @@ declare(strict_types=1);

 namespace FireflyIII\Http\Controllers\RuleGroup;

-use Exception;
 use Carbon\Carbon;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Http\Requests\SelectTransactionsRequest;
@@ -65,7 +64,7 @@ class ExecutionController extends Controller
    /**
     * Execute the given rulegroup on a set of existing transactions.
     *
-     * @throws Exception
+     * @throws \Exception
     */
    public function execute(SelectTransactionsRequest $request, RuleGroup $ruleGroup): RedirectResponse
    {
--- a/app/Http/Controllers/SearchController.php
+++ b/app/Http/Controllers/SearchController.php
@@ -23,7 +23,6 @@ declare(strict_types=1);

 namespace FireflyIII\Http\Controllers;

-use Throwable;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Repositories\Rule\RuleRepositoryInterface;
 use FireflyIII\Support\Search\SearchInterface;
@@ -119,7 +118,7 @@ class SearchController extends Controller

        try {
            $html = view('search.search', compact('groups', 'hasPages', 'searchTime'))->render();
-        } catch (Throwable $e) {
+        } catch (\Throwable $e) {
            app('log')->error(sprintf('Cannot render search.search: %s', $e->getMessage()));
            app('log')->error($e->getTraceAsString());
            $html = 'Could not render view.';
--- a/app/Http/Controllers/System/InstallController.php
+++ b/app/Http/Controllers/System/InstallController.php
@@ -24,8 +24,6 @@ declare(strict_types=1);

 namespace FireflyIII\Http\Controllers\System;

-use Artisan;
-use function Safe\file_put_contents;
 use Cache;
 use Exception;
 use FireflyIII\Exceptions\FireflyException;
@@ -38,6 +36,8 @@ use Illuminate\View\View;
 use Laravel\Passport\Passport;
 use phpseclib3\Crypt\RSA;

+use function Safe\file_put_contents;
+
 /**
 * Class InstallController
 */
@@ -142,14 +142,14 @@ class InstallController extends Controller
                $this->keys();
            }
            if ('generate-keys' !== $command) {
-                Artisan::call($command, $args);
-                app('log')->debug(Artisan::output());
+                \Artisan::call($command, $args);
+                app('log')->debug(\Artisan::output());
            }
-        } catch (Exception $e) { // intentional generic exception
+        } catch (\Exception $e) { // intentional generic exception
            throw new FireflyException($e->getMessage(), 0, $e);
        }
        // clear cache as well.
-        Cache::clear();
+        \Cache::clear();
        app('preferences')->mark();

        return true;
--- a/app/Http/Controllers/Transaction/ConvertController.php
+++ b/app/Http/Controllers/Transaction/ConvertController.php
@@ -82,7 +82,7 @@ class ConvertController extends Controller
     *
     * @return Factory|Redirector|RedirectResponse|View
     *
-     * @throws Exception
+     * @throws \Exception
     */
    public function index(TransactionType $destinationType, TransactionGroup $group)
    {
@@ -214,7 +214,7 @@ class ConvertController extends Controller
    }

    /**
-     * @throws Exception
+     * @throws \Exception
     */
    private function getLiabilities(): array
    {
@@ -238,7 +238,7 @@ class ConvertController extends Controller
    }

    /**
-     * @throws Exception
+     * @throws \Exception
     */
    private function getAssetAccounts(): array
    {
--- a/app/Http/Controllers/Transaction/CreateController.php
+++ b/app/Http/Controllers/Transaction/CreateController.php
@@ -25,7 +25,6 @@ declare(strict_types=1);
 namespace FireflyIII\Http\Controllers\Transaction;

 use FireflyIII\Models\TransactionGroup;
-use function Safe\parse_url;
 use FireflyIII\Events\StoredTransactionGroup;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Http\Controllers\Controller;
@@ -37,6 +36,8 @@ use Illuminate\Contracts\View\View;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;

+use function Safe\parse_url;
+
 /**
 * Class CreateController
 */
--- a/app/Http/Controllers/Transaction/EditController.php
+++ b/app/Http/Controllers/Transaction/EditController.php
@@ -24,7 +24,6 @@ declare(strict_types=1);

 namespace FireflyIII\Http\Controllers\Transaction;

-use function Safe\parse_url;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\TransactionGroup;
 use FireflyIII\Models\TransactionJournal;
@@ -36,6 +35,8 @@ use Illuminate\Http\RedirectResponse;
 use Illuminate\Routing\Redirector;
 use Illuminate\View\View;

+use function Safe\parse_url;
+
 /**
 * Class EditController
 */
--- a/app/Http/Controllers/Transaction/MassController.php
+++ b/app/Http/Controllers/Transaction/MassController.php
@@ -23,7 +23,6 @@ declare(strict_types=1);

 namespace FireflyIII\Http\Controllers\Transaction;

-use InvalidArgumentException;
 use Carbon\Carbon;
 use FireflyIII\Enums\AccountTypeEnum;
 use FireflyIII\Enums\TransactionTypeEnum;
@@ -232,7 +231,7 @@ class MassController extends Controller

        try {
            $carbon = Carbon::parse($value[$journalId]);
-        } catch (InvalidArgumentException $e) {
+        } catch (\InvalidArgumentException $e) {
            Log::warning(sprintf('Could not parse "%s" but dont mind', $value[$journalId]));
            Log::warning($e->getMessage());

--- a/app/Http/Middleware/AcceptHeaders.php
+++ b/app/Http/Middleware/AcceptHeaders.php
@@ -24,12 +24,13 @@ declare(strict_types=1);

 namespace FireflyIII\Http\Middleware;

-use function Safe\preg_match;
 use FireflyIII\Exceptions\BadHttpHeaderException;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;

+use function Safe\preg_match;
+
 class AcceptHeaders
 {
    /**
--- a/app/Http/Middleware/Authenticate.php
+++ b/app/Http/Middleware/Authenticate.php
@@ -24,7 +24,6 @@ declare(strict_types=1);

 namespace FireflyIII\Http\Middleware;

-use Closure;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\User;
 use Illuminate\Auth\AuthenticationException;
@@ -57,7 +56,7 @@ class Authenticate
     * @throws FireflyException
     * @throws AuthenticationException
     */
-    public function handle($request, Closure $next, ...$guards)
+    public function handle($request, \Closure $next, ...$guards)
    {
        $this->authenticate($request, $guards);

--- a/app/Http/Middleware/Binder.php
+++ b/app/Http/Middleware/Binder.php
@@ -23,7 +23,6 @@ declare(strict_types=1);

 namespace FireflyIII\Http\Middleware;

-use Closure;
 use FireflyIII\Support\Domain;
 use Illuminate\Contracts\Auth\Factory as Auth;
 use Illuminate\Http\Request;
@@ -64,7 +63,7 @@ class Binder
     *
     * @return mixed
     */
-    public function handle($request, Closure $next)
+    public function handle($request, \Closure $next)
    {
        foreach ($request->route()->parameters() as $key => $value) {
            if (array_key_exists($key, $this->binders)) {
--- a/app/Http/Middleware/InstallationId.php
+++ b/app/Http/Middleware/InstallationId.php
@@ -24,7 +24,6 @@ declare(strict_types=1);

 namespace FireflyIII\Http\Middleware;

-use Closure;
 use FireflyIII\Support\System\GeneratesInstallationId;
 use Illuminate\Http\Request;

@@ -42,7 +41,7 @@ class InstallationId
     *
     * @return mixed
     */
-    public function handle($request, Closure $next)
+    public function handle($request, \Closure $next)
    {
        $this->generateInstallationId();

--- a/app/Http/Middleware/Installer.php
+++ b/app/Http/Middleware/Installer.php
@@ -24,7 +24,6 @@ declare(strict_types=1);

 namespace FireflyIII\Http\Middleware;

-use Closure;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Support\System\OAuthKeys;
 use Illuminate\Database\QueryException;
@@ -46,7 +45,7 @@ class Installer
     *
     * @throws FireflyException
     */
-    public function handle($request, Closure $next)
+    public function handle($request, \Closure $next)
    {
        // Log::debug(sprintf('Installer middleware for URL %s', $request->url()));
        // ignore installer in test environment.
--- a/app/Http/Middleware/InterestingMessage.php
+++ b/app/Http/Middleware/InterestingMessage.php
@@ -24,7 +24,6 @@ declare(strict_types=1);

 namespace FireflyIII\Http\Middleware;

-use Closure;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\Bill;
 use FireflyIII\Models\GroupMembership;
@@ -46,7 +45,7 @@ class InterestingMessage
     *
     * @return mixed
     */
-    public function handle(Request $request, Closure $next)
+    public function handle(Request $request, \Closure $next)
    {
        if ($this->testing()) {
            return $next($request);
--- a/app/Http/Middleware/IsAdmin.php
+++ b/app/Http/Middleware/IsAdmin.php
@@ -23,7 +23,6 @@ declare(strict_types=1);

 namespace FireflyIII\Http\Middleware;

-use Closure;
 use FireflyIII\Repositories\User\UserRepositoryInterface;
 use FireflyIII\User;
 use Illuminate\Http\Request;
@@ -41,7 +40,7 @@ class IsAdmin
     *
     * @return mixed
     */
-    public function handle(Request $request, Closure $next, $guard = null)
+    public function handle(Request $request, \Closure $next, $guard = null)
    {
        if (Auth::guard($guard)->guest()) {
            if ($request->ajax()) {
--- a/app/Http/Middleware/IsDemoUser.php
+++ b/app/Http/Middleware/IsDemoUser.php
@@ -23,7 +23,6 @@ declare(strict_types=1);

 namespace FireflyIII\Http\Middleware;

-use Closure;
 use FireflyIII\Repositories\User\UserRepositoryInterface;
 use FireflyIII\User;
 use Illuminate\Http\Request;
@@ -38,7 +37,7 @@ class IsDemoUser
     *
     * @return mixed
     */
-    public function handle(Request $request, Closure $next)
+    public function handle(Request $request, \Closure $next)
    {
        /** @var null|User $user */
        $user       = $request->user();
--- a/app/Http/Middleware/Range.php
+++ b/app/Http/Middleware/Range.php
@@ -23,8 +23,6 @@ declare(strict_types=1);

 namespace FireflyIII\Http\Middleware;

-use Closure;
-use App;
 use Carbon\Carbon;
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use FireflyIII\Support\Facades\Amount;
@@ -44,7 +42,7 @@ class Range
     *
     * @return mixed
     */
-    public function handle(Request $request, Closure $next)
+    public function handle(Request $request, \Closure $next)
    {
        if (null !== $request->user()) {
            // set start, end and finish:
@@ -103,7 +101,7 @@ class Range
        // get locale preference:
        $language          = app('steam')->getLanguage();
        $locale            = app('steam')->getLocale();
-        App::setLocale($language);
+        \App::setLocale($language);
        Carbon::setLocale(substr((string) $locale, 0, 2));

        $localeArray       = app('steam')->getLocaleArray($locale);
--- a/app/Http/Middleware/RedirectIfAuthenticated.php
+++ b/app/Http/Middleware/RedirectIfAuthenticated.php
@@ -23,7 +23,6 @@ declare(strict_types=1);

 namespace FireflyIII\Http\Middleware;

-use Closure;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;

@@ -40,7 +39,7 @@ class RedirectIfAuthenticated
     *
     * @return mixed
     */
-    public function handle($request, Closure $next, $guard = null)
+    public function handle($request, \Closure $next, $guard = null)
    {
        if (Auth::guard($guard)->check()) {
            return response()->redirectTo(route('index'));
--- a/app/Http/Middleware/SecureHeaders.php
+++ b/app/Http/Middleware/SecureHeaders.php
@@ -24,8 +24,6 @@ declare(strict_types=1);

 namespace FireflyIII\Http\Middleware;

-use Closure;
-use Exception;
 use Barryvdh\Debugbar\Facades\Debugbar;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Vite;
@@ -40,9 +38,9 @@ class SecureHeaders
     *
     * @return mixed
     *
-     * @throws Exception
+     * @throws \Exception
     */
-    public function handle(Request $request, Closure $next)
+    public function handle(Request $request, \Closure $next)
    {
        // generate and share nonce.
        $nonce              = base64_encode(random_bytes(16));
--- a/app/Http/Middleware/StartFireflySession.php
+++ b/app/Http/Middleware/StartFireflySession.php
@@ -23,7 +23,6 @@ declare(strict_types=1);

 namespace FireflyIII\Http\Middleware;

-use Override;
 use Illuminate\Contracts\Session\Session;
 use Illuminate\Http\Request;
 use Illuminate\Session\Middleware\StartSession;
@@ -38,7 +37,7 @@ class StartFireflySession extends StartSession
     *
     * @param Session $session
     */
-    #[Override]
+    #[\Override]
    protected function storeCurrentUrl(Request $request, $session): void
    {
        $url     = $request->fullUrl();
--- a/app/Http/Middleware/TrustHosts.php
+++ b/app/Http/Middleware/TrustHosts.php
@@ -24,7 +24,6 @@ declare(strict_types=1);

 namespace FireflyIII\Http\Middleware;

-use Override;
 use Illuminate\Http\Middleware\TrustHosts as Middleware;

 class TrustHosts extends Middleware
@@ -34,7 +33,7 @@ class TrustHosts extends Middleware
     *
     * @return array<int, null|string>
     */
-    #[Override]
+    #[\Override]
    public function hosts(): array
    {
        return [
--- a/app/Http/Requests/ReportFormRequest.php
+++ b/app/Http/Requests/ReportFormRequest.php
@@ -23,7 +23,6 @@ declare(strict_types=1);

 namespace FireflyIII\Http\Requests;

-use function Safe\preg_match;
 use Carbon\Carbon;
 use Exception;
 use FireflyIII\Exceptions\FireflyException;
@@ -37,6 +36,8 @@ use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Validation\Validator;

+use function Safe\preg_match;
+
 /**
 * Class CategoryFormRequest.
 */
@@ -148,7 +149,7 @@ class ReportFormRequest extends FormRequest
            if (false !== $result && 0 !== $result) {
                try {
                    $date = new Carbon($parts[1]);
-                } catch (Exception $e) { // intentional generic exception
+                } catch (\Exception $e) { // intentional generic exception
                    $error = sprintf('"%s" is not a valid date range: %s', $range, $e->getMessage());
                    app('log')->error($error);
                    app('log')->error($e->getTraceAsString());
@@ -186,7 +187,7 @@ class ReportFormRequest extends FormRequest
            if (false !== $result && 0 !== $result) {
                try {
                    $date = new Carbon($parts[0]);
-                } catch (Exception $e) { // intentional generic exception
+                } catch (\Exception $e) { // intentional generic exception
                    $error = sprintf('"%s" is not a valid date range: %s', $range, $e->getMessage());
                    app('log')->error($error);
                    app('log')->error($e->getTraceAsString());