Various code cleanup.

2025-10-12 15:35:15 +00:00 · 2025-10-05 12:57:58 +02:00
parent 072212c112
commit 6341743cf9
169 changed files with 482 additions and 305 deletions
--- a/app/Http/Controllers/Account/CreateController.php
+++ b/app/Http/Controllers/Account/CreateController.php
@@ -37,6 +37,8 @@ use Illuminate\Http\Request;
 use Illuminate\Routing\Redirector;
 use Illuminate\Support\Facades\Log;
 use Illuminate\View\View;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;

 /**
 * Class CreateController
@@ -131,9 +133,12 @@ class CreateController extends Controller
    /**
     * Store the new account.
     *
+     * @param AccountFormRequest $request
+     *
     * @return Redirector|RedirectResponse
     *
-     * @throws FireflyException
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
     */
    public function store(AccountFormRequest $request)
    {
--- a/app/Http/Controllers/Account/IndexController.php
+++ b/app/Http/Controllers/Account/IndexController.php
@@ -35,6 +35,8 @@ use Illuminate\Http\Request;
 use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Support\Facades\Log;
 use Illuminate\View\View;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;

 /**
 * Class IndexController
@@ -66,10 +68,14 @@ class IndexController extends Controller
    }

    /**
+     * @param Request $request
+     * @param string  $objectType
+     *
     * @return Factory|View
     *
-     * @throws FireflyException
-     *                                              */
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
+     */
    public function inactive(Request $request, string $objectType)
    {
        $inactivePage  = true;
@@ -136,10 +142,14 @@ class IndexController extends Controller
    /**
     * Show list of accounts.
     *
+     * @param Request $request
+     * @param string  $objectType
+     *
     * @return Factory|View
     *
-     * @throws FireflyException
-     *                                              */
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
+     */
    public function index(Request $request, string $objectType)
    {
        app('log')->debug(sprintf('Now at %s', __METHOD__));
--- a/app/Http/Controllers/Account/ShowController.php
+++ b/app/Http/Controllers/Account/ShowController.php
@@ -40,6 +40,8 @@ use Illuminate\Routing\Redirector;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Log;
 use Illuminate\View\View;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;

 /**
@@ -76,10 +78,17 @@ class ShowController extends Controller
    /**
     * Show an account.
     *
+     * @param Request     $request
+     * @param Account     $account
+     * @param Carbon|null $start
+     * @param Carbon|null $end
+     *
     * @return Factory|Redirector|RedirectResponse|View
     *
+     * @throws ContainerExceptionInterface
     * @throws FireflyException
-     *                                              */
+     * @throws NotFoundExceptionInterface
+     */
    public function show(Request $request, Account $account, ?Carbon $start = null, ?Carbon $end = null)
    {
        if (0 === $account->id) {
@@ -193,10 +202,14 @@ class ShowController extends Controller
    /**
     * Show an account.
     *
+     * @param Request $request
+     * @param Account $account
+     *
     * @return Factory|Redirector|RedirectResponse|View
     *
-     * @throws FireflyException
-     *                                              */
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
+     */
    public function showAll(Request $request, Account $account)
    {
        if (!$this->isEditableAccount($account)) {
--- a/app/Http/Controllers/Admin/HomeController.php
+++ b/app/Http/Controllers/Admin/HomeController.php
@@ -28,6 +28,8 @@ use FireflyIII\Http\Middleware\IsDemoUser;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Support\Facades\Log;
 use Illuminate\View\View;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;

 /**
 * Class HomeController.
@@ -47,6 +49,8 @@ class HomeController extends Controller
     * Index of the admin.
     *
     * @return Factory|View
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
     */
    public function index()
    {
--- a/app/Http/Controllers/Admin/UserController.php
+++ b/app/Http/Controllers/Admin/UserController.php
@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace FireflyIII\Http\Controllers\Admin;

 use FireflyIII\Events\Admin\InvitationCreated;
+use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Http\Middleware\IsDemoUser;
 use FireflyIII\Http\Requests\InviteUserFormRequest;
@@ -37,6 +38,8 @@ use Illuminate\Http\JsonResponse;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Routing\Redirector;
 use Illuminate\View\View;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;

 /**
 * Class UserController.
@@ -151,6 +154,9 @@ class UserController extends Controller
     * Show index of user manager.
     *
     * @return Factory|View
+     * @throws ContainerExceptionInterface
+     * @throws FireflyException
+     * @throws NotFoundExceptionInterface
     */
    public function index()
    {
--- a/app/Http/Controllers/AttachmentController.php
+++ b/app/Http/Controllers/AttachmentController.php
@@ -194,7 +194,6 @@ class AttachmentController extends Controller
     * View attachment in browser.
     *
     * @throws FireflyException
-     * @throws BindingResolutionException
     */
    public function view(Attachment $attachment): LaravelResponse
    {
--- a/app/Http/Controllers/Auth/ForgotPasswordController.php
+++ b/app/Http/Controllers/Auth/ForgotPasswordController.php
@@ -33,6 +33,8 @@ use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Log;
 use Illuminate\View\View;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;
 use Safe\Exceptions\UrlException;

 use function Safe\parse_url;
@@ -60,7 +62,11 @@ class ForgotPasswordController extends Controller
    /**
     * Send a reset link to the given user.
     *
+     * @param Request                 $request
+     * @param UserRepositoryInterface $repository
+     *
     * @return Factory|RedirectResponse|View
+     * @throws FireflyException
     */
    public function sendResetLinkEmail(Request $request, UserRepositoryInterface $repository)
    {
@@ -126,6 +132,8 @@ class ForgotPasswordController extends Controller
     * @return Factory|View
     *
     * @throws FireflyException
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
     */
    public function showLinkRequestForm()
    {
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -46,6 +46,8 @@ use Illuminate\Routing\Redirector;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Validation\ValidationException;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;
 use Symfony\Component\HttpFoundation\Response as ResponseAlias;

 /**
@@ -151,7 +153,7 @@ class LoginController extends Controller
        $this->sendFailedLoginResponse($request);

        // @noinspection PhpUnreachableStatementInspection
-        return response()->json([]);
+        return response()->json();
    }

    /**
@@ -219,9 +221,13 @@ class LoginController extends Controller
    /**
     * Show the application's login form.
     *
+     * @param Request $request
+     *
     * @return Application|Factory|Redirector|RedirectResponse|View
     *
     * @throws FireflyException
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
     */
    public function showLoginForm(Request $request)
    {
--- a/app/Http/Controllers/Auth/RegisterController.php
+++ b/app/Http/Controllers/Auth/RegisterController.php
@@ -140,9 +140,14 @@ class RegisterController extends Controller
    /**
     * Show the application registration form if the invitation code is valid.
     *
+     * @param Request $request
+     * @param string  $code
+     *
     * @return Factory|View
     *
+     * @throws ContainerExceptionInterface
     * @throws FireflyException
+     * @throws NotFoundExceptionInterface
     */
    public function showInviteForm(Request $request, string $code)
    {
@@ -172,9 +177,13 @@ class RegisterController extends Controller
    /**
     * Show the application registration form.
     *
+     * @param Request|null $request
+     *
     * @return Factory|View
     *
+     * @throws ContainerExceptionInterface
     * @throws FireflyException
+     * @throws NotFoundExceptionInterface
     */
    public function showRegistrationForm(?Request $request = null)
    {
--- a/app/Http/Controllers/Auth/ResetPasswordController.php
+++ b/app/Http/Controllers/Auth/ResetPasswordController.php
@@ -34,6 +34,8 @@ use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Password;
 use Illuminate\Validation\ValidationException;
 use Illuminate\View\View;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;

 /**
 * Class ResetPasswordController
@@ -112,11 +114,14 @@ class ResetPasswordController extends Controller
     *
     * If no token is present, display the link request form.
     *
-     * @param null $token
+     * @param Request $request
+     * @param null    $token
     *
     * @return Factory|View
     *
     * @throws FireflyException
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
     */
    public function showResetForm(Request $request, $token = null)
    {
--- a/app/Http/Controllers/Auth/TwoFactorController.php
+++ b/app/Http/Controllers/Auth/TwoFactorController.php
@@ -37,6 +37,8 @@ use Illuminate\Http\Request;
 use Illuminate\Routing\Redirector;
 use Illuminate\Support\Facades\Log;
 use PragmaRX\Google2FALaravel\Support\Authenticator;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;

 /**
 * Class TwoFactorController.
@@ -59,7 +61,11 @@ class TwoFactorController extends Controller
    }

    /**
+     * @param Request $request
+     *
     * @return Redirector|RedirectResponse
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
     */
    public function submitMFA(Request $request)
    {
--- a/app/Http/Controllers/Bill/IndexController.php
+++ b/app/Http/Controllers/Bill/IndexController.php
@@ -149,7 +149,6 @@ class IndexController extends Controller
    }

    /**
-     * @throws FireflyException
     */
    private function getSums(array $bills): array
    {
--- a/app/Http/Controllers/Bill/ShowController.php
+++ b/app/Http/Controllers/Bill/ShowController.php
@@ -44,6 +44,8 @@ use Illuminate\View\View;
 use League\Fractal\Manager;
 use League\Fractal\Resource\Item;
 use League\Fractal\Serializer\DataArraySerializer;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;
 use Symfony\Component\HttpFoundation\ParameterBag;

 /**
@@ -113,7 +115,12 @@ class ShowController extends Controller
    /**
     * Show a bill.
     *
+     * @param Request $request
+     * @param Bill    $bill
+     *
     * @return Factory|View
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
     */
    public function show(Request $request, Bill $bill)
    {
--- a/app/Http/Controllers/Budget/BudgetLimitController.php
+++ b/app/Http/Controllers/Budget/BudgetLimitController.php
@@ -150,7 +150,7 @@ class BudgetLimitController extends Controller
        $end      = Carbon::createFromFormat('Y-m-d', $request->get('end'));

        if (!$start instanceof Carbon || !$end instanceof Carbon) {
-            return response()->json([]);
+            return response()->json();
        }

        $amount   = (string) $request->get('amount');
@@ -158,7 +158,7 @@ class BudgetLimitController extends Controller
        $end->startOfDay();

        if ('' === $amount) {
-            return response()->json([]);
+            return response()->json();
        }

        app('log')->debug(sprintf('Start: %s, end: %s', $start->format('Y-m-d'), $end->format('Y-m-d')));
@@ -172,7 +172,7 @@ class BudgetLimitController extends Controller
            }

            // return empty=ish array:
-            return response()->json([]);
+            return response()->json();
        }
        if ((int) $amount > 268435456) { // intentional cast to integer
            $amount = '268435456';
--- a/app/Http/Controllers/Budget/IndexController.php
+++ b/app/Http/Controllers/Budget/IndexController.php
@@ -174,7 +174,7 @@ class IndexController extends Controller
            $array['end_date']    = $entry->end_date;

            // spent in period:
-            $spentArr             = $this->opsRepository->sumExpenses($entry->start_date, $entry->end_date, null, null, $entry->transactionCurrency, false);
+            $spentArr             = $this->opsRepository->sumExpenses($entry->start_date, $entry->end_date, null, null, $entry->transactionCurrency);
            $array['spent']       = $spentArr[$entry->transaction_currency_id]['sum'] ?? '0';
            $array['pc_spent']    = $this->convertToPrimary && $entry->transaction_currency_id !== $this->primaryCurrency->id ? $converter->convert($entry->transactionCurrency, $this->primaryCurrency, $entry->start_date, $array['spent']) : null;
            // budgeted in period:
@@ -235,7 +235,7 @@ class IndexController extends Controller

            /** @var TransactionCurrency $currency */
            foreach ($currencies as $currency) {
-                $spentArr = $this->opsRepository->sumExpenses($start, $end, null, new Collection()->push($current), $currency, false);
+                $spentArr = $this->opsRepository->sumExpenses($start, $end, null, new Collection()->push($current), $currency);
                if (array_key_exists($currency->id, $spentArr) && array_key_exists('sum', $spentArr[$currency->id])) {
                    $array['spent'][$currency->id]['spent']                   = $spentArr[$currency->id]['sum'];
                    $array['spent'][$currency->id]['currency_id']             = $currency->id;
--- a/app/Http/Controllers/Budget/ShowController.php
+++ b/app/Http/Controllers/Budget/ShowController.php
@@ -39,6 +39,8 @@ use FireflyIII\Support\Http\Controllers\PeriodOverview;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Http\Request;
 use Illuminate\View\View;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;

 /**
 * Class ShowController
@@ -73,9 +75,15 @@ class ShowController extends Controller
    /**
     * Show transactions without a budget.
     *
+     * @param Request     $request
+     * @param Carbon|null $start
+     * @param Carbon|null $end
+     *
     * @return Factory|View
     *
+     * @throws ContainerExceptionInterface
     * @throws FireflyException
+     * @throws NotFoundExceptionInterface
     */
    public function noBudget(Request $request, ?Carbon $start = null, ?Carbon $end = null)
    {
@@ -110,7 +118,11 @@ class ShowController extends Controller
    /**
     * Shows ALL transactions without a budget.
     *
+     * @param Request $request
+     *
     * @return Factory|View
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
     */
    public function noBudgetAll(Request $request)
    {
@@ -135,7 +147,12 @@ class ShowController extends Controller
    /**
     * Show a single budget.
     *
+     * @param Request $request
+     * @param Budget  $budget
+     *
     * @return Factory|View
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
     */
    public function show(Request $request, Budget $budget)
    {
@@ -166,9 +183,15 @@ class ShowController extends Controller
    /**
     * Show a single budget by a budget limit.
     *
+     * @param Request     $request
+     * @param Budget      $budget
+     * @param BudgetLimit $budgetLimit
+     *
     * @return Factory|View
     *
     * @throws FireflyException
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
     */
    public function showByBudgetLimit(Request $request, Budget $budget, BudgetLimit $budgetLimit)
    {
--- a/app/Http/Controllers/Category/IndexController.php
+++ b/app/Http/Controllers/Category/IndexController.php
@@ -32,6 +32,8 @@ use Illuminate\Http\Request;
 use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Support\Collection;
 use Illuminate\View\View;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;

 /**
 * Class IndexController
@@ -62,7 +64,11 @@ class IndexController extends Controller
    /**
     * Show all categories.
     *
+     * @param Request $request
+     *
     * @return Factory|View
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
     */
    public function index(Request $request)
    {
--- a/app/Http/Controllers/Category/NoCategoryController.php
+++ b/app/Http/Controllers/Category/NoCategoryController.php
@@ -37,6 +37,8 @@ use Illuminate\Http\Request;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Log;
 use Illuminate\View\View;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;

 /**
 * Class NoCategoryController
@@ -69,9 +71,15 @@ class NoCategoryController extends Controller
    /**
     * Show transactions without a category.
     *
+     * @param Request     $request
+     * @param Carbon|null $start
+     * @param Carbon|null $end
+     *
     * @return Factory|View
     *
+     * @throws ContainerExceptionInterface
     * @throws FireflyException
+     * @throws NotFoundExceptionInterface
     */
    public function show(Request $request, ?Carbon $start = null, ?Carbon $end = null)
    {
@@ -106,7 +114,11 @@ class NoCategoryController extends Controller
    /**
     * Show all transactions without a category.
     *
+     * @param Request $request
+     *
     * @return Factory|View
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
     */
    public function showAll(Request $request)
    {
--- a/app/Http/Controllers/Category/ShowController.php
+++ b/app/Http/Controllers/Category/ShowController.php
@@ -35,6 +35,8 @@ use Illuminate\Contracts\View\Factory;
 use Illuminate\Http\Request;
 use Illuminate\Support\Collection;
 use Illuminate\View\View;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;

 /**
 * Class ShowController
@@ -68,9 +70,16 @@ class ShowController extends Controller
    /**
     * Show a single category.
     *
+     * @param Request     $request
+     * @param Category    $category
+     * @param Carbon|null $start
+     * @param Carbon|null $end
+     *
     * @return Factory|View
     *
+     * @throws ContainerExceptionInterface
     * @throws FireflyException
+     * @throws NotFoundExceptionInterface
     */
    public function show(Request $request, Category $category, ?Carbon $start = null, ?Carbon $end = null)
    {
@@ -111,7 +120,12 @@ class ShowController extends Controller
    /**
     * Show all transactions within a category.
     *
+     * @param Request  $request
+     * @param Category $category
+     *
     * @return Factory|View
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
     */
    public function showAll(Request $request, Category $category)
    {
--- a/app/Http/Controllers/Chart/AccountController.php
+++ b/app/Http/Controllers/Chart/AccountController.php
@@ -45,6 +45,7 @@ use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Log;

+use Safe\Exceptions\JsonException;
 use function Safe\json_encode;

 /**
@@ -482,7 +483,13 @@ class AccountController extends Controller
    /**
     * Shows overview of account during a single period.
     *
+     * @param Account $account
+     * @param Carbon  $start
+     * @param Carbon  $end
+     *
+     * @return JsonResponse
     * @throws FireflyException
+     * @throws JsonException
     */
    public function period(Account $account, Carbon $start, Carbon $end): JsonResponse
    {
@@ -571,7 +578,7 @@ class AccountController extends Controller
                $label                           = $current->isoFormat($format);
                $return[$key]['entries'][$label] = $amount;
            }
-            $current       = app('navigation')->addPeriod($current, $step, 0);
+            $current       = app('navigation')->addPeriod($current, $step);
            // here too, to fix #8041, the data is corrected to the end of the period.
            $current       = app('navigation')->endOfX($current, $step, null);
        }
--- a/app/Http/Controllers/Chart/CategoryController.php
+++ b/app/Http/Controllers/Chart/CategoryController.php
@@ -40,6 +40,8 @@ use FireflyIII\Support\Http\Controllers\ChartGeneration;
 use FireflyIII\Support\Http\Controllers\DateCalculation;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Collection;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;

 /**
 * Class CategoryController.
@@ -66,7 +68,6 @@ class CategoryController extends Controller
     * Show an overview for a category for all time, per month/week/year.
     * TODO test method, for category refactor.
     *
-     * @throws FireflyException
     */
    public function all(Category $category): JsonResponse
    {
@@ -256,7 +257,12 @@ class CategoryController extends Controller
     * Chart for a specific period.
     * TODO test me, for category refactor.
     *
-     * @throws FireflyException
+     * @param Category $category
+     * @param Carbon   $date
+     *
+     * @return JsonResponse
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
     */
    public function specificPeriod(Category $category, Carbon $date): JsonResponse
    {
--- a/app/Http/Controllers/Chart/PiggyBankController.php
+++ b/app/Http/Controllers/Chart/PiggyBankController.php
@@ -59,7 +59,6 @@ class PiggyBankController extends Controller
     *
     * TODO this chart is not multi currency aware.
     *
-     * @throws FireflyException
     */
    public function history(PiggyBankRepositoryInterface $repository, PiggyBank $piggyBank): JsonResponse
    {
@@ -95,7 +94,7 @@ class PiggyBankController extends Controller
            $currentSum        = $filtered->sum('amount');
            $label             = $oldest->isoFormat((string) trans('config.month_and_day_js', [], $locale));
            $chartData[$label] = $currentSum;
-            $oldest            = app('navigation')->addPeriod($oldest, $step, 0);
+            $oldest            = app('navigation')->addPeriod($oldest, $step);
        }
        $finalFiltered          = $set->filter(
            static fn (PiggyBankEvent $event) => $event->date->lte($today)
--- a/app/Http/Controllers/Chart/ReportController.php
+++ b/app/Http/Controllers/Chart/ReportController.php
@@ -260,7 +260,7 @@ class ReportController extends Controller
                    $expense['entries'][$title] = '0';

                }
-                $currentStart = app('navigation')->addPeriod($currentStart, $preferredRange, 0);
+                $currentStart = app('navigation')->addPeriod($currentStart, $preferredRange);
            }
            Log::debug('End of sub-loop');

--- a/app/Http/Controllers/DebugController.php
+++ b/app/Http/Controllers/DebugController.php
@@ -49,6 +49,7 @@ use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Route;
 use Illuminate\View\View;
 use Monolog\Handler\RotatingFileHandler;
+use Safe\Exceptions\FilesystemException;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;

 use function Safe\file_get_contents;
@@ -131,7 +132,7 @@ class DebugController extends Controller
     *
     * @return Factory|View
     *
-     * @throws FireflyException
+     * @throws FilesystemException
     */
    public function index()
    {
--- a/app/Http/Controllers/JavascriptController.php
+++ b/app/Http/Controllers/JavascriptController.php
@@ -33,6 +33,8 @@ use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 use FireflyIII\Support\Http\Controllers\GetConfigurationData;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;

 /**
 * Class JavascriptController.
@@ -90,8 +92,14 @@ class JavascriptController extends Controller
    /**
     * Show some common variables to be used in scripts.
     *
+     * @param Request                    $request
+     * @param AccountRepositoryInterface $repository
+     *
+     * @return Response
     * @throws FireflyException
-     *                                              */
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
+     */
    public function variables(Request $request, AccountRepositoryInterface $repository): Response
    {
        $account                   = $repository->find((int) $request->get('account'));
--- a/app/Http/Controllers/Json/BoxController.php
+++ b/app/Http/Controllers/Json/BoxController.php
@@ -52,7 +52,7 @@ class BoxController extends Controller
    #[Deprecated]
    public function available(): JsonResponse
    {
-        return response()->json([]);
+        return response()->json();
    }

    /**
--- a/app/Http/Controllers/Json/IntroController.php
+++ b/app/Http/Controllers/Json/IntroController.php
@@ -89,7 +89,6 @@ class IntroController extends Controller
    /**
     * Enable the boxes for a specific page again.
     *
-     * @throws FireflyException
     */
    public function postEnable(string $route, ?string $specialPage = null): JsonResponse
    {
@@ -109,7 +108,6 @@ class IntroController extends Controller
    /**
     * Set that you saw them.
     *
-     * @throws FireflyException
     */
    public function postFinished(string $route, ?string $specialPage = null): JsonResponse
    {
--- a/app/Http/Controllers/NewUserController.php
+++ b/app/Http/Controllers/NewUserController.php
@@ -87,7 +87,6 @@ class NewUserController extends Controller
     *
     * @return Redirector|RedirectResponse
     *
-     * @throws FireflyException
     */
    public function submit(NewUserFormRequest $request, CurrencyRepositoryInterface $currencyRepository)
    {
--- a/app/Http/Controllers/ObjectGroup/IndexController.php
+++ b/app/Http/Controllers/ObjectGroup/IndexController.php
@@ -80,6 +80,6 @@ class IndexController extends Controller
        $newOrder = (int) $request->get('order');
        $this->repository->setOrder($objectGroup, $newOrder);

-        return response()->json([]);
+        return response()->json();
    }
 }
--- a/app/Http/Controllers/PiggyBank/IndexController.php
+++ b/app/Http/Controllers/PiggyBank/IndexController.php
@@ -78,7 +78,6 @@ class IndexController extends Controller
     *
     * @return Factory|View
     *
-     * @throws FireflyException
     */
    public function index()
    {
--- a/app/Http/Controllers/PreferencesController.php
+++ b/app/Http/Controllers/PreferencesController.php
@@ -43,6 +43,7 @@ use Illuminate\Routing\Redirector;
 use Illuminate\Support\Facades\Log;
 use Illuminate\View\View;

+use Safe\Exceptions\FilesystemException;
 use function Safe\json_decode;
 use function Safe\file_get_contents;

@@ -71,9 +72,12 @@ class PreferencesController extends Controller
    /**
     * Show overview of preferences.
     *
+     * @param AccountRepositoryInterface $repository
+     *
     * @return Factory|View
     *
     * @throws FireflyException
+     * @throws FilesystemException
     */
    public function index(AccountRepositoryInterface $repository)
    {
--- a/app/Http/Controllers/Profile/MfaController.php
+++ b/app/Http/Controllers/Profile/MfaController.php
@@ -44,6 +44,8 @@ use Illuminate\Routing\Redirector;
 use Illuminate\Support\Facades\Log;
 use Illuminate\View\View;
 use PragmaRX\Recovery\Recovery;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;

 /**
 * Class MfaController
@@ -84,7 +86,6 @@ class MfaController extends Controller
    }

    /**
-     * @throws FireflyException
     */
    public function backupCodes(Request $request): Factory|RedirectResponse|View
    {
@@ -230,9 +231,12 @@ class MfaController extends Controller
    /**
     * Submit 2FA for the first time.
     *
+     * @param TokenFormRequest $request
+     *
     * @return Redirector|RedirectResponse
     *
-     * @throws FireflyException
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
     */
    public function enableMFAPost(TokenFormRequest $request)
    {
@@ -290,7 +294,10 @@ class MfaController extends Controller
    /**
     * TODO duplicate code.
     *
-     * @throws FireflyException
+     * @param string $mfaCode
+     *
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
     */
    private function addToMFAHistory(string $mfaCode): void
    {
--- a/app/Http/Controllers/ProfileController.php
+++ b/app/Http/Controllers/ProfileController.php
@@ -48,6 +48,8 @@ use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
 use Illuminate\View\View;
 use Laravel\Passport\ClientRepository;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;

 /**
 * Class ProfileController.
@@ -136,7 +138,9 @@ class ProfileController extends Controller
    /**
     * Index for profile.
     *
-     * @throws FireflyException
+     * @return Factory|View
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
     */
    public function index(): Factory|View
    {
--- a/app/Http/Controllers/Recurring/IndexController.php
+++ b/app/Http/Controllers/Recurring/IndexController.php
@@ -36,6 +36,8 @@ use Illuminate\Contracts\View\Factory;
 use Illuminate\Http\Request;
 use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\View\View;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;
 use Symfony\Component\HttpFoundation\ParameterBag;

 /**
@@ -71,9 +73,13 @@ class IndexController extends Controller
     * TODO the notes of a recurrence are pretty pointless at this moment.
     * Show all recurring transactions.
     *
+     * @param Request $request
+     *
     * @return Factory|View
     *
     * @throws FireflyException
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
     */
    public function index(Request $request)
    {
--- a/app/Http/Controllers/ReportController.php
+++ b/app/Http/Controllers/ReportController.php
@@ -39,6 +39,8 @@ use Illuminate\Http\RedirectResponse;
 use Illuminate\Routing\Redirector;
 use Illuminate\Support\Collection;
 use Illuminate\View\View;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;

 /**
 * Class ReportController.
@@ -225,7 +227,11 @@ class ReportController extends Controller
    /**
     * Show index.
     *
+     * @param AccountRepositoryInterface $repository
+     *
     * @return Factory|View
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
     */
    public function index(AccountRepositoryInterface $repository)
    {
--- a/app/Http/Controllers/Rule/IndexController.php
+++ b/app/Http/Controllers/Rule/IndexController.php
@@ -82,7 +82,7 @@ class IndexController extends Controller
        $order = (int) $request->get('order');
        $this->ruleRepos->moveRule($rule, $ruleGroup, $order);

-        return response()->json([]);
+        return response()->json();
    }

    public function search(Rule $rule): RedirectResponse
--- a/app/Http/Controllers/TagController.php
+++ b/app/Http/Controllers/TagController.php
@@ -37,6 +37,8 @@ use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Log;
 use Illuminate\View\View;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;

 /**
 * Class TagController.
@@ -218,9 +220,16 @@ class TagController extends Controller
    /**
     * Show a single tag.
     *
+     * @param Request     $request
+     * @param Tag         $tag
+     * @param Carbon|null $start
+     * @param Carbon|null $end
+     *
     * @return Factory|View
     *
+     * @throws ContainerExceptionInterface
     * @throws FireflyException
+     * @throws NotFoundExceptionInterface
     */
    public function show(Request $request, Tag $tag, ?Carbon $start = null, ?Carbon $end = null)
    {
@@ -261,7 +270,12 @@ class TagController extends Controller
    /**
     * Show a single tag over all time.
     *
+     * @param Request $request
+     * @param Tag     $tag
+     *
     * @return Factory|View
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
     */
    public function showAll(Request $request, Tag $tag)
    {
--- a/app/Http/Controllers/Transaction/CreateController.php
+++ b/app/Http/Controllers/Transaction/CreateController.php
@@ -37,6 +37,9 @@ use Illuminate\Contracts\View\View;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;

+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;
+use Safe\Exceptions\UrlException;
 use function Safe\parse_url;

 /**
@@ -98,10 +101,14 @@ class CreateController extends Controller
    /**
     * Create a new transaction group.
     *
+     * @param string|null $objectType
+     *
     * @return Factory|View
     *
-     * @throws FireflyException
-     *                                              */
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
+     * @throws UrlException
+     */
    public function create(?string $objectType)
    {
        Preferences::mark();
--- a/app/Http/Controllers/Transaction/EditController.php
+++ b/app/Http/Controllers/Transaction/EditController.php
@@ -35,6 +35,9 @@ use Illuminate\Http\RedirectResponse;
 use Illuminate\Routing\Redirector;
 use Illuminate\View\View;

+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;
+use Safe\Exceptions\UrlException;
 use function Safe\parse_url;

 /**
@@ -65,7 +68,12 @@ class EditController extends Controller
    }

    /**
+     * @param TransactionGroup $transactionGroup
+     *
     * @return Factory|Redirector|RedirectResponse|View
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
+     * @throws UrlException
     */
    public function edit(TransactionGroup $transactionGroup)
    {
--- a/app/Http/Controllers/Transaction/IndexController.php
+++ b/app/Http/Controllers/Transaction/IndexController.php
@@ -34,6 +34,8 @@ use FireflyIII\Support\Http\Controllers\PeriodOverview;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Http\Request;
 use Illuminate\View\View;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;

 /**
 * Class IndexController
@@ -67,9 +69,16 @@ class IndexController extends Controller
    /**
     * Index for a range of transactions.
     *
+     * @param Request     $request
+     * @param string      $objectType
+     * @param Carbon|null $start
+     * @param Carbon|null $end
+     *
     * @return Factory|View
     *
+     * @throws ContainerExceptionInterface
     * @throws FireflyException
+     * @throws NotFoundExceptionInterface
     */
    public function index(Request $request, string $objectType, ?Carbon $start = null, ?Carbon $end = null)
    {
@@ -123,7 +132,12 @@ class IndexController extends Controller
    /**
     * Index for ALL transactions.
     *
+     * @param Request $request
+     * @param string  $objectType
+     *
     * @return Factory|View
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
     */
    public function indexAll(Request $request, string $objectType)
    {
--- a/app/Http/Controllers/TransactionCurrency/DeleteController.php
+++ b/app/Http/Controllers/TransactionCurrency/DeleteController.php
@@ -24,6 +24,7 @@ declare(strict_types=1);

 namespace FireflyIII\Http\Controllers\TransactionCurrency;

+use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
@@ -66,7 +67,11 @@ class DeleteController extends Controller
    /**
     * Deletes a currency.
     *
+     * @param Request             $request
+     * @param TransactionCurrency $currency
+     *
     * @return Factory|Redirector|RedirectResponse|View
+     * @throws FireflyException
     */
    public function delete(Request $request, TransactionCurrency $currency)
    {
@@ -99,7 +104,11 @@ class DeleteController extends Controller
    /**
     * Destroys a currency.
     *
+     * @param Request             $request
+     * @param TransactionCurrency $currency
+     *
     * @return Redirector|RedirectResponse
+     * @throws FireflyException
     */
    public function destroy(Request $request, TransactionCurrency $currency)
    {
--- a/app/Http/Controllers/TransactionCurrency/EditController.php
+++ b/app/Http/Controllers/TransactionCurrency/EditController.php
@@ -24,6 +24,7 @@ declare(strict_types=1);

 namespace FireflyIII\Http\Controllers\TransactionCurrency;

+use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Http\Requests\CurrencyFormRequest;
 use FireflyIII\Models\TransactionCurrency;
@@ -106,7 +107,11 @@ class EditController extends Controller
    /**
     * Updates a currency.
     *
+     * @param CurrencyFormRequest $request
+     * @param TransactionCurrency $currency
+     *
     * @return Redirector|RedirectResponse
+     * @throws FireflyException
     */
    public function update(CurrencyFormRequest $request, TransactionCurrency $currency)
    {
--- a/app/Http/Controllers/TransactionCurrency/IndexController.php
+++ b/app/Http/Controllers/TransactionCurrency/IndexController.php
@@ -33,6 +33,8 @@ use Illuminate\Contracts\View\Factory;
 use Illuminate\Http\Request;
 use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\View\View;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;

 class IndexController extends Controller
 {
@@ -61,7 +63,11 @@ class IndexController extends Controller
    /**
     * Show overview of currencies.
     *
+     * @param Request $request
+     *
     * @return Factory|View
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
     */
    public function index(Request $request)
    {