Various code cleanup.

2026-01-06 22:21:42 +00:00 · 2021-09-18 10:21:29 +02:00
parent 3589c9f60f
commit e829d79589
107 changed files with 225 additions and 220 deletions
--- a/app/Http/Controllers/Account/CreateController.php
+++ b/app/Http/Controllers/Account/CreateController.php
@@ -135,6 +135,7 @@ class CreateController extends Controller
     * @param AccountFormRequest $request
     *
     * @return RedirectResponse|Redirector
+     * @throws \FireflyIII\Exceptions\FireflyException
     */
    public function store(AccountFormRequest $request)
    {
--- a/app/Http/Controllers/Account/IndexController.php
+++ b/app/Http/Controllers/Account/IndexController.php
@@ -72,6 +72,7 @@ class IndexController extends Controller
     * @param string  $objectType
     *
     * @return Factory|View
+     * @throws \FireflyIII\Exceptions\FireflyException
     */
    public function inactive(Request $request, string $objectType)
    {
--- a/app/Http/Controllers/Admin/HomeController.php
+++ b/app/Http/Controllers/Admin/HomeController.php
@@ -53,6 +53,7 @@ class HomeController extends Controller
     * Index of the admin.
     *
     * @return Factory|View
+     * @throws \FireflyIII\Exceptions\FireflyException
     */
    public function index()
    {
--- a/app/Http/Controllers/Admin/UpdateController.php
+++ b/app/Http/Controllers/Admin/UpdateController.php
@@ -31,8 +31,6 @@ use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Redirector;
 use Illuminate\View\View;
-use Psr\Container\ContainerExceptionInterface;
-use Psr\Container\NotFoundExceptionInterface;

 /**
 * Class HomeController.
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -194,7 +194,7 @@ class LoginController extends Controller
     *
     * @param Request $request
     *
-     * @return Factory|Response|View
+     * @return Factory|\Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\View|\Illuminate\Routing\Redirector|RedirectResponse
     * @throws FireflyException
     */
    public function showLoginForm(Request $request)
--- a/app/Http/Controllers/Auth/RegisterController.php
+++ b/app/Http/Controllers/Auth/RegisterController.php
@@ -78,7 +78,7 @@ class RegisterController extends Controller
     *
     * @param Request $request
     *
-     * @return Factory|RedirectResponse|Redirector|View
+     * @return \Illuminate\Contracts\Foundation\Application|Redirector|RedirectResponse
     * @throws FireflyException
     * @throws ValidationException
     */
--- a/app/Http/Controllers/Bill/CreateController.php
+++ b/app/Http/Controllers/Bill/CreateController.php
@@ -29,11 +29,9 @@ use FireflyIII\Helpers\Attachments\AttachmentHelperInterface;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Http\Requests\BillStoreRequest;
 use FireflyIII\Repositories\Bill\BillRepositoryInterface;
-use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
-use Illuminate\View\View;
 use Log;

 /**
--- a/app/Http/Controllers/Bill/EditController.php
+++ b/app/Http/Controllers/Bill/EditController.php
@@ -29,11 +29,9 @@ use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Http\Requests\BillUpdateRequest;
 use FireflyIII\Models\Bill;
 use FireflyIII\Repositories\Bill\BillRepositoryInterface;
-use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
-use Illuminate\View\View;

 /**
 * Class EditController
--- a/app/Http/Controllers/Bill/IndexController.php
+++ b/app/Http/Controllers/Bill/IndexController.php
@@ -24,10 +24,8 @@ declare(strict_types=1);

 namespace FireflyIII\Http\Controllers\Bill;

-use Carbon\Carbon;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\Bill;
-use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Repositories\Bill\BillRepositoryInterface;
 use FireflyIII\Repositories\ObjectGroup\OrganisesObjectGroups;
 use FireflyIII\Transformers\BillTransformer;
@@ -145,6 +143,7 @@ class IndexController extends Controller
     * @param array $bills
     *
     * @return array
+     * @throws \FireflyIII\Exceptions\FireflyException
     */
    private function getSums(array $bills): array
    {
--- a/app/Http/Controllers/Bill/ShowController.php
+++ b/app/Http/Controllers/Bill/ShowController.php
@@ -24,7 +24,6 @@ declare(strict_types=1);
 namespace FireflyIII\Http\Controllers\Bill;

 use Carbon\Carbon;
-use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\Attachment;
@@ -124,6 +123,7 @@ class ShowController extends Controller
     * @param Bill    $bill
     *
     * @return Factory|View
+     * @throws FireflyException
     */
    public function show(Request $request, Bill $bill)
    {
--- a/app/Http/Controllers/Budget/AvailableBudgetController.php
+++ b/app/Http/Controllers/Budget/AvailableBudgetController.php
@@ -133,7 +133,7 @@ class AvailableBudgetController extends Controller
    }

    /**
-     * @param AvailableBudget $availableBudget
+     * @param Request $request
     *
     * @return RedirectResponse|Redirector
     */
--- a/app/Http/Controllers/Budget/IndexController.php
+++ b/app/Http/Controllers/Budget/IndexController.php
@@ -90,6 +90,7 @@ class IndexController extends Controller
     * @param Carbon|null $end
     *
     * @return Factory|View
+     * @throws \FireflyIII\Exceptions\FireflyException
     */
    public function index(Request $request, Carbon $start = null, Carbon $end = null)
    {
--- a/app/Http/Controllers/Budget/ShowController.php
+++ b/app/Http/Controllers/Budget/ShowController.php
@@ -78,6 +78,7 @@ class ShowController extends Controller
     * @param Carbon|null $end
     *
     * @return Factory|View
+     * @throws FireflyException
     */
    public function noBudget(Request $request, Carbon $start = null, Carbon $end = null)
    {
@@ -113,6 +114,7 @@ class ShowController extends Controller
     * @param Request $request
     *
     * @return Factory|View
+     * @throws FireflyException
     */
    public function noBudgetAll(Request $request)
    {
@@ -141,6 +143,7 @@ class ShowController extends Controller
     * @param Budget  $budget
     *
     * @return Factory|View
+     * @throws FireflyException
     */
    public function show(Request $request, Budget $budget)
    {
--- a/app/Http/Controllers/Category/IndexController.php
+++ b/app/Http/Controllers/Category/IndexController.php
@@ -66,6 +66,7 @@ class IndexController extends Controller
     * @param Request $request
     *
     * @return Factory|View
+     * @throws \FireflyIII\Exceptions\FireflyException
     */
    public function index(Request $request)
    {
--- a/app/Http/Controllers/Category/NoCategoryController.php
+++ b/app/Http/Controllers/Category/NoCategoryController.php
@@ -74,6 +74,7 @@ class NoCategoryController extends Controller
     * @param Carbon|null $end
     *
     * @return Factory|View
+     * @throws \FireflyIII\Exceptions\FireflyException
     */
    public function show(Request $request, Carbon $start = null, Carbon $end = null)
    {
@@ -111,6 +112,7 @@ class NoCategoryController extends Controller
     * @param Request $request
     *
     * @return Factory|View
+     * @throws \FireflyIII\Exceptions\FireflyException
     */
    public function showAll(Request $request)
    {
--- a/app/Http/Controllers/Category/ShowController.php
+++ b/app/Http/Controllers/Category/ShowController.php
@@ -76,6 +76,7 @@ class ShowController extends Controller
     * @param Carbon|null $end
     *
     * @return Factory|View
+     * @throws \FireflyIII\Exceptions\FireflyException
     */
    public function show(Request $request, Category $category, Carbon $start = null, Carbon $end = null)
    {
@@ -115,6 +116,7 @@ class ShowController extends Controller
     * @param Category $category
     *
     * @return Factory|View
+     * @throws \FireflyIII\Exceptions\FireflyException
     */
    public function showAll(Request $request, Category $category)
    {
--- a/app/Http/Controllers/Chart/AccountController.php
+++ b/app/Http/Controllers/Chart/AccountController.php
@@ -83,6 +83,7 @@ class AccountController extends Controller
     * This chart is (multi) currency aware.
     *
     * @return JsonResponse
+     * @throws \JsonException
     */
    public function expenseAccounts(): JsonResponse
    {
@@ -194,6 +195,7 @@ class AccountController extends Controller
     * @param Carbon  $end
     *
     * @return JsonResponse
+     * @throws \JsonException
     */
    public function expenseBudget(Account $account, Carbon $start, Carbon $end): JsonResponse
    {
@@ -268,6 +270,7 @@ class AccountController extends Controller
     * @param Carbon  $end
     *
     * @return JsonResponse
+     * @throws \JsonException
     */
    public function expenseCategory(Account $account, Carbon $start, Carbon $end): JsonResponse
    {
@@ -322,6 +325,7 @@ class AccountController extends Controller
     * @param AccountRepositoryInterface $repository
     *
     * @return JsonResponse
+     * @throws \FireflyIII\Exceptions\FireflyException
     */
    public function frontpage(AccountRepositoryInterface $repository): JsonResponse
    {
@@ -364,6 +368,7 @@ class AccountController extends Controller
     * @param Carbon  $end
     *
     * @return JsonResponse
+     * @throws \JsonException
     */
    public function incomeCategory(Account $account, Carbon $start, Carbon $end): JsonResponse
    {
@@ -421,6 +426,8 @@ class AccountController extends Controller
     * @param Carbon  $end
     *
     * @return JsonResponse
+     * @throws \FireflyIII\Exceptions\FireflyException
+     * @throws \JsonException
     */
    public function period(Account $account, Carbon $start, Carbon $end): JsonResponse
    {
@@ -458,6 +465,8 @@ class AccountController extends Controller
     * @param TransactionCurrency $currency
     *
     * @return array
+     * @throws \FireflyIII\Exceptions\FireflyException
+     * @throws \JsonException
     */
    private function periodByCurrency(Carbon $start, Carbon $end, Account $account, TransactionCurrency $currency): array
    {
@@ -528,6 +537,7 @@ class AccountController extends Controller
     * This chart is multi-currency aware.
     *
     * @return JsonResponse
+     * @throws \JsonException
     */
    public function revenueAccounts(): JsonResponse
    {
--- a/app/Http/Controllers/Chart/BillController.php
+++ b/app/Http/Controllers/Chart/BillController.php
@@ -57,6 +57,7 @@ class BillController extends Controller
     * @param BillRepositoryInterface $repository
     *
     * @return JsonResponse
+     * @throws \JsonException
     */
    public function frontpage(BillRepositoryInterface $repository): JsonResponse
    {
@@ -102,6 +103,7 @@ class BillController extends Controller
     * @param Bill $bill
     *
     * @return JsonResponse
+     * @throws \JsonException
     */
    public function single(Bill $bill): JsonResponse
    {
--- a/app/Http/Controllers/Chart/BudgetController.php
+++ b/app/Http/Controllers/Chart/BudgetController.php
@@ -84,6 +84,7 @@ class BudgetController extends Controller
     * @param Budget $budget
     *
     * @return JsonResponse
+     * @throws \JsonException
     */
    public function budget(Budget $budget): JsonResponse
    {
@@ -152,6 +153,7 @@ class BudgetController extends Controller
     * @return JsonResponse
     *
     * @throws FireflyException
+     * @throws \JsonException
     */
    public function budgetLimit(Budget $budget, BudgetLimit $budgetLimit): JsonResponse
    {
@@ -202,6 +204,7 @@ class BudgetController extends Controller
     * @param BudgetLimit|null $budgetLimit
     *
     * @return JsonResponse
+     * @throws \JsonException
     */
    public function expenseAsset(Budget $budget, ?BudgetLimit $budgetLimit = null): JsonResponse
    {
@@ -270,6 +273,7 @@ class BudgetController extends Controller
     * @param BudgetLimit|null $budgetLimit
     *
     * @return JsonResponse
+     * @throws \JsonException
     */
    public function expenseCategory(Budget $budget, ?BudgetLimit $budgetLimit = null): JsonResponse
    {
@@ -334,6 +338,7 @@ class BudgetController extends Controller
     * @param BudgetLimit|null $budgetLimit
     *
     * @return JsonResponse
+     * @throws \JsonException
     */
    public function expenseExpense(Budget $budget, ?BudgetLimit $budgetLimit = null): JsonResponse
    {
@@ -397,7 +402,7 @@ class BudgetController extends Controller
     * Shows a budget list with spent/left/overspent.
     *
     * @return JsonResponse
-     *
+     * @throws \JsonException
     */
    public function frontpage(): JsonResponse
    {
@@ -435,6 +440,7 @@ class BudgetController extends Controller
     * @param Carbon              $end
     *
     * @return JsonResponse
+     * @throws \JsonException
     */
    public function period(Budget $budget, TransactionCurrency $currency, Collection $accounts, Carbon $start, Carbon $end): JsonResponse
    {
@@ -510,6 +516,7 @@ class BudgetController extends Controller
     * @param Carbon              $end
     *
     * @return JsonResponse
+     * @throws \JsonException
     */
    public function periodNoBudget(TransactionCurrency $currency, Collection $accounts, Carbon $start, Carbon $end): JsonResponse
    {
--- a/app/Http/Controllers/Chart/CategoryController.php
+++ b/app/Http/Controllers/Chart/CategoryController.php
@@ -63,11 +63,13 @@ class CategoryController extends Controller

    /**
     * Show an overview for a category for all time, per month/week/year.
-* See reference nr. 59
+     * See reference nr. 59
     *
     * @param Category $category
     *
     * @return JsonResponse
+     * @throws \FireflyIII\Exceptions\FireflyException
+     * @throws \JsonException
     */
    public function all(Category $category): JsonResponse
    {
@@ -111,9 +113,10 @@ class CategoryController extends Controller

    /**
     * Shows the category chart on the front page.
-* See reference nr. 60
+     * See reference nr. 60
     *
     * @return JsonResponse
+     * @throws \JsonException
     */
    public function frontPage(): JsonResponse
    {
@@ -138,7 +141,7 @@ class CategoryController extends Controller

    /**
     * Chart report.
-* See reference nr. 61
+     * See reference nr. 61
     *
     * @param Category   $category
     * @param Collection $accounts
@@ -146,6 +149,7 @@ class CategoryController extends Controller
     * @param Carbon     $end
     *
     * @return JsonResponse
+     * @throws \JsonException
     */
    public function reportPeriod(Category $category, Collection $accounts, Carbon $start, Carbon $end): JsonResponse
    {
@@ -254,13 +258,14 @@ class CategoryController extends Controller

    /**
     * Chart for period for transactions without a category.
-* See reference nr. 62
+     * See reference nr. 62
     *
     * @param Collection $accounts
     * @param Carbon     $start
     * @param Carbon     $end
     *
     * @return JsonResponse
+     * @throws \JsonException
     */
    public function reportPeriodNoCategory(Collection $accounts, Carbon $start, Carbon $end): JsonResponse
    {
@@ -281,12 +286,14 @@ class CategoryController extends Controller

    /**
     * Chart for a specific period.
-* See reference nr. 63
+     * See reference nr. 63
     *
     * @param Category $category
     * @param Carbon   $date
     *
     * @return JsonResponse
+     * @throws \FireflyIII\Exceptions\FireflyException
+     * @throws \JsonException
     */
    public function specificPeriod(Category $category, Carbon $date): JsonResponse
    {
--- a/app/Http/Controllers/Chart/ExpenseReportController.php
+++ b/app/Http/Controllers/Chart/ExpenseReportController.php
@@ -69,7 +69,7 @@ class ExpenseReportController extends Controller
    /**
     * Main chart that shows income and expense for a combination of expense/revenue accounts.
     *
-* See reference nr. 58
+     * See reference nr. 58
     *
     * @param Collection $accounts
     * @param Collection $expense
@@ -77,7 +77,7 @@ class ExpenseReportController extends Controller
     * @param Carbon     $end
     *
     * @return JsonResponse
-     *
+     * @throws \JsonException
     */
    public function mainChart(Collection $accounts, Collection $expense, Carbon $start, Carbon $end): JsonResponse
    {
--- a/app/Http/Controllers/Chart/PiggyBankController.php
+++ b/app/Http/Controllers/Chart/PiggyBankController.php
@@ -31,7 +31,6 @@ use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
 use FireflyIII\Support\CacheProperties;
 use FireflyIII\Support\Http\Controllers\DateCalculation;
 use Illuminate\Http\JsonResponse;
-use Illuminate\Support\Collection;

 /**
 * Class PiggyBankController.
@@ -58,13 +57,13 @@ class PiggyBankController extends Controller
    /**
     * Shows the piggy bank history.
     *
-* See reference nr. 53
+     * See reference nr. 53
     *
     * @param PiggyBankRepositoryInterface $repository
     * @param PiggyBank                    $piggyBank
     *
     * @return JsonResponse
-     *
+     * @throws \JsonException
     */
    public function history(PiggyBankRepositoryInterface $repository, PiggyBank $piggyBank): JsonResponse
    {
--- a/app/Http/Controllers/Chart/ReportController.php
+++ b/app/Http/Controllers/Chart/ReportController.php
@@ -68,6 +68,7 @@ class ReportController extends Controller
     * @param Carbon     $end
     *
     * @return JsonResponse
+     * @throws \JsonException
     */
    public function netWorth(Collection $accounts, Carbon $start, Carbon $end): JsonResponse
    {
@@ -142,6 +143,7 @@ class ReportController extends Controller
     * @param Carbon     $end
     *
     * @return JsonResponse
+     * @throws \JsonException
     */
    public function operations(Collection $accounts, Carbon $start, Carbon $end): JsonResponse
    {
--- a/app/Http/Controllers/Chart/TransactionController.php
+++ b/app/Http/Controllers/Chart/TransactionController.php
@@ -56,6 +56,7 @@ class TransactionController extends Controller
     * @param Carbon $end
     *
     * @return JsonResponse
+     * @throws \JsonException
     */
    public function budgets(Carbon $start, Carbon $end)
    {
@@ -100,6 +101,7 @@ class TransactionController extends Controller
     *
     * @return JsonResponse
     * @throws FireflyException
+     * @throws \JsonException
     */
    public function categories(string $objectType, Carbon $start, Carbon $end)
    {
@@ -158,6 +160,7 @@ class TransactionController extends Controller
     *
     * @return JsonResponse
     * @throws FireflyException
+     * @throws \JsonException
     */
    public function destinationAccounts(string $objectType, Carbon $start, Carbon $end)
    {
@@ -215,6 +218,7 @@ class TransactionController extends Controller
     *
     * @return JsonResponse
     * @throws FireflyException
+     * @throws \JsonException
     */
    public function sourceAccounts(string $objectType, Carbon $start, Carbon $end)
    {
--- a/app/Http/Controllers/CurrencyController.php
+++ b/app/Http/Controllers/CurrencyController.php
@@ -99,10 +99,10 @@ class CurrencyController extends Controller
    /**
     * Make currency the default currency.
     *
-     * @param Request             $request
-     * @param TransactionCurrency $currency
+     * @param Request $request
     *
     * @return RedirectResponse|Redirector
+     * @throws FireflyException
     */
    public function defaultCurrency(Request $request)
    {
@@ -328,6 +328,7 @@ class CurrencyController extends Controller
     * @param Request $request
     *
     * @return Factory|View
+     * @throws FireflyException
     */
    public function index(Request $request)
    {
--- a/app/Http/Controllers/Export/IndexController.php
+++ b/app/Http/Controllers/Export/IndexController.php
@@ -67,9 +67,7 @@ class IndexController extends Controller

    /**
     * @return LaravelResponse
-     * @throws CannotInsertRecord
     * @throws FireflyException
-     * @throws Exception
     */
    public function export(): LaravelResponse
    {
--- a/app/Http/Controllers/HelpController.php
+++ b/app/Http/Controllers/HelpController.php
@@ -35,6 +35,7 @@ class HelpController extends Controller
     * @param string $route
     *
     * @return JsonResponse
+     * @throws \FireflyIII\Exceptions\FireflyException
     */
    public function show(string $route): JsonResponse
    {
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -28,17 +28,12 @@ use FireflyIII\Events\RequestedVersionCheckStatus;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Http\Middleware\Installer;
 use FireflyIII\Models\AccountType;
-use FireflyIII\Models\GroupMembership;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Bill\BillRepositoryInterface;
 use FireflyIII\User;
-use Illuminate\Contracts\View\Factory;
 use Illuminate\Http\JsonResponse;
-use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
-use Illuminate\Routing\Redirector;
 use Illuminate\Support\Collection;
-use Illuminate\View\View;
 use Log;

 /**
--- a/app/Http/Controllers/JavascriptController.php
+++ b/app/Http/Controllers/JavascriptController.php
@@ -46,6 +46,7 @@ class JavascriptController extends Controller
     * @param CurrencyRepositoryInterface $currencyRepository
     *
     * @return Response
+     * @throws \FireflyIII\Exceptions\FireflyException
     */
    public function accounts(AccountRepositoryInterface $repository, CurrencyRepositoryInterface $currencyRepository): Response
    {
@@ -128,6 +129,7 @@ class JavascriptController extends Controller
     * @param CurrencyRepositoryInterface $currencyRepository
     *
     * @return Response
+     * @throws \FireflyIII\Exceptions\FireflyException
     */
    public function variables(Request $request, AccountRepositoryInterface $repository, CurrencyRepositoryInterface $currencyRepository): Response
    {
--- a/app/Http/Controllers/Json/AutoCompleteController.php
+++ b/app/Http/Controllers/Json/AutoCompleteController.php
@@ -23,10 +23,6 @@ declare(strict_types=1);
 namespace FireflyIII\Http\Controllers\Json;

 use FireflyIII\Http\Controllers\Controller;
-use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
-use FireflyIII\Repositories\TransactionGroup\TransactionGroupRepositoryInterface;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;

 /**
 * Class AutoCompleteController.
--- a/app/Http/Controllers/Json/BoxController.php
+++ b/app/Http/Controllers/Json/BoxController.php
@@ -51,6 +51,7 @@ class BoxController extends Controller
     * 2) if the user has no available amount set this period: spent per day
     *
     * @return JsonResponse
+     * @throws \JsonException
     */
    public function available(): JsonResponse
    {
@@ -129,6 +130,7 @@ class BoxController extends Controller
     * @param CurrencyRepositoryInterface $repository
     *
     * @return JsonResponse
+     * @throws \JsonException
     */
    public function balance(CurrencyRepositoryInterface $repository): JsonResponse
    {
--- a/app/Http/Controllers/Json/IntroController.php
+++ b/app/Http/Controllers/Json/IntroController.php
@@ -103,6 +103,7 @@ class IntroController extends Controller
     * @param string|null $specialPage
     *
     * @return JsonResponse
+     * @throws \FireflyIII\Exceptions\FireflyException
     */
    public function postEnable(string $route, string $specialPage = null): JsonResponse
    {
@@ -126,6 +127,7 @@ class IntroController extends Controller
     * @param string|null $specialPage
     *
     * @return JsonResponse
+     * @throws \FireflyIII\Exceptions\FireflyException
     */
    public function postFinished(string $route, string $specialPage = null): JsonResponse
    {
--- a/app/Http/Controllers/Json/ReconcileController.php
+++ b/app/Http/Controllers/Json/ReconcileController.php
@@ -215,7 +215,8 @@ class ReconcileController extends Controller
     * @param Carbon  $end
     *
     * @return JsonResponse
-     *
+     * @throws \FireflyIII\Exceptions\FireflyException
+     * @throws \JsonException
     */
    public function transactions(Account $account, Carbon $start, Carbon $end)
    {
--- a/app/Http/Controllers/NewUserController.php
+++ b/app/Http/Controllers/NewUserController.php
@@ -86,6 +86,7 @@ class NewUserController extends Controller
     * @param CurrencyRepositoryInterface $currencyRepository
     *
     * @return RedirectResponse|Redirector
+     * @throws \FireflyIII\Exceptions\FireflyException
     */
    public function submit(NewUserFormRequest $request, CurrencyRepositoryInterface $currencyRepository)
    {
--- a/app/Http/Controllers/ObjectGroup/IndexController.php
+++ b/app/Http/Controllers/ObjectGroup/IndexController.php
@@ -27,11 +27,9 @@ namespace FireflyIII\Http\Controllers\ObjectGroup;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\ObjectGroup;
 use FireflyIII\Repositories\ObjectGroup\ObjectGroupRepositoryInterface;
-use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
-use Illuminate\View\View;
 use Log;

 /**
--- a/app/Http/Controllers/Popup/ReportController.php
+++ b/app/Http/Controllers/Popup/ReportController.php
@@ -51,26 +51,14 @@ class ReportController extends Controller
        app('view')->share('start', $attributes['startDate']);
        app('view')->share('end', $attributes['endDate']);

-        switch ($attributes['location']) {
-            default:
-                $html = sprintf('Firefly III cannot handle "%s"-popups.', $attributes['location']);
-                break;
-            case 'budget-spent-amount':
-                $html = $this->budgetSpentAmount($attributes);
-                break;
-            case 'expense-entry':
-                $html = $this->expenseEntry($attributes);
-                break;
-            case 'income-entry':
-                $html = $this->incomeEntry($attributes);
-                break;
-            case 'category-entry':
-                $html = $this->categoryEntry($attributes);
-                break;
-            case 'budget-entry':
-                $html = $this->budgetEntry($attributes);
-                break;
-        }
+        $html = match ($attributes['location']) {
+            default => sprintf('Firefly III cannot handle "%s"-popups.', $attributes['location']),
+            'budget-spent-amount' => $this->budgetSpentAmount($attributes),
+            'expense-entry' => $this->expenseEntry($attributes),
+            'income-entry' => $this->incomeEntry($attributes),
+            'category-entry' => $this->categoryEntry($attributes),
+            'budget-entry' => $this->budgetEntry($attributes),
+        };

        return response()->json(['html' => $html]);
    }
--- a/app/Http/Controllers/PreferencesController.php
+++ b/app/Http/Controllers/PreferencesController.php
@@ -64,6 +64,7 @@ class PreferencesController extends Controller
     * @param AccountRepositoryInterface $repository
     *
     * @return Factory|View
+     * @throws \FireflyIII\Exceptions\FireflyException
     */
    public function index(AccountRepositoryInterface $repository)
    {
@@ -144,7 +145,7 @@ class PreferencesController extends Controller
     * @param Request $request
     *
     * @return RedirectResponse|Redirector
-     *
+     * @throws \FireflyIII\Exceptions\FireflyException
     */
    public function postIndex(Request $request)
    {
--- a/app/Http/Controllers/ProfileController.php
+++ b/app/Http/Controllers/ProfileController.php
@@ -389,7 +389,10 @@ class ProfileController extends Controller
    }

    /**
+     * @param Request $request
+     *
     * @return Factory|View
+     * @throws FireflyException
     */
    public function newBackupCodes(Request $request)
    {
@@ -506,6 +509,7 @@ class ProfileController extends Controller
     * @param TokenFormRequest $request
     *
     * @return RedirectResponse|Redirector
+     * @throws FireflyException
     */
    public function postCode(TokenFormRequest $request)
    {
@@ -657,9 +661,10 @@ class ProfileController extends Controller
    }

    /**
-* See reference nr. 64
+     * See reference nr. 64
     *
     * @param string $mfaCode
+     * @throws FireflyException
     */
    private function addToMFAHistory(string $mfaCode): void
    {
--- a/app/Http/Controllers/Report/AccountController.php
+++ b/app/Http/Controllers/Report/AccountController.php
@@ -44,7 +44,7 @@ class AccountController extends Controller
     * @param Carbon     $end
     *
     * @return mixed|string
-     *
+     * @throws \JsonException
     */
    public function general(Collection $accounts, Carbon $start, Carbon $end)
    {
--- a/app/Http/Controllers/Report/BudgetController.php
+++ b/app/Http/Controllers/Report/BudgetController.php
@@ -307,6 +307,7 @@ class BudgetController extends Controller
     * @param Carbon     $end
     *
     * @return mixed|string
+     * @throws \JsonException
     */
    public function period(Collection $accounts, Carbon $start, Carbon $end)
    {
--- a/app/Http/Controllers/Report/CategoryController.php
+++ b/app/Http/Controllers/Report/CategoryController.php
@@ -488,6 +488,7 @@ class CategoryController extends Controller
     * @param Carbon     $end
     *
     * @return mixed|string
+     * @throws \JsonException
     */
    public function expenses(Collection $accounts, Carbon $start, Carbon $end)
    {
@@ -568,6 +569,7 @@ class CategoryController extends Controller
     * @param Carbon     $end
     *
     * @return string
+     * @throws \JsonException
     */
    public function income(Collection $accounts, Carbon $start, Carbon $end): string
    {
@@ -646,7 +648,7 @@ class CategoryController extends Controller
     * @param Carbon     $end
     *
     * @return mixed|string
-     *
+     * @throws \JsonException
     */
    public function operations(Collection $accounts, Carbon $start, Carbon $end)
    {
--- a/app/Http/Controllers/Report/OperationsController.php
+++ b/app/Http/Controllers/Report/OperationsController.php
@@ -66,6 +66,7 @@ class OperationsController extends Controller
     * @param Carbon     $end
     *
     * @return mixed|string
+     * @throws \JsonException
     */
    public function expenses(Collection $accounts, Carbon $start, Carbon $end)
    {
@@ -101,6 +102,7 @@ class OperationsController extends Controller
     * @param Carbon     $end
     *
     * @return string
+     * @throws \JsonException
     */
    public function income(Collection $accounts, Carbon $start, Carbon $end): string
    {
@@ -136,6 +138,7 @@ class OperationsController extends Controller
     * @param Carbon     $end
     *
     * @return mixed|string
+     * @throws \JsonException
     */
    public function operations(Collection $accounts, Carbon $start, Carbon $end)
    {
--- a/app/Http/Controllers/ReportController.php
+++ b/app/Http/Controllers/ReportController.php
@@ -260,6 +260,7 @@ class ReportController extends Controller
     * @param AccountRepositoryInterface $repository
     *
     * @return Factory|View
+     * @throws FireflyException
     */
    public function index(AccountRepositoryInterface $repository)
    {
@@ -305,23 +306,13 @@ class ReportController extends Controller
     */
    public function options(string $reportType)
    {
-        switch ($reportType) {
-            default:
-                $result = $this->noReportOptions();
-                break;
-            case 'category':
-                $result = $this->categoryReportOptions();
-                break;
-            case 'budget':
-                $result = $this->budgetReportOptions();
-                break;
-            case 'tag':
-                $result = $this->tagReportOptions();
-                break;
-            case 'double':
-                $result = $this->doubleReportOptions();
-                break;
-        }
+        $result = match ($reportType) {
+            default => $this->noReportOptions(),
+            'category' => $this->categoryReportOptions(),
+            'budget' => $this->budgetReportOptions(),
+            'tag' => $this->tagReportOptions(),
+            'double' => $this->doubleReportOptions(),
+        };

        return response()->json(['html' => $result]);
    }
@@ -383,27 +374,14 @@ class ReportController extends Controller
            return prefixView('error')->with('message', (string)trans('firefly.end_after_start_date'));
        }

-        switch ($reportType) {
-            default:
-            case 'default':
-                $uri = route('reports.report.default', [$accounts, $start, $end]);
-                break;
-            case 'category':
-                $uri = route('reports.report.category', [$accounts, $categories, $start, $end]);
-                break;
-            case 'audit':
-                $uri = route('reports.report.audit', [$accounts, $start, $end]);
-                break;
-            case 'budget':
-                $uri = route('reports.report.budget', [$accounts, $budgets, $start, $end]);
-                break;
-            case 'tag':
-                $uri = route('reports.report.tag', [$accounts, $tags, $start, $end]);
-                break;
-            case 'double':
-                $uri = route('reports.report.double', [$accounts, $double, $start, $end]);
-                break;
-        }
+        $uri = match ($reportType) {
+            default => route('reports.report.default', [$accounts, $start, $end]),
+            'category' => route('reports.report.category', [$accounts, $categories, $start, $end]),
+            'audit' => route('reports.report.audit', [$accounts, $start, $end]),
+            'budget' => route('reports.report.budget', [$accounts, $budgets, $start, $end]),
+            'tag' => route('reports.report.tag', [$accounts, $tags, $start, $end]),
+            'double' => route('reports.report.double', [$accounts, $double, $start, $end]),
+        };

        return redirect($uri);
    }
--- a/app/Http/Controllers/Rule/IndexController.php
+++ b/app/Http/Controllers/Rule/IndexController.php
@@ -22,14 +22,12 @@ declare(strict_types=1);

 namespace FireflyIII\Http\Controllers\Rule;

-use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\Rule;
 use FireflyIII\Models\RuleGroup;
 use FireflyIII\Repositories\Rule\RuleRepositoryInterface;
 use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface;
 use FireflyIII\Support\Http\Controllers\RuleManagement;
-use FireflyIII\User;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\RedirectResponse;
--- a/app/Http/Controllers/TagController.php
+++ b/app/Http/Controllers/TagController.php
@@ -272,7 +272,7 @@ class TagController extends Controller
     * @param Tag     $tag
     *
     * @return Factory|View
-     *
+     * @throws FireflyException
     */
    public function showAll(Request $request, Tag $tag)
    {
--- a/app/Http/Controllers/Transaction/CreateController.php
+++ b/app/Http/Controllers/Transaction/CreateController.php
@@ -31,7 +31,6 @@ use FireflyIII\Services\Internal\Update\GroupCloneService;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Routing\Redirector;
-use Illuminate\View\View;

 /**
 * Class CreateController
@@ -88,6 +87,7 @@ class CreateController extends Controller
     * @param string|null $objectType
     *
     * @return Factory|\Illuminate\Contracts\View\View
+     * @throws \FireflyIII\Exceptions\FireflyException
     */
    public function create(?string $objectType)
    {
--- 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\Exceptions\FireflyException;
 use FireflyIII\Support\System\GeneratesInstallationId;
 use Illuminate\Http\Request;

--- a/app/Http/Middleware/TrustProxies.php
+++ b/app/Http/Middleware/TrustProxies.php
@@ -24,7 +24,6 @@ namespace FireflyIII\Http\Middleware;

 use Fideloper\Proxy\TrustProxies as Middleware;
 use Illuminate\Contracts\Config\Repository;
-use Illuminate\Http\Request;

 /**
 * Class TrustProxies