Code cleanup.

2025-10-14 08:11:20 +00:00 · 2023-12-20 19:35:52 +01:00
parent c4f6366642
commit 64ec0cf62e
997 changed files with 12908 additions and 28136 deletions
--- a/app/Http/Requests/AccountFormRequest.php
+++ b/app/Http/Requests/AccountFormRequest.php
@@ -45,8 +45,6 @@ class AccountFormRequest extends FormRequest

    /**
     * Get all data.
-     *
-     * @return array
     */
    public function getAccountData(): array
    {
@@ -95,8 +93,6 @@ class AccountFormRequest extends FormRequest

    /**
     * Rules for this request.
-     *
-     * @return array
     */
    public function rules(): array
    {
@@ -112,22 +108,22 @@ class AccountFormRequest extends FormRequest
            'virtual_balance'                    => 'numeric|nullable|max:1000000000',
            'currency_id'                        => 'exists:transaction_currencies,id',
            'account_number'                     => 'between:1,255|uniqueAccountNumberForUser|nullable',
-            'account_role'                       => 'in:' . $accountRoles,
+            'account_role'                       => 'in:'.$accountRoles,
            'active'                             => 'boolean',
-            'cc_type'                            => 'in:' . $ccPaymentTypes,
+            'cc_type'                            => 'in:'.$ccPaymentTypes,
            'amount_currency_id_opening_balance' => 'exists:transaction_currencies,id',
            'amount_currency_id_virtual_balance' => 'exists:transaction_currencies,id',
-            'what'                               => 'in:' . $types,
+            'what'                               => 'in:'.$types,
            'interest_period'                    => 'in:daily,monthly,yearly',
        ];
        $rules          = Location::requestRules($rules);

-        /** @var Account|null $account */
+        /** @var null|Account $account */
        $account = $this->route()->parameter('account');
        if (null !== $account) {
            // add rules:
            $rules['id']   = 'belongsToUser:accounts';
-            $rules['name'] = 'required|max:1024|min:1|uniqueAccountForUser:' . $account->id;
+            $rules['name'] = 'required|max:1024|min:1|uniqueAccountForUser:'.$account->id;
            $rules['iban'] = ['iban', 'nullable', new UniqueIban($account, $account->accountType->type)];
        }

--- a/app/Http/Requests/AttachmentFormRequest.php
+++ b/app/Http/Requests/AttachmentFormRequest.php
@@ -29,8 +29,6 @@ use Illuminate\Foundation\Http\FormRequest;

 /**
 * Class AttachmentFormRequest.
- *
-
 */
 class AttachmentFormRequest extends FormRequest
 {
@@ -39,8 +37,6 @@ class AttachmentFormRequest extends FormRequest

    /**
     * Returns the data required by the controller.
-     *
-     * @return array
     */
    public function getAttachmentData(): array
    {
@@ -52,8 +48,6 @@ class AttachmentFormRequest extends FormRequest

    /**
     * Rules for this request.
-     *
-     * @return array
     */
    public function rules(): array
    {
--- a/app/Http/Requests/BillStoreRequest.php
+++ b/app/Http/Requests/BillStoreRequest.php
@@ -37,8 +37,6 @@ class BillStoreRequest extends FormRequest

    /**
     * Returns the data required by the controller.
-     *
-     * @return array
     */
    public function getBillData(): array
    {
@@ -61,8 +59,6 @@ class BillStoreRequest extends FormRequest

    /**
     * Rules for this request.
-     *
-     * @return array
     */
    public function rules(): array
    {
--- a/app/Http/Requests/BillUpdateRequest.php
+++ b/app/Http/Requests/BillUpdateRequest.php
@@ -38,8 +38,6 @@ class BillUpdateRequest extends FormRequest

    /**
     * Returns the data required by the controller.
-     *
-     * @return array
     */
    public function getBillData(): array
    {
@@ -62,8 +60,6 @@ class BillUpdateRequest extends FormRequest

    /**
     * Rules for this request.
-     *
-     * @return array
     */
    public function rules(): array
    {
--- a/app/Http/Requests/BudgetFormStoreRequest.php
+++ b/app/Http/Requests/BudgetFormStoreRequest.php
@@ -40,8 +40,6 @@ class BudgetFormStoreRequest extends FormRequest

    /**
     * Returns the data required by the controller.
-     *
-     * @return array
     */
    public function getBudgetData(): array
    {
@@ -57,8 +55,6 @@ class BudgetFormStoreRequest extends FormRequest

    /**
     * Rules for this request.
-     *
-     * @return array
     */
    public function rules(): array
    {
@@ -74,10 +70,6 @@ class BudgetFormStoreRequest extends FormRequest

    /**
     * Configure the validator instance with special rules for after the basic validation rules.
-     *
-     * @param Validator $validator
-     *
-     * @return void
     */
    public function withValidator(Validator $validator): void
    {
--- a/app/Http/Requests/BudgetFormUpdateRequest.php
+++ b/app/Http/Requests/BudgetFormUpdateRequest.php
@@ -41,8 +41,6 @@ class BudgetFormUpdateRequest extends FormRequest

    /**
     * Returns the data required by the controller.
-     *
-     * @return array
     */
    public function getBudgetData(): array
    {
@@ -58,18 +56,16 @@ class BudgetFormUpdateRequest extends FormRequest

    /**
     * Rules for this request.
-     *
-     * @return array
     */
    public function rules(): array
    {
        $nameRule = 'required|between:1,100|uniqueObjectForUser:budgets,name';

-        /** @var Budget|null $budget */
+        /** @var null|Budget $budget */
        $budget = $this->route()->parameter('budget');

        if (null !== $budget) {
-            $nameRule = 'required|between:1,100|uniqueObjectForUser:budgets,name,' . $budget->id;
+            $nameRule = 'required|between:1,100|uniqueObjectForUser:budgets,name,'.$budget->id;
        }

        return [
@@ -84,10 +80,6 @@ class BudgetFormUpdateRequest extends FormRequest

    /**
     * Configure the validator instance with special rules for after the basic validation rules.
-     *
-     * @param Validator $validator
-     *
-     * @return void
     */
    public function withValidator(Validator $validator): void
    {
--- a/app/Http/Requests/BudgetIncomeRequest.php
+++ b/app/Http/Requests/BudgetIncomeRequest.php
@@ -28,8 +28,6 @@ use Illuminate\Foundation\Http\FormRequest;

 /**
 * Class BudgetIncomeRequest.
- *
-
 */
 class BudgetIncomeRequest extends FormRequest
 {
@@ -37,8 +35,6 @@ class BudgetIncomeRequest extends FormRequest

    /**
     * Rules for this request.
-     *
-     * @return array
     */
    public function rules(): array
    {
--- a/app/Http/Requests/BulkEditJournalRequest.php
+++ b/app/Http/Requests/BulkEditJournalRequest.php
@@ -37,8 +37,6 @@ class BulkEditJournalRequest extends FormRequest

    /**
     * Rules for this request.
-     *
-     * @return array
     */
    public function rules(): array
    {
--- a/app/Http/Requests/CategoryFormRequest.php
+++ b/app/Http/Requests/CategoryFormRequest.php
@@ -38,8 +38,6 @@ class CategoryFormRequest extends FormRequest

    /**
     * Get information for the controller.
-     *
-     * @return array
     */
    public function getCategoryData(): array
    {
@@ -51,17 +49,16 @@ class CategoryFormRequest extends FormRequest

    /**
     * Rules for this request.
-     *
-     * @return array
     */
    public function rules(): array
    {
        $nameRule = 'required|between:1,100|uniqueObjectForUser:categories,name';
-        /** @var Category|null $category */
+
+        /** @var null|Category $category */
        $category = $this->route()->parameter('category');

        if (null !== $category) {
-            $nameRule = 'required|between:1,100|uniqueObjectForUser:categories,name,' . $category->id;
+            $nameRule = 'required|between:1,100|uniqueObjectForUser:categories,name,'.$category->id;
        }

        // fixed
--- a/app/Http/Requests/ConfigurationRequest.php
+++ b/app/Http/Requests/ConfigurationRequest.php
@@ -28,8 +28,6 @@ use Illuminate\Foundation\Http\FormRequest;

 /**
 * Class ConfigurationRequest.
- *
-
 */
 class ConfigurationRequest extends FormRequest
 {
@@ -37,8 +35,6 @@ class ConfigurationRequest extends FormRequest

    /**
     * Returns the data required by the controller.
-     *
-     * @return array
     */
    public function getConfigurationData(): array
    {
@@ -50,8 +46,6 @@ class ConfigurationRequest extends FormRequest

    /**
     * Rules for this request.
-     *
-     * @return array
     */
    public function rules(): array
    {
--- a/app/Http/Requests/CurrencyFormRequest.php
+++ b/app/Http/Requests/CurrencyFormRequest.php
@@ -38,8 +38,6 @@ class CurrencyFormRequest extends FormRequest

    /**
     * Returns the data required by the controller.
-     *
-     * @return array
     */
    public function getCurrencyData(): array
    {
@@ -54,8 +52,6 @@ class CurrencyFormRequest extends FormRequest

    /**
     * Rules for this request.
-     *
-     * @return array
     */
    public function rules(): array
    {
@@ -68,7 +64,7 @@ class CurrencyFormRequest extends FormRequest
            'enabled'        => 'in:0,1',
        ];

-        /** @var TransactionCurrency|null $currency */
+        /** @var null|TransactionCurrency $currency */
        $currency = $this->route()->parameter('currency');

        if (null !== $currency) {
--- a/app/Http/Requests/DeleteAccountFormRequest.php
+++ b/app/Http/Requests/DeleteAccountFormRequest.php
@@ -28,8 +28,6 @@ use Illuminate\Foundation\Http\FormRequest;

 /**
 * Class DeleteAccountFormRequest.
- *
-
 */
 class DeleteAccountFormRequest extends FormRequest
 {
@@ -37,8 +35,6 @@ class DeleteAccountFormRequest extends FormRequest

    /**
     * Rules for this request.
-     *
-     * @return array
     */
    public function rules(): array
    {
--- a/app/Http/Requests/EmailFormRequest.php
+++ b/app/Http/Requests/EmailFormRequest.php
@@ -29,8 +29,6 @@ use Illuminate\Foundation\Http\FormRequest;

 /**
 * Class EmailFormRequest.
- *
-
 */
 class EmailFormRequest extends FormRequest
 {
@@ -39,8 +37,6 @@ class EmailFormRequest extends FormRequest

    /**
     * Rules for this request.
-     *
-     * @return array
     */
    public function rules(): array
    {
--- a/app/Http/Requests/InviteUserFormRequest.php
+++ b/app/Http/Requests/InviteUserFormRequest.php
@@ -38,8 +38,6 @@ class InviteUserFormRequest extends FormRequest

    /**
     * Rules for this request.
-     *
-     * @return array
     */
    public function rules(): array
    {
--- a/app/Http/Requests/JournalLinkRequest.php
+++ b/app/Http/Requests/JournalLinkRequest.php
@@ -38,8 +38,6 @@ class JournalLinkRequest extends FormRequest

    /**
     * Returns the data required by the controller.
-     *
-     * @return array
     */
    public function getLinkInfo(): array
    {
@@ -56,14 +54,13 @@ class JournalLinkRequest extends FormRequest

    /**
     * Rules for this request.
-     *
-     * @return array
     */
    public function rules(): array
    {
        // all possible combinations of link types and inward / outward:
        $combinations = [];
        $linkTypes    = LinkType::get(['id']);
+
        /** @var LinkType $type */
        foreach ($linkTypes as $type) {
            $combinations[] = sprintf('%d_inward', $type->id);
--- a/app/Http/Requests/LinkTypeFormRequest.php
+++ b/app/Http/Requests/LinkTypeFormRequest.php
@@ -37,8 +37,6 @@ class LinkTypeFormRequest extends FormRequest

    /**
     * Rules for this request.
-     *
-     * @return array
     */
    public function rules(): array
    {
--- a/app/Http/Requests/MassDeleteJournalRequest.php
+++ b/app/Http/Requests/MassDeleteJournalRequest.php
@@ -28,8 +28,6 @@ use Illuminate\Foundation\Http\FormRequest;

 /**
 * Class MassDeleteJournalRequest.
- *
-
 */
 class MassDeleteJournalRequest extends FormRequest
 {
@@ -37,8 +35,6 @@ class MassDeleteJournalRequest extends FormRequest

    /**
     * Rules for this request.
-     *
-     * @return array
     */
    public function rules(): array
    {
--- a/app/Http/Requests/MassEditJournalRequest.php
+++ b/app/Http/Requests/MassEditJournalRequest.php
@@ -28,8 +28,6 @@ use Illuminate\Foundation\Http\FormRequest;

 /**
 * Class MassEditJournalRequest.
- *
-
 */
 class MassEditJournalRequest extends FormRequest
 {
@@ -37,8 +35,6 @@ class MassEditJournalRequest extends FormRequest

    /**
     * Rules for this request.
-     *
-     * @return array
     */
    public function rules(): array
    {
--- a/app/Http/Requests/NewUserFormRequest.php
+++ b/app/Http/Requests/NewUserFormRequest.php
@@ -29,8 +29,6 @@ use Illuminate\Foundation\Http\FormRequest;

 /**
 * Class NewUserFormRequest.
- *
-
 */
 class NewUserFormRequest extends FormRequest
 {
@@ -39,8 +37,6 @@ class NewUserFormRequest extends FormRequest

    /**
     * Rules for this request.
-     *
-     * @return array
     */
    public function rules(): array
    {
--- a/app/Http/Requests/ObjectGroupFormRequest.php
+++ b/app/Http/Requests/ObjectGroupFormRequest.php
@@ -38,8 +38,6 @@ class ObjectGroupFormRequest extends FormRequest

    /**
     * Returns the data required by the controller.
-     *
-     * @return array
     */
    public function getObjectGroupData(): array
    {
@@ -50,12 +48,10 @@ class ObjectGroupFormRequest extends FormRequest

    /**
     * Rules for this request.
-     *
-     * @return array
     */
    public function rules(): array
    {
-        /** @var ObjectGroup|null $objectGroup */
+        /** @var null|ObjectGroup $objectGroup */
        $objectGroup = $this->route()->parameter('objectGroup');
        $titleRule   = 'required|between:1,255|uniqueObjectGroup';

--- a/app/Http/Requests/PiggyBankStoreRequest.php
+++ b/app/Http/Requests/PiggyBankStoreRequest.php
@@ -37,8 +37,6 @@ class PiggyBankStoreRequest extends FormRequest

    /**
     * Returns the data required by the controller.
-     *
-     * @return array
     */
    public function getPiggyBankData(): array
    {
@@ -55,8 +53,6 @@ class PiggyBankStoreRequest extends FormRequest

    /**
     * Rules for this request.
-     *
-     * @return array
     */
    public function rules(): array
    {
--- a/app/Http/Requests/PiggyBankUpdateRequest.php
+++ b/app/Http/Requests/PiggyBankUpdateRequest.php
@@ -38,8 +38,6 @@ class PiggyBankUpdateRequest extends FormRequest

    /**
     * Returns the data required by the controller.
-     *
-     * @return array
     */
    public function getPiggyBankData(): array
    {
@@ -56,8 +54,6 @@ class PiggyBankUpdateRequest extends FormRequest

    /**
     * Rules for this request.
-     *
-     * @return array
     */
    public function rules(): array
    {
--- a/app/Http/Requests/ProfileFormRequest.php
+++ b/app/Http/Requests/ProfileFormRequest.php
@@ -28,8 +28,6 @@ use Illuminate\Foundation\Http\FormRequest;

 /**
 * Class ProfileFormRequest.
- *
-
 */
 class ProfileFormRequest extends FormRequest
 {
@@ -37,8 +35,6 @@ class ProfileFormRequest extends FormRequest

    /**
     * Rules for this request.
-     *
-     * @return array
     */
    public function rules(): array
    {
--- a/app/Http/Requests/ReconciliationStoreRequest.php
+++ b/app/Http/Requests/ReconciliationStoreRequest.php
@@ -38,8 +38,6 @@ class ReconciliationStoreRequest extends FormRequest

    /**
     * Returns the data required by the controller.
-     *
-     * @return array
     */
    public function getAll(): array
    {
@@ -63,8 +61,6 @@ class ReconciliationStoreRequest extends FormRequest

    /**
     * Rules for this request.
-     *
-     * @return array
     */
    public function rules(): array
    {
--- a/app/Http/Requests/RecurrenceFormRequest.php
+++ b/app/Http/Requests/RecurrenceFormRequest.php
@@ -46,9 +46,7 @@ class RecurrenceFormRequest extends FormRequest
    /**
     * Get the data required by the controller.
     *
-     * @return array
     * @throws FireflyException
-     *
     */
    public function getAll(): array
    {
@@ -94,7 +92,6 @@ class RecurrenceFormRequest extends FormRequest
                    'weekend' => $this->convertInteger('weekend'),
                ],
            ],
-
        ];

        // fill in foreign currency data
@@ -131,6 +128,7 @@ class RecurrenceFormRequest extends FormRequest
        // replace category name with a new category:
        $factory = app(CategoryFactory::class);
        $factory->setUser(auth()->user());
+
        /**
         * @var int   $index
         * @var array $transaction
@@ -148,45 +146,8 @@ class RecurrenceFormRequest extends FormRequest
        return $return;
    }

-    /**
-     * Parses repetition data.
-     *
-     * @return array
-     */
-    private function parseRepetitionData(): array
-    {
-        $value  = $this->convertString('repetition_type');
-        $return = [
-            'type'   => '',
-            'moment' => '',
-        ];
-
-        if ('daily' === $value) {
-            $return['type'] = $value;
-        }
-        //monthly,17
-        //ndom,3,7
-        if (in_array(substr($value, 0, 6), ['yearly', 'weekly'], true)) {
-            $return['type']   = substr($value, 0, 6);
-            $return['moment'] = substr($value, 7);
-        }
-        if (str_starts_with($value, 'monthly')) {
-            $return['type']   = substr($value, 0, 7);
-            $return['moment'] = substr($value, 8);
-        }
-        if (str_starts_with($value, 'ndom')) {
-            $return['type']   = substr($value, 0, 4);
-            $return['moment'] = substr($value, 5);
-        }
-
-        return $return;
-    }
-
    /**
     * The rules for this request.
-     *
-     * @return array
-     *
     */
    public function rules(): array
    {
@@ -195,7 +156,7 @@ class RecurrenceFormRequest extends FormRequest
        $rules    = [
            // mandatory info for recurrence.
            'title'                   => 'required|between:1,255|uniqueObjectForUser:recurrences,title',
-            'first_date'              => 'required|date|after:' . $today->format('Y-m-d'),
+            'first_date'              => 'required|date|after:'.$today->format('Y-m-d'),
            'repetition_type'         => ['required', new ValidRecurrenceRepetitionValue(), new ValidRecurrenceRepetitionType(), 'between:1,20'],
            'skip'                    => 'required|numeric|integer|gte:0|lte:31',

@@ -239,7 +200,7 @@ class RecurrenceFormRequest extends FormRequest

        // if ends at date X, set another rule.
        if ('until_date' === $this->convertString('repetition_end')) {
-            $rules['repeat_until'] = 'required|date|after:' . $tomorrow->format('Y-m-d');
+            $rules['repeat_until'] = 'required|date|after:'.$tomorrow->format('Y-m-d');
        }

        // switch on type to expand rules for source and destination accounts:
@@ -259,11 +220,11 @@ class RecurrenceFormRequest extends FormRequest
        }

        // update some rules in case the user is editing a post:
-        /** @var Recurrence|null $recurrence */
+        /** @var null|Recurrence $recurrence */
        $recurrence = $this->route()->parameter('recurrence');
        if ($recurrence instanceof Recurrence) {
            $rules['id']         = 'required|numeric|exists:recurrences,id';
-            $rules['title']      = 'required|between:1,255|uniqueObjectForUser:recurrences,title,' . $recurrence->id;
+            $rules['title']      = 'required|between:1,255|uniqueObjectForUser:recurrences,title,'.$recurrence->id;
            $rules['first_date'] = 'required|date';
        }

@@ -272,10 +233,6 @@ class RecurrenceFormRequest extends FormRequest

    /**
     * Configure the validator instance with special rules for after the basic validation rules.
-     *
-     * @param Validator $validator
-     *
-     * @return void
     */
    public function withValidator(Validator $validator): void
    {
@@ -290,13 +247,12 @@ class RecurrenceFormRequest extends FormRequest
    /**
     * Validates the given account information. Switches on given transaction type.
     *
-     * @param Validator $validator
-     *
     * @throws FireflyException
     */
    public function validateAccountInformation(Validator $validator): void
    {
        app('log')->debug('Now in validateAccountInformation (RecurrenceFormRequest)()');
+
        /** @var AccountValidator $accountValidator */
        $accountValidator = app(AccountValidator::class);
        $data             = $validator->getData();
@@ -332,7 +288,7 @@ class RecurrenceFormRequest extends FormRequest
        }

        // validate source account.
-        $validSource = $accountValidator->validateSource(['id' => $sourceId,]);
+        $validSource = $accountValidator->validateSource(['id' => $sourceId]);

        // do something with result:
        if (false === $validSource) {
@@ -344,7 +300,7 @@ class RecurrenceFormRequest extends FormRequest
        }

        // validate destination account
-        $validDestination = $accountValidator->validateDestination(['id' => $destinationId,]);
+        $validDestination = $accountValidator->validateDestination(['id' => $destinationId]);
        // do something with result:
        if (false === $validDestination) {
            $message = (string)trans('validation.generic_invalid_destination');
@@ -352,4 +308,36 @@ class RecurrenceFormRequest extends FormRequest
            $validator->errors()->add('withdrawal_destination_id', $message);
        }
    }
+
+    /**
+     * Parses repetition data.
+     */
+    private function parseRepetitionData(): array
+    {
+        $value  = $this->convertString('repetition_type');
+        $return = [
+            'type'   => '',
+            'moment' => '',
+        ];
+
+        if ('daily' === $value) {
+            $return['type'] = $value;
+        }
+        // monthly,17
+        // ndom,3,7
+        if (in_array(substr($value, 0, 6), ['yearly', 'weekly'], true)) {
+            $return['type']   = substr($value, 0, 6);
+            $return['moment'] = substr($value, 7);
+        }
+        if (str_starts_with($value, 'monthly')) {
+            $return['type']   = substr($value, 0, 7);
+            $return['moment'] = substr($value, 8);
+        }
+        if (str_starts_with($value, 'ndom')) {
+            $return['type']   = substr($value, 0, 4);
+            $return['moment'] = substr($value, 5);
+        }
+
+        return $return;
+    }
 }
--- a/app/Http/Requests/ReportFormRequest.php
+++ b/app/Http/Requests/ReportFormRequest.php
@@ -43,8 +43,6 @@ class ReportFormRequest extends FormRequest

    /**
     * Validate list of accounts.
-     *
-     * @return Collection
     */
    public function getAccountList(): Collection
    {
@@ -67,8 +65,6 @@ class ReportFormRequest extends FormRequest

    /**
     * Validate list of budgets.
-     *
-     * @return Collection
     */
    public function getBudgetList(): Collection
    {
@@ -90,8 +86,6 @@ class ReportFormRequest extends FormRequest

    /**
     * Validate list of categories.
-     *
-     * @return Collection
     */
    public function getCategoryList(): Collection
    {
@@ -113,8 +107,6 @@ class ReportFormRequest extends FormRequest

    /**
     * Validate list of accounts which exist twice in system.
-     *
-     * @return Collection
     */
    public function getDoubleList(): Collection
    {
@@ -137,8 +129,6 @@ class ReportFormRequest extends FormRequest
    /**
     * Validate end date.
     *
-     * @return Carbon
-     *
     * @throws FireflyException
     */
    public function getEndDate(): Carbon
@@ -154,26 +144,28 @@ class ReportFormRequest extends FormRequest
            if (false !== preg_match($pattern, $string)) {
                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());
+
                    throw new FireflyException($error, 0, $e);
                }
+
                return $date;
            }
            $error = sprintf('"%s" is not a valid date range: %s', $range, 'invalid format :(');
            app('log')->error($error);
+
            throw new FireflyException($error, 0);
        }
+
        return $date;
    }

    /**
     * Validate start date.
     *
-     * @return Carbon
-     *
     * @throws FireflyException
     */
    public function getStartDate(): Carbon
@@ -189,16 +181,19 @@ class ReportFormRequest extends FormRequest
            if (false !== preg_match($pattern, $string)) {
                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());
+
                    throw new FireflyException($error, 0, $e);
                }
+
                return $date;
            }
            $error = sprintf('"%s" is not a valid date range: %s', $range, 'invalid format :(');
            app('log')->error($error);
+
            throw new FireflyException($error, 0);
        }

@@ -207,8 +202,6 @@ class ReportFormRequest extends FormRequest

    /**
     * Validate list of tags.
-     *
-     * @return Collection
     */
    public function getTagList(): Collection
    {
@@ -221,6 +214,7 @@ class ReportFormRequest extends FormRequest
        }
        if (!is_array($set)) {
            app('log')->error(sprintf('Set is not an array! "%s"', $set));
+
            return $collection;
        }
        foreach ($set as $tagTag) {
@@ -228,6 +222,7 @@ class ReportFormRequest extends FormRequest
            $tag = $repository->findByTag($tagTag);
            if (null !== $tag) {
                $collection->push($tag);
+
                continue;
            }
            $tag = $repository->find((int)$tagTag);
@@ -241,8 +236,6 @@ class ReportFormRequest extends FormRequest

    /**
     * Rules for this request.
-     *
-     * @return array
     */
    public function rules(): array
    {
--- a/app/Http/Requests/RuleFormRequest.php
+++ b/app/Http/Requests/RuleFormRequest.php
@@ -40,9 +40,6 @@ class RuleFormRequest extends FormRequest

    /**
     * Get all data for controller.
-     *
-     * @return array
-     *
     */
    public function getRuleData(): array
    {
@@ -59,9 +56,69 @@ class RuleFormRequest extends FormRequest
        ];
    }

+    public static function replaceAmountTrigger(array $array): array
+    {
+        // do some sneaky search and replace.
+        $amountFields = [
+            'amount_is',
+            'amount',
+            'amount_exactly',
+            'amount_less',
+            'amount_max',
+            'amount_more',
+            'amount_min',
+            'foreign_amount_is',
+            'foreign_amount',
+            'foreign_amount_less',
+            'foreign_amount_max',
+            'foreign_amount_more',
+            'foreign_amount_min',
+        ];
+        if (in_array($array['type'], $amountFields, true) && '0' === $array['value']) {
+            $array['value'] = '0.00';
+        }
+
+        return $array;
+    }
+
    /**
-     * @return array
+     * Rules for this request.
     */
+    public function rules(): array
+    {
+        $validTriggers = $this->getTriggers();
+        $validActions  = array_keys(config('firefly.rule-actions'));
+
+        // some actions require text (aka context):
+        $contextActions = implode(',', config('firefly.context-rule-actions'));
+
+        // some triggers require text (aka context):
+        $contextTriggers = implode(',', $this->getTriggersWithContext());
+
+        // initial set of rules:
+        $rules = [
+            'title'            => 'required|between:1,100|uniqueObjectForUser:rules,title',
+            'description'      => 'between:1,5000|nullable',
+            'stop_processing'  => 'boolean',
+            'rule_group_id'    => 'required|belongsToUser:rule_groups',
+            'trigger'          => 'required|in:store-journal,update-journal',
+            'triggers.*.type'  => 'required|in:'.implode(',', $validTriggers),
+            'triggers.*.value' => sprintf('required_if:triggers.*.type,%s|max:1024|min:1|ruleTriggerValue', $contextTriggers),
+            'actions.*.type'   => 'required|in:'.implode(',', $validActions),
+            'actions.*.value'  => sprintf('required_if:actions.*.type,%s|min:0|max:1024|ruleActionValue', $contextActions),
+            'strict'           => 'in:0,1',
+        ];
+
+        /** @var null|Rule $rule */
+        $rule = $this->route()->parameter('rule');
+
+        if (null !== $rule) {
+            $rules['title'] = 'required|between:1,100|uniqueObjectForUser:rules,title,'.$rule->id;
+        }
+
+        return $rules;
+    }
+
    private function getRuleTriggerData(): array
    {
        $return      = [];
@@ -84,38 +141,6 @@ class RuleFormRequest extends FormRequest
        return $return;
    }

-    /**
-     * @param array $array
-     *
-     * @return array
-     */
-    public static function replaceAmountTrigger(array $array): array
-    {
-        // do some sneaky search and replace.
-        $amountFields = [
-            'amount_is',
-            'amount',
-            'amount_exactly',
-            'amount_less',
-            'amount_max',
-            'amount_more',
-            'amount_min',
-            'foreign_amount_is',
-            'foreign_amount',
-            'foreign_amount_less',
-            'foreign_amount_max',
-            'foreign_amount_more',
-            'foreign_amount_min',
-        ];
-        if (in_array($array['type'], $amountFields, true) && '0' === $array['value']) {
-            $array['value'] = '0.00';
-        }
-        return $array;
-    }
-
-    /**
-     * @return array
-     */
    private function getRuleActionData(): array
    {
        $return     = [];
@@ -133,44 +158,4 @@ class RuleFormRequest extends FormRequest

        return $return;
    }
-
-    /**
-     * Rules for this request.
-     *
-     * @return array
-     */
-    public function rules(): array
-    {
-        $validTriggers = $this->getTriggers();
-        $validActions  = array_keys(config('firefly.rule-actions'));
-
-        // some actions require text (aka context):
-        $contextActions = implode(',', config('firefly.context-rule-actions'));
-
-        // some triggers require text (aka context):
-        $contextTriggers = implode(',', $this->getTriggersWithContext());
-
-        // initial set of rules:
-        $rules = [
-            'title'            => 'required|between:1,100|uniqueObjectForUser:rules,title',
-            'description'      => 'between:1,5000|nullable',
-            'stop_processing'  => 'boolean',
-            'rule_group_id'    => 'required|belongsToUser:rule_groups',
-            'trigger'          => 'required|in:store-journal,update-journal',
-            'triggers.*.type'  => 'required|in:' . implode(',', $validTriggers),
-            'triggers.*.value' => sprintf('required_if:triggers.*.type,%s|max:1024|min:1|ruleTriggerValue', $contextTriggers),
-            'actions.*.type'   => 'required|in:' . implode(',', $validActions),
-            'actions.*.value'  => sprintf('required_if:actions.*.type,%s|min:0|max:1024|ruleActionValue', $contextActions),
-            'strict'           => 'in:0,1',
-        ];
-
-        /** @var Rule|null $rule */
-        $rule = $this->route()->parameter('rule');
-
-        if (null !== $rule) {
-            $rules['title'] = 'required|between:1,100|uniqueObjectForUser:rules,title,' . $rule->id;
-        }
-
-        return $rules;
-    }
 }
--- a/app/Http/Requests/RuleGroupFormRequest.php
+++ b/app/Http/Requests/RuleGroupFormRequest.php
@@ -39,8 +39,6 @@ class RuleGroupFormRequest extends FormRequest

    /**
     * Get all data for controller.
-     *
-     * @return array
     */
    public function getRuleGroupData(): array
    {
@@ -58,18 +56,16 @@ class RuleGroupFormRequest extends FormRequest

    /**
     * Rules for this request.
-     *
-     * @return array
     */
    public function rules(): array
    {
        $titleRule = 'required|between:1,100|uniqueObjectForUser:rule_groups,title';

-        /** @var RuleGroup|null $ruleGroup */
+        /** @var null|RuleGroup $ruleGroup */
        $ruleGroup = $this->route()->parameter('ruleGroup');

        if (null !== $ruleGroup) {
-            $titleRule = 'required|between:1,100|uniqueObjectForUser:rule_groups,title,' . $ruleGroup->id;
+            $titleRule = 'required|between:1,100|uniqueObjectForUser:rule_groups,title,'.$ruleGroup->id;
        }

        return [
--- a/app/Http/Requests/SelectTransactionsRequest.php
+++ b/app/Http/Requests/SelectTransactionsRequest.php
@@ -29,8 +29,6 @@ use Illuminate\Foundation\Http\FormRequest;

 /**
 * Class SelectTransactionsRequest.
- *
-
 */
 class SelectTransactionsRequest extends FormRequest
 {
@@ -38,8 +36,6 @@ class SelectTransactionsRequest extends FormRequest

    /**
     * Rules for this request.
-     *
-     * @return array
     */
    public function rules(): array
    {
@@ -50,8 +46,8 @@ class SelectTransactionsRequest extends FormRequest
        $today        = today(config('app.timezone'))->addDay()->format('Y-m-d');

        return [
-            'start'      => 'required|date|after:' . $first,
-            'end'        => 'required|date|before:' . $today,
+            'start'      => 'required|date|after:'.$first,
+            'end'        => 'required|date|before:'.$today,
            'accounts'   => 'required',
            'accounts.*' => 'required|exists:accounts,id|belongsToUser:accounts',
        ];
--- a/app/Http/Requests/TagFormRequest.php
+++ b/app/Http/Requests/TagFormRequest.php
@@ -41,8 +41,6 @@ class TagFormRequest extends FormRequest

    /**
     * Get all data for controller.
-     *
-     * @return array
     */
    public function collectTagData(): array
    {
@@ -57,19 +55,17 @@ class TagFormRequest extends FormRequest

    /**
     * Rules for this request.
-     *
-     * @return array
     */
    public function rules(): array
    {
        $idRule = '';

-        /** @var Tag|null $tag */
+        /** @var null|Tag $tag */
        $tag     = $this->route()->parameter('tag');
        $tagRule = 'required|max:1024|min:1|uniqueObjectForUser:tags,tag';
        if (null !== $tag) {
            $idRule  = 'belongsToUser:tags';
-            $tagRule = 'required|max:1024|min:1|uniqueObjectForUser:tags,tag,' . $tag->id;
+            $tagRule = 'required|max:1024|min:1|uniqueObjectForUser:tags,tag,'.$tag->id;
        }

        $rules = [
@@ -77,7 +73,6 @@ class TagFormRequest extends FormRequest
            'id'          => $idRule,
            'description' => 'max:65536|min:1|nullable',
            'date'        => 'date|nullable',
-
        ];

        return Location::requestRules($rules);
--- a/app/Http/Requests/TestRuleFormRequest.php
+++ b/app/Http/Requests/TestRuleFormRequest.php
@@ -29,8 +29,6 @@ use Illuminate\Foundation\Http\FormRequest;

 /**
 * Class TestRuleFormRequest.
- *
-
 */
 class TestRuleFormRequest extends FormRequest
 {
@@ -40,8 +38,6 @@ class TestRuleFormRequest extends FormRequest
    /**
     * Rules for this request.
     * TODO these rules are not valid anymore.
-     *
-     * @return array
     */
    public function rules(): array
    {
@@ -49,7 +45,7 @@ class TestRuleFormRequest extends FormRequest
        $validTriggers = $this->getTriggers();

        return [
-            'rule-trigger.*'       => 'required|max:1024|min:1|in:' . implode(',', $validTriggers),
+            'rule-trigger.*'       => 'required|max:1024|min:1|in:'.implode(',', $validTriggers),
            'rule-trigger-value.*' => 'required|max:1024|min:1|ruleTriggerValue',
        ];
    }
--- a/app/Http/Requests/TokenFormRequest.php
+++ b/app/Http/Requests/TokenFormRequest.php
@@ -28,8 +28,6 @@ use Illuminate\Foundation\Http\FormRequest;

 /**
 * Class TokenFormRequest.
- *
-
 */
 class TokenFormRequest extends FormRequest
 {
@@ -37,8 +35,6 @@ class TokenFormRequest extends FormRequest

    /**
     * Rules for this request.
-     *
-     * @return array
     */
    public function rules(): array
    {
--- a/app/Http/Requests/TriggerRecurrenceRequest.php
+++ b/app/Http/Requests/TriggerRecurrenceRequest.php
@@ -1,6 +1,5 @@
 <?php

-
 /*
 * TriggerRecurrenceRequest.php
 * Copyright (c) 2023 james@firefly-iii.org
@@ -39,8 +38,6 @@ class TriggerRecurrenceRequest extends FormRequest

    /**
     * Returns the data required by the controller.
-     *
-     * @return array
     */
    public function getAll(): array
    {
@@ -51,8 +48,6 @@ class TriggerRecurrenceRequest extends FormRequest

    /**
     * Rules for this request.
-     *
-     * @return array
     */
    public function rules(): array
    {
--- a/app/Http/Requests/UserFormRequest.php
+++ b/app/Http/Requests/UserFormRequest.php
@@ -29,8 +29,6 @@ use Illuminate\Foundation\Http\FormRequest;

 /**
 * Class UserFormRequest.
- *
-
 */
 class UserFormRequest extends FormRequest
 {
@@ -39,8 +37,6 @@ class UserFormRequest extends FormRequest

    /**
     * Get data for controller.
-     *
-     * @return array
     */
    public function getUserData(): array
    {
@@ -55,8 +51,6 @@ class UserFormRequest extends FormRequest

    /**
     * Rules for this request.
-     *
-     * @return array
     */
    public function rules(): array
    {
--- a/app/Http/Requests/UserRegistrationRequest.php
+++ b/app/Http/Requests/UserRegistrationRequest.php
@@ -28,8 +28,6 @@ use Illuminate\Foundation\Http\FormRequest;

 /**
 * Class UserRegistrationRequest.
- *
-
 */
 class UserRegistrationRequest extends FormRequest
 {
@@ -37,8 +35,6 @@ class UserRegistrationRequest extends FormRequest

    /**
     * Verify the request.
-     *
-     * @return bool
     */
    public function authorize(): bool
    {
@@ -48,8 +44,6 @@ class UserRegistrationRequest extends FormRequest

    /**
     * Rules for this request.
-     *
-     * @return array
     */
    public function rules(): array
    {