Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
More code cleanup
James Cole50279d623c99
diff --git a/app/Api/V1/Controllers/Autocomplete/TransactionController.php b/app/Api/V1/Controllers/Autocomplete/TransactionController.phpindex 4321479d26..d088427937 100644--- a/app/Api/V1/Controllers/Autocomplete/TransactionController.php+++ b/app/Api/V1/Controllers/Autocomplete/TransactionController.php@@ -24,10 +24,10 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Controllers\Autocomplete;-use FireflyIII\Models\TransactionGroup;use FireflyIII\Api\V1\Controllers\Controller;use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;use FireflyIII\Enums\UserRoleEnum;+use FireflyIII\Models\TransactionGroup;use FireflyIII\Models\TransactionJournal;use FireflyIII\Repositories\Journal\JournalRepositoryInterface;use FireflyIII\Repositories\TransactionGroup\TransactionGroupRepositoryInterface;diff --git a/app/Api/V1/Controllers/Data/Export/ExportController.php b/app/Api/V1/Controllers/Data/Export/ExportController.phpindex f578b7b050..685217f769 100644--- a/app/Api/V1/Controllers/Data/Export/ExportController.php+++ b/app/Api/V1/Controllers/Data/Export/ExportController.php@@ -31,7 +31,6 @@ use FireflyIII\Exceptions\FireflyException;use FireflyIII\Support\Export\ExportDataGenerator;use Illuminate\Http\Response as LaravelResponse;use Safe\Exceptions\DatetimeException;-use function Safe\date;/**diff --git a/app/Api/V1/Controllers/Models/Account/ListController.php b/app/Api/V1/Controllers/Models/Account/ListController.phpindex 1d646a0388..6ea2908f76 100644--- a/app/Api/V1/Controllers/Models/Account/ListController.php+++ b/app/Api/V1/Controllers/Models/Account/ListController.php@@ -25,7 +25,6 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Controllers\Models\Account;use FireflyIII\Api\V1\Controllers\Controller;-use FireflyIII\Exceptions\FireflyException;use FireflyIII\Helpers\Collector\GroupCollectorInterface;use FireflyIII\Models\Account;use FireflyIII\Repositories\Account\AccountRepositoryInterface;diff --git a/app/Api/V1/Controllers/Models/Account/ShowController.php b/app/Api/V1/Controllers/Models/Account/ShowController.phpindex 5ef0363961..74c5fba684 100644--- a/app/Api/V1/Controllers/Models/Account/ShowController.php+++ b/app/Api/V1/Controllers/Models/Account/ShowController.php@@ -26,7 +26,6 @@ namespace FireflyIII\Api\V1\Controllers\Models\Account;use FireflyIII\Api\V1\Controllers\Controller;use FireflyIII\Api\V1\Requests\Models\Account\ShowRequest;-use FireflyIII\Exceptions\FireflyException;use FireflyIII\Models\Account;use FireflyIII\Repositories\Account\AccountRepositoryInterface;use FireflyIII\Support\Http\Api\AccountFilter;diff --git a/app/Api/V1/Controllers/Models/AvailableBudget/ShowController.php b/app/Api/V1/Controllers/Models/AvailableBudget/ShowController.phpindex c9693643eb..9ee8b50278 100644--- a/app/Api/V1/Controllers/Models/AvailableBudget/ShowController.php+++ b/app/Api/V1/Controllers/Models/AvailableBudget/ShowController.php@@ -25,7 +25,6 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Controllers\Models\AvailableBudget;use FireflyIII\Api\V1\Controllers\Controller;-use FireflyIII\Exceptions\FireflyException;use FireflyIII\Models\AvailableBudget;use FireflyIII\Repositories\Budget\AvailableBudgetRepositoryInterface;use FireflyIII\Support\JsonApi\Enrichments\AvailableBudgetEnrichment;diff --git a/app/Api/V1/Controllers/Models/Bill/ListController.php b/app/Api/V1/Controllers/Models/Bill/ListController.phpindex 24f27edb1e..e6a98f6716 100644--- a/app/Api/V1/Controllers/Models/Bill/ListController.php+++ b/app/Api/V1/Controllers/Models/Bill/ListController.php@@ -25,7 +25,6 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Controllers\Models\Bill;use FireflyIII\Api\V1\Controllers\Controller;-use FireflyIII\Exceptions\FireflyException;use FireflyIII\Helpers\Collector\GroupCollectorInterface;use FireflyIII\Models\Bill;use FireflyIII\Repositories\Bill\BillRepositoryInterface;diff --git a/app/Api/V1/Controllers/Models/Bill/ShowController.php b/app/Api/V1/Controllers/Models/Bill/ShowController.phpindex 380d86ef76..7ca52a322e 100644--- a/app/Api/V1/Controllers/Models/Bill/ShowController.php+++ b/app/Api/V1/Controllers/Models/Bill/ShowController.php@@ -25,7 +25,6 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Controllers\Models\Bill;use FireflyIII\Api\V1\Controllers\Controller;-use FireflyIII\Exceptions\FireflyException;use FireflyIII\Models\Bill;use FireflyIII\Repositories\Bill\BillRepositoryInterface;use FireflyIII\Support\JsonApi\Enrichments\SubscriptionEnrichment;diff --git a/app/Api/V1/Controllers/Models/Budget/ListController.php b/app/Api/V1/Controllers/Models/Budget/ListController.phpindex 72a9cae8fb..17b3f95a94 100644--- a/app/Api/V1/Controllers/Models/Budget/ListController.php+++ b/app/Api/V1/Controllers/Models/Budget/ListController.php@@ -26,7 +26,6 @@ namespace FireflyIII\Api\V1\Controllers\Models\Budget;use FireflyIII\Api\V1\Controllers\Controller;use FireflyIII\Enums\TransactionTypeEnum;-use FireflyIII\Exceptions\FireflyException;use FireflyIII\Helpers\Collector\GroupCollectorInterface;use FireflyIII\Models\Budget;use FireflyIII\Repositories\Budget\BudgetLimitRepositoryInterface;diff --git a/app/Api/V1/Controllers/Models/Budget/ShowController.php b/app/Api/V1/Controllers/Models/Budget/ShowController.phpindex 8d9314b85f..55994b1fc0 100644--- a/app/Api/V1/Controllers/Models/Budget/ShowController.php+++ b/app/Api/V1/Controllers/Models/Budget/ShowController.php@@ -25,7 +25,6 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Controllers\Models\Budget;use FireflyIII\Api\V1\Controllers\Controller;-use FireflyIII\Exceptions\FireflyException;use FireflyIII\Models\Budget;use FireflyIII\Repositories\Budget\BudgetLimitRepositoryInterface;use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;diff --git a/app/Api/V1/Controllers/Models/BudgetLimit/ListController.php b/app/Api/V1/Controllers/Models/BudgetLimit/ListController.phpindex 0b66da5487..0e8d707900 100644--- a/app/Api/V1/Controllers/Models/BudgetLimit/ListController.php+++ b/app/Api/V1/Controllers/Models/BudgetLimit/ListController.php@@ -25,7 +25,6 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Controllers\Models\BudgetLimit;use FireflyIII\Api\V1\Controllers\Controller;-use FireflyIII\Exceptions\FireflyException;use FireflyIII\Helpers\Collector\GroupCollectorInterface;use FireflyIII\Models\Budget;use FireflyIII\Models\BudgetLimit;diff --git a/app/Api/V1/Controllers/Models/Category/ListController.php b/app/Api/V1/Controllers/Models/Category/ListController.phpindex b89fc38bae..fbadd0c42a 100644--- a/app/Api/V1/Controllers/Models/Category/ListController.php+++ b/app/Api/V1/Controllers/Models/Category/ListController.php@@ -25,7 +25,6 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Controllers\Models\Category;use FireflyIII\Api\V1\Controllers\Controller;-use FireflyIII\Exceptions\FireflyException;use FireflyIII\Helpers\Collector\GroupCollectorInterface;use FireflyIII\Models\Category;use FireflyIII\Repositories\Category\CategoryRepositoryInterface;diff --git a/app/Api/V1/Controllers/Models/Category/ShowController.php b/app/Api/V1/Controllers/Models/Category/ShowController.phpindex 0d19bb5b77..0f827ed175 100644--- a/app/Api/V1/Controllers/Models/Category/ShowController.php+++ b/app/Api/V1/Controllers/Models/Category/ShowController.php@@ -25,7 +25,6 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Controllers\Models\Category;use FireflyIII\Api\V1\Controllers\Controller;-use FireflyIII\Exceptions\FireflyException;use FireflyIII\Models\Category;use FireflyIII\Repositories\Category\CategoryRepositoryInterface;use FireflyIII\Support\JsonApi\Enrichments\CategoryEnrichment;diff --git a/app/Api/V1/Controllers/Models/ObjectGroup/ListController.php b/app/Api/V1/Controllers/Models/ObjectGroup/ListController.phpindex 81fcc0679a..cac0aa7cc5 100644--- a/app/Api/V1/Controllers/Models/ObjectGroup/ListController.php+++ b/app/Api/V1/Controllers/Models/ObjectGroup/ListController.php@@ -25,7 +25,6 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Controllers\Models\ObjectGroup;use FireflyIII\Api\V1\Controllers\Controller;-use FireflyIII\Exceptions\FireflyException;use FireflyIII\Models\ObjectGroup;use FireflyIII\Repositories\ObjectGroup\ObjectGroupRepositoryInterface;use FireflyIII\Support\JsonApi\Enrichments\PiggyBankEnrichment;diff --git a/app/Api/V1/Controllers/Models/PiggyBank/ListController.php b/app/Api/V1/Controllers/Models/PiggyBank/ListController.phpindex 5d4181a425..2eff6ea53c 100644--- a/app/Api/V1/Controllers/Models/PiggyBank/ListController.php+++ b/app/Api/V1/Controllers/Models/PiggyBank/ListController.php@@ -25,7 +25,6 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Controllers\Models\PiggyBank;use FireflyIII\Api\V1\Controllers\Controller;-use FireflyIII\Exceptions\FireflyException;use FireflyIII\Models\PiggyBank;use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;use FireflyIII\Support\JsonApi\Enrichments\AccountEnrichment;diff --git a/app/Api/V1/Controllers/Models/PiggyBank/ShowController.php b/app/Api/V1/Controllers/Models/PiggyBank/ShowController.phpindex 570947db73..5f6274e14e 100644--- a/app/Api/V1/Controllers/Models/PiggyBank/ShowController.php+++ b/app/Api/V1/Controllers/Models/PiggyBank/ShowController.php@@ -25,7 +25,6 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Controllers\Models\PiggyBank;use FireflyIII\Api\V1\Controllers\Controller;-use FireflyIII\Exceptions\FireflyException;use FireflyIII\Models\PiggyBank;use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;use FireflyIII\Support\JsonApi\Enrichments\PiggyBankEnrichment;diff --git a/app/Api/V1/Controllers/Models/Recurrence/ListController.php b/app/Api/V1/Controllers/Models/Recurrence/ListController.phpindex deb46548a3..ea5ed5786d 100644--- a/app/Api/V1/Controllers/Models/Recurrence/ListController.php+++ b/app/Api/V1/Controllers/Models/Recurrence/ListController.php@@ -25,7 +25,6 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Controllers\Models\Recurrence;use FireflyIII\Api\V1\Controllers\Controller;-use FireflyIII\Exceptions\FireflyException;use FireflyIII\Helpers\Collector\GroupCollectorInterface;use FireflyIII\Models\Recurrence;use FireflyIII\Repositories\Recurring\RecurringRepositoryInterface;diff --git a/app/Api/V1/Controllers/Models/Recurrence/ShowController.php b/app/Api/V1/Controllers/Models/Recurrence/ShowController.phpindex 1be11a85f8..d08117d869 100644--- a/app/Api/V1/Controllers/Models/Recurrence/ShowController.php+++ b/app/Api/V1/Controllers/Models/Recurrence/ShowController.php@@ -25,7 +25,6 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Controllers\Models\Recurrence;use FireflyIII\Api\V1\Controllers\Controller;-use FireflyIII\Exceptions\FireflyException;use FireflyIII\Models\Recurrence;use FireflyIII\Repositories\Recurring\RecurringRepositoryInterface;use FireflyIII\Support\JsonApi\Enrichments\RecurringEnrichment;diff --git a/app/Api/V1/Controllers/Models/Rule/ShowController.php b/app/Api/V1/Controllers/Models/Rule/ShowController.phpindex e659f2e8c4..d18599802c 100644--- a/app/Api/V1/Controllers/Models/Rule/ShowController.php+++ b/app/Api/V1/Controllers/Models/Rule/ShowController.php@@ -25,7 +25,6 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Controllers\Models\Rule;use FireflyIII\Api\V1\Controllers\Controller;-use FireflyIII\Exceptions\FireflyException;use FireflyIII\Models\Rule;use FireflyIII\Repositories\Rule\RuleRepositoryInterface;use FireflyIII\Transformers\RuleTransformer;diff --git a/app/Api/V1/Controllers/Models/RuleGroup/ListController.php b/app/Api/V1/Controllers/Models/RuleGroup/ListController.phpindex 6c7b614c03..d39590f831 100644--- a/app/Api/V1/Controllers/Models/RuleGroup/ListController.php+++ b/app/Api/V1/Controllers/Models/RuleGroup/ListController.php@@ -25,7 +25,6 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Controllers\Models\RuleGroup;use FireflyIII\Api\V1\Controllers\Controller;-use FireflyIII\Exceptions\FireflyException;use FireflyIII\Models\RuleGroup;use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface;use FireflyIII\Transformers\RuleTransformer;diff --git a/app/Api/V1/Controllers/Models/RuleGroup/ShowController.php b/app/Api/V1/Controllers/Models/RuleGroup/ShowController.phpindex 2cf7833853..cd9d42c2d3 100644--- a/app/Api/V1/Controllers/Models/RuleGroup/ShowController.php+++ b/app/Api/V1/Controllers/Models/RuleGroup/ShowController.php@@ -25,7 +25,6 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Controllers\Models\RuleGroup;use FireflyIII\Api\V1\Controllers\Controller;-use FireflyIII\Exceptions\FireflyException;use FireflyIII\Models\RuleGroup;use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface;use FireflyIII\Transformers\RuleGroupTransformer;diff --git a/app/Api/V1/Controllers/Models/Tag/ListController.php b/app/Api/V1/Controllers/Models/Tag/ListController.phpindex a29b3a016b..49899a4eec 100644--- a/app/Api/V1/Controllers/Models/Tag/ListController.php+++ b/app/Api/V1/Controllers/Models/Tag/ListController.php@@ -25,7 +25,6 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Controllers\Models\Tag;use FireflyIII\Api\V1\Controllers\Controller;-use FireflyIII\Exceptions\FireflyException;use FireflyIII\Helpers\Collector\GroupCollectorInterface;use FireflyIII\Models\Tag;use FireflyIII\Repositories\Tag\TagRepositoryInterface;diff --git a/app/Api/V1/Controllers/Models/Tag/ShowController.php b/app/Api/V1/Controllers/Models/Tag/ShowController.phpindex b9daf868dc..f69d050ddc 100644--- a/app/Api/V1/Controllers/Models/Tag/ShowController.php+++ b/app/Api/V1/Controllers/Models/Tag/ShowController.php@@ -25,7 +25,6 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Controllers\Models\Tag;use FireflyIII\Api\V1\Controllers\Controller;-use FireflyIII\Exceptions\FireflyException;use FireflyIII\Models\Tag;use FireflyIII\Repositories\Tag\TagRepositoryInterface;use FireflyIII\Transformers\TagTransformer;diff --git a/app/Api/V1/Controllers/Models/Transaction/ListController.php b/app/Api/V1/Controllers/Models/Transaction/ListController.phpindex a7e0649017..fbc68db891 100644--- a/app/Api/V1/Controllers/Models/Transaction/ListController.php+++ b/app/Api/V1/Controllers/Models/Transaction/ListController.php@@ -25,7 +25,6 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Controllers\Models\Transaction;use FireflyIII\Api\V1\Controllers\Controller;-use FireflyIII\Exceptions\FireflyException;use FireflyIII\Models\TransactionGroup;use FireflyIII\Models\TransactionJournal;use FireflyIII\Repositories\Journal\JournalAPIRepositoryInterface;diff --git a/app/Api/V1/Controllers/Models/Transaction/ShowController.php b/app/Api/V1/Controllers/Models/Transaction/ShowController.phpindex f16b37b81a..90942fff14 100644--- a/app/Api/V1/Controllers/Models/Transaction/ShowController.php+++ b/app/Api/V1/Controllers/Models/Transaction/ShowController.php@@ -25,7 +25,6 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Controllers\Models\Transaction;use FireflyIII\Api\V1\Controllers\Controller;-use FireflyIII\Exceptions\FireflyException;use FireflyIII\Helpers\Collector\GroupCollectorInterface;use FireflyIII\Models\TransactionGroup;use FireflyIII\Models\TransactionJournal;diff --git a/app/Api/V1/Controllers/Models/TransactionCurrency/DestroyController.php b/app/Api/V1/Controllers/Models/TransactionCurrency/DestroyController.phpindex b7c7e69a34..b4aca8b763 100644--- a/app/Api/V1/Controllers/Models/TransactionCurrency/DestroyController.php+++ b/app/Api/V1/Controllers/Models/TransactionCurrency/DestroyController.php@@ -24,7 +24,6 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Controllers\Models\TransactionCurrency;-use Illuminate\Support\Facades\Validator;use FireflyIII\Api\V1\Controllers\Controller;use FireflyIII\Exceptions\FireflyException;use FireflyIII\Models\TransactionCurrency;@@ -32,6 +31,7 @@ use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;use FireflyIII\Repositories\User\UserRepositoryInterface;use FireflyIII\User;use Illuminate\Http\JsonResponse;+use Illuminate\Support\Facades\Validator;use Illuminate\Validation\ValidationException;/**diff --git a/app/Api/V1/Controllers/Models/TransactionCurrency/ListController.php b/app/Api/V1/Controllers/Models/TransactionCurrency/ListController.phpindex cd8363c8fe..02bec34c6a 100644--- a/app/Api/V1/Controllers/Models/TransactionCurrency/ListController.php+++ b/app/Api/V1/Controllers/Models/TransactionCurrency/ListController.php@@ -25,7 +25,6 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Controllers\Models\TransactionCurrency;use FireflyIII\Api\V1\Controllers\Controller;-use FireflyIII\Exceptions\FireflyException;use FireflyIII\Helpers\Collector\GroupCollectorInterface;use FireflyIII\Models\Account;use FireflyIII\Models\Bill;diff --git a/app/Api/V1/Controllers/Models/TransactionCurrency/ShowController.php b/app/Api/V1/Controllers/Models/TransactionCurrency/ShowController.phpindex 9fd407ccf4..8f4168ae1e 100644--- a/app/Api/V1/Controllers/Models/TransactionCurrency/ShowController.php+++ b/app/Api/V1/Controllers/Models/TransactionCurrency/ShowController.php@@ -25,7 +25,6 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Controllers\Models\TransactionCurrency;use FireflyIII\Api\V1\Controllers\Controller;-use FireflyIII\Exceptions\FireflyException;use FireflyIII\Models\TransactionCurrency;use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;use FireflyIII\Support\Http\Api\AccountFilter;diff --git a/app/Api/V1/Controllers/Models/TransactionCurrency/StoreController.php b/app/Api/V1/Controllers/Models/TransactionCurrency/StoreController.phpindex 01aad04665..bbead26e16 100644--- a/app/Api/V1/Controllers/Models/TransactionCurrency/StoreController.php+++ b/app/Api/V1/Controllers/Models/TransactionCurrency/StoreController.php@@ -26,7 +26,6 @@ namespace FireflyIII\Api\V1\Controllers\Models\TransactionCurrency;use FireflyIII\Api\V1\Controllers\Controller;use FireflyIII\Api\V1\Requests\Models\TransactionCurrency\StoreRequest;-use FireflyIII\Exceptions\FireflyException;use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;use FireflyIII\Support\Http\Api\AccountFilter;use FireflyIII\Support\Http\Api\TransactionFilter;diff --git a/app/Api/V1/Controllers/Models/TransactionLink/ShowController.php b/app/Api/V1/Controllers/Models/TransactionLink/ShowController.phpindex 1f812f2b18..a45be78c09 100644--- a/app/Api/V1/Controllers/Models/TransactionLink/ShowController.php+++ b/app/Api/V1/Controllers/Models/TransactionLink/ShowController.php@@ -25,7 +25,6 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Controllers\Models\TransactionLink;use FireflyIII\Api\V1\Controllers\Controller;-use FireflyIII\Exceptions\FireflyException;use FireflyIII\Models\TransactionJournalLink;use FireflyIII\Repositories\LinkType\LinkTypeRepositoryInterface;use FireflyIII\Transformers\TransactionLinkTransformer;diff --git a/app/Api/V1/Controllers/Models/TransactionLink/StoreController.php b/app/Api/V1/Controllers/Models/TransactionLink/StoreController.phpindex 89219ff30a..2d0b04cba8 100644--- a/app/Api/V1/Controllers/Models/TransactionLink/StoreController.php+++ b/app/Api/V1/Controllers/Models/TransactionLink/StoreController.php@@ -24,10 +24,10 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Controllers\Models\TransactionLink;-use FireflyIII\Models\TransactionJournal;use FireflyIII\Api\V1\Controllers\Controller;use FireflyIII\Api\V1\Requests\Models\TransactionLink\StoreRequest;use FireflyIII\Exceptions\FireflyException;+use FireflyIII\Models\TransactionJournal;use FireflyIII\Repositories\Journal\JournalRepositoryInterface;use FireflyIII\Repositories\LinkType\LinkTypeRepositoryInterface;use FireflyIII\Support\Http\Api\TransactionFilter;diff --git a/app/Api/V1/Controllers/Models/TransactionLinkType/ListController.php b/app/Api/V1/Controllers/Models/TransactionLinkType/ListController.phpindex 6ba4e25c4c..a71cfa46e9 100644--- a/app/Api/V1/Controllers/Models/TransactionLinkType/ListController.php+++ b/app/Api/V1/Controllers/Models/TransactionLinkType/ListController.php@@ -25,7 +25,6 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Controllers\Models\TransactionLinkType;use FireflyIII\Api\V1\Controllers\Controller;-use FireflyIII\Exceptions\FireflyException;use FireflyIII\Helpers\Collector\GroupCollectorInterface;use FireflyIII\Models\LinkType;use FireflyIII\Repositories\LinkType\LinkTypeRepositoryInterface;diff --git a/app/Api/V1/Controllers/Models/TransactionLinkType/ShowController.php b/app/Api/V1/Controllers/Models/TransactionLinkType/ShowController.phpindex ded5d53f8f..65af2aa929 100644--- a/app/Api/V1/Controllers/Models/TransactionLinkType/ShowController.php+++ b/app/Api/V1/Controllers/Models/TransactionLinkType/ShowController.php@@ -25,7 +25,6 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Controllers\Models\TransactionLinkType;use FireflyIII\Api\V1\Controllers\Controller;-use FireflyIII\Exceptions\FireflyException;use FireflyIII\Models\LinkType;use FireflyIII\Repositories\LinkType\LinkTypeRepositoryInterface;use FireflyIII\Support\Http\Api\TransactionFilter;diff --git a/app/Api/V1/Controllers/Models/TransactionLinkType/StoreController.php b/app/Api/V1/Controllers/Models/TransactionLinkType/StoreController.phpindex 7e534e3993..7901c88ec0 100644--- a/app/Api/V1/Controllers/Models/TransactionLinkType/StoreController.php+++ b/app/Api/V1/Controllers/Models/TransactionLinkType/StoreController.php@@ -24,7 +24,6 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Controllers\Models\TransactionLinkType;-use Illuminate\Support\Facades\Validator;use FireflyIII\Api\V1\Controllers\Controller;use FireflyIII\Api\V1\Requests\Models\TransactionLinkType\StoreRequest;use FireflyIII\Repositories\LinkType\LinkTypeRepositoryInterface;@@ -33,6 +32,7 @@ use FireflyIII\Support\Http\Api\TransactionFilter;use FireflyIII\Transformers\LinkTypeTransformer;use FireflyIII\User;use Illuminate\Http\JsonResponse;+use Illuminate\Support\Facades\Validator;use Illuminate\Validation\ValidationException;use League\Fractal\Resource\Item;diff --git a/app/Api/V1/Controllers/Models/TransactionLinkType/UpdateController.php b/app/Api/V1/Controllers/Models/TransactionLinkType/UpdateController.phpindex 2b43fa81df..cf964f259d 100644--- a/app/Api/V1/Controllers/Models/TransactionLinkType/UpdateController.php+++ b/app/Api/V1/Controllers/Models/TransactionLinkType/UpdateController.php@@ -24,7 +24,6 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Controllers\Models\TransactionLinkType;-use Illuminate\Support\Facades\Validator;use FireflyIII\Api\V1\Controllers\Controller;use FireflyIII\Api\V1\Requests\Models\TransactionLinkType\UpdateRequest;use FireflyIII\Exceptions\FireflyException;@@ -35,6 +34,7 @@ use FireflyIII\Support\Http\Api\TransactionFilter;use FireflyIII\Transformers\LinkTypeTransformer;use FireflyIII\User;use Illuminate\Http\JsonResponse;+use Illuminate\Support\Facades\Validator;use Illuminate\Validation\ValidationException;use League\Fractal\Resource\Item;diff --git a/app/Api/V1/Controllers/Search/TransactionController.php b/app/Api/V1/Controllers/Search/TransactionController.phpindex 10d754891a..040e672934 100644--- a/app/Api/V1/Controllers/Search/TransactionController.php+++ b/app/Api/V1/Controllers/Search/TransactionController.php@@ -25,7 +25,6 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Controllers\Search;use FireflyIII\Api\V1\Controllers\Controller;-use FireflyIII\Exceptions\FireflyException;use FireflyIII\Support\JsonApi\Enrichments\TransactionGroupEnrichment;use FireflyIII\Support\Search\SearchInterface;use FireflyIII\Transformers\TransactionGroupTransformer;diff --git a/app/Api/V1/Controllers/Summary/BasicController.php b/app/Api/V1/Controllers/Summary/BasicController.phpindex 7550d63fb7..6b2acc86eb 100644--- a/app/Api/V1/Controllers/Summary/BasicController.php+++ b/app/Api/V1/Controllers/Summary/BasicController.php@@ -24,8 +24,8 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Controllers\Summary;-use Exception;use Carbon\Carbon;+use Exception;use FireflyIII\Api\V1\Controllers\Controller;use FireflyIII\Api\V1\Requests\Data\DateRequest;use FireflyIII\Enums\AccountTypeEnum;diff --git a/app/Api/V1/Controllers/Webhook/ShowController.php b/app/Api/V1/Controllers/Webhook/ShowController.phpindex b4728e2dee..466f0e8a90 100644--- a/app/Api/V1/Controllers/Webhook/ShowController.php+++ b/app/Api/V1/Controllers/Webhook/ShowController.php@@ -27,7 +27,6 @@ namespace FireflyIII\Api\V1\Controllers\Webhook;use FireflyIII\Api\V1\Controllers\Controller;use FireflyIII\Enums\WebhookTrigger;use FireflyIII\Events\RequestedSendWebhookMessages;-use FireflyIII\Exceptions\FireflyException;use FireflyIII\Generator\Webhook\MessageGeneratorInterface;use FireflyIII\Models\TransactionGroup;use FireflyIII\Models\Webhook;diff --git a/app/Api/V1/Requests/Chart/ChartRequest.php b/app/Api/V1/Requests/Chart/ChartRequest.phpindex d298a89116..bf43fe47c2 100644--- a/app/Api/V1/Requests/Chart/ChartRequest.php+++ b/app/Api/V1/Requests/Chart/ChartRequest.php@@ -24,13 +24,13 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Requests\Chart;-use Illuminate\Validation\Validator;use FireflyIII\Enums\UserRoleEnum;use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait;use FireflyIII\Support\Request\ChecksLogin;use FireflyIII\Support\Request\ConvertsDataTypes;use Illuminate\Foundation\Http\FormRequest;use Illuminate\Support\Facades\Log;+use Illuminate\Validation\Validator;/*** Class ChartRequestdiff --git a/app/Api/V1/Requests/Data/Bulk/MoveTransactionsRequest.php b/app/Api/V1/Requests/Data/Bulk/MoveTransactionsRequest.phpindex 6e8f9b285c..3ada80f591 100644--- a/app/Api/V1/Requests/Data/Bulk/MoveTransactionsRequest.php+++ b/app/Api/V1/Requests/Data/Bulk/MoveTransactionsRequest.php@@ -24,12 +24,12 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Requests\Data\Bulk;-use Illuminate\Validation\Validator;use FireflyIII\Repositories\Account\AccountRepositoryInterface;use FireflyIII\Support\Request\ChecksLogin;use FireflyIII\Support\Request\ConvertsDataTypes;use Illuminate\Foundation\Http\FormRequest;use Illuminate\Support\Facades\Log;+use Illuminate\Validation\Validator;/*** Class MoveTransactionsRequestdiff --git a/app/Api/V1/Requests/Data/Bulk/TransactionRequest.php b/app/Api/V1/Requests/Data/Bulk/TransactionRequest.phpindex 46aea15783..14b660d7fe 100644--- a/app/Api/V1/Requests/Data/Bulk/TransactionRequest.php+++ b/app/Api/V1/Requests/Data/Bulk/TransactionRequest.php@@ -24,8 +24,6 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Requests\Data\Bulk;-use Illuminate\Validation\Validator;-use JsonException;use FireflyIII\Enums\ClauseType;use FireflyIII\Rules\IsValidBulkClause;use FireflyIII\Support\Request\ChecksLogin;@@ -33,7 +31,8 @@ use FireflyIII\Support\Request\ConvertsDataTypes;use FireflyIII\Validation\Api\Data\Bulk\ValidatesBulkTransactionQuery;use Illuminate\Foundation\Http\FormRequest;use Illuminate\Support\Facades\Log;-+use Illuminate\Validation\Validator;+use JsonException;use function Safe\json_decode;/**diff --git a/app/Api/V1/Requests/Models/Account/ShowRequest.php b/app/Api/V1/Requests/Models/Account/ShowRequest.phpindex 6d6dcb71c5..f4f7d73332 100644--- a/app/Api/V1/Requests/Models/Account/ShowRequest.php+++ b/app/Api/V1/Requests/Models/Account/ShowRequest.php@@ -23,7 +23,6 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Requests\Models\Account;-use Illuminate\Validation\Validator;use Carbon\Carbon;use FireflyIII\Models\Account;use FireflyIII\Rules\IsValidSortInstruction;@@ -32,6 +31,7 @@ use FireflyIII\Support\Http\Api\AccountFilter;use FireflyIII\Support\Request\ConvertsDataTypes;use FireflyIII\User;use Illuminate\Foundation\Http\FormRequest;+use Illuminate\Validation\Validator;class ShowRequest extends FormRequest{diff --git a/app/Api/V1/Requests/Models/Account/UpdateRequest.php b/app/Api/V1/Requests/Models/Account/UpdateRequest.phpindex 473e5b8714..dbe30eab1b 100644--- a/app/Api/V1/Requests/Models/Account/UpdateRequest.php+++ b/app/Api/V1/Requests/Models/Account/UpdateRequest.php@@ -24,7 +24,6 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Requests\Models\Account;-use Illuminate\Validation\Validator;use FireflyIII\Models\Account;use FireflyIII\Models\Location;use FireflyIII\Repositories\Account\AccountRepositoryInterface;@@ -36,6 +35,7 @@ use FireflyIII\Support\Request\ChecksLogin;use FireflyIII\Support\Request\ConvertsDataTypes;use Illuminate\Foundation\Http\FormRequest;use Illuminate\Support\Facades\Log;+use Illuminate\Validation\Validator;/*** Class UpdateRequestdiff --git a/app/Api/V1/Requests/Models/AvailableBudget/Request.php b/app/Api/V1/Requests/Models/AvailableBudget/Request.phpindex 02cbf088e6..c2ddea145c 100644--- a/app/Api/V1/Requests/Models/AvailableBudget/Request.php+++ b/app/Api/V1/Requests/Models/AvailableBudget/Request.php@@ -24,13 +24,13 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Requests\Models\AvailableBudget;-use Illuminate\Validation\Validator;use Carbon\Carbon;use FireflyIII\Rules\IsValidPositiveAmount;use FireflyIII\Support\Request\ChecksLogin;use FireflyIII\Support\Request\ConvertsDataTypes;use Illuminate\Foundation\Http\FormRequest;use Illuminate\Support\Facades\Log;+use Illuminate\Validation\Validator;/*** Class Requestdiff --git a/app/Api/V1/Requests/Models/Bill/StoreRequest.php b/app/Api/V1/Requests/Models/Bill/StoreRequest.phpindex 4b35c5bb2e..393ff54ca3 100644--- a/app/Api/V1/Requests/Models/Bill/StoreRequest.php+++ b/app/Api/V1/Requests/Models/Bill/StoreRequest.php@@ -24,15 +24,15 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Requests\Models\Bill;-use Illuminate\Validation\Validator;-use ValueError;-use TypeError;use FireflyIII\Rules\IsBoolean;use FireflyIII\Rules\IsValidPositiveAmount;use FireflyIII\Support\Request\ChecksLogin;use FireflyIII\Support\Request\ConvertsDataTypes;use Illuminate\Foundation\Http\FormRequest;use Illuminate\Support\Facades\Log;+use Illuminate\Validation\Validator;+use TypeError;+use ValueError;/*** Class StoreRequestdiff --git a/app/Api/V1/Requests/Models/Bill/UpdateRequest.php b/app/Api/V1/Requests/Models/Bill/UpdateRequest.phpindex f4dd92f9df..8b16cce5e3 100644--- a/app/Api/V1/Requests/Models/Bill/UpdateRequest.php+++ b/app/Api/V1/Requests/Models/Bill/UpdateRequest.php@@ -24,7 +24,6 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Requests\Models\Bill;-use Illuminate\Validation\Validator;use FireflyIII\Models\Bill;use FireflyIII\Rules\IsBoolean;use FireflyIII\Rules\IsValidPositiveAmount;@@ -32,6 +31,7 @@ use FireflyIII\Support\Request\ChecksLogin;use FireflyIII\Support\Request\ConvertsDataTypes;use Illuminate\Foundation\Http\FormRequest;use Illuminate\Support\Facades\Log;+use Illuminate\Validation\Validator;/*** Class UpdateRequestdiff --git a/app/Api/V1/Requests/Models/Budget/StoreRequest.php b/app/Api/V1/Requests/Models/Budget/StoreRequest.phpindex fd36873cbb..9d3a9bc883 100644--- a/app/Api/V1/Requests/Models/Budget/StoreRequest.php+++ b/app/Api/V1/Requests/Models/Budget/StoreRequest.php@@ -24,7 +24,6 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Requests\Models\Budget;-use Illuminate\Validation\Validator;use FireflyIII\Rules\IsBoolean;use FireflyIII\Rules\IsValidPositiveAmount;use FireflyIII\Support\Request\ChecksLogin;@@ -32,6 +31,7 @@ use FireflyIII\Support\Request\ConvertsDataTypes;use FireflyIII\Validation\AutoBudget\ValidatesAutoBudgetRequest;use Illuminate\Foundation\Http\FormRequest;use Illuminate\Support\Facades\Log;+use Illuminate\Validation\Validator;/*** Class StoreRequestdiff --git a/app/Api/V1/Requests/Models/Budget/UpdateRequest.php b/app/Api/V1/Requests/Models/Budget/UpdateRequest.phpindex 870cc3294f..d028906aa4 100644--- a/app/Api/V1/Requests/Models/Budget/UpdateRequest.php+++ b/app/Api/V1/Requests/Models/Budget/UpdateRequest.php@@ -24,7 +24,6 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Requests\Models\Budget;-use Illuminate\Validation\Validator;use FireflyIII\Models\Budget;use FireflyIII\Rules\IsBoolean;use FireflyIII\Rules\IsValidPositiveAmount;@@ -33,6 +32,7 @@ use FireflyIII\Support\Request\ConvertsDataTypes;use FireflyIII\Validation\AutoBudget\ValidatesAutoBudgetRequest;use Illuminate\Foundation\Http\FormRequest;use Illuminate\Support\Facades\Log;+use Illuminate\Validation\Validator;/*** Class UpdateRequestdiff --git a/app/Api/V1/Requests/Models/BudgetLimit/UpdateRequest.php b/app/Api/V1/Requests/Models/BudgetLimit/UpdateRequest.phpindex 5262ab4427..f4ecfa9ac4 100644--- a/app/Api/V1/Requests/Models/BudgetLimit/UpdateRequest.php+++ b/app/Api/V1/Requests/Models/BudgetLimit/UpdateRequest.php@@ -24,14 +24,14 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Requests\Models\BudgetLimit;-use FireflyIII\Rules\IsBoolean;-use Illuminate\Validation\Validator;use Carbon\Carbon;+use FireflyIII\Rules\IsBoolean;use FireflyIII\Rules\IsValidPositiveAmount;use FireflyIII\Support\Request\ChecksLogin;use FireflyIII\Support\Request\ConvertsDataTypes;use Illuminate\Foundation\Http\FormRequest;use Illuminate\Support\Facades\Log;+use Illuminate\Validation\Validator;/*** Class UpdateRequestdiff --git a/app/Api/V1/Requests/Models/CurrencyExchangeRate/StoreByCurrenciesRequest.php b/app/Api/V1/Requests/Models/CurrencyExchangeRate/StoreByCurrenciesRequest.phpindex be2bfe8584..b7a8d00159 100644--- a/app/Api/V1/Requests/Models/CurrencyExchangeRate/StoreByCurrenciesRequest.php+++ b/app/Api/V1/Requests/Models/CurrencyExchangeRate/StoreByCurrenciesRequest.php@@ -28,8 +28,8 @@ use Carbon\Carbon;use Carbon\Exceptions\InvalidFormatException;use FireflyIII\Support\Request\ChecksLogin;use FireflyIII\Support\Request\ConvertsDataTypes;-use Illuminate\Validation\Validator;use Illuminate\Foundation\Http\FormRequest;+use Illuminate\Validation\Validator;class StoreByCurrenciesRequest extends FormRequest{diff --git a/app/Api/V1/Requests/Models/CurrencyExchangeRate/StoreByDateRequest.php b/app/Api/V1/Requests/Models/CurrencyExchangeRate/StoreByDateRequest.phpindex aa1eb2a5b7..de5dbe94c9 100644--- a/app/Api/V1/Requests/Models/CurrencyExchangeRate/StoreByDateRequest.php+++ b/app/Api/V1/Requests/Models/CurrencyExchangeRate/StoreByDateRequest.php@@ -24,13 +24,13 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Requests\Models\CurrencyExchangeRate;-use Illuminate\Validation\Validator;use FireflyIII\Exceptions\FireflyException;use FireflyIII\Models\TransactionCurrency;use FireflyIII\Support\Facades\Amount;use FireflyIII\Support\Request\ChecksLogin;use FireflyIII\Support\Request\ConvertsDataTypes;use Illuminate\Foundation\Http\FormRequest;+use Illuminate\Validation\Validator;class StoreByDateRequest extends FormRequest{diff --git a/app/Api/V1/Requests/Models/PiggyBank/StoreRequest.php b/app/Api/V1/Requests/Models/PiggyBank/StoreRequest.phpindex 0810b4ce4b..81acd25bd7 100644--- a/app/Api/V1/Requests/Models/PiggyBank/StoreRequest.php+++ b/app/Api/V1/Requests/Models/PiggyBank/StoreRequest.php@@ -24,15 +24,15 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Requests\Models\PiggyBank;-use Illuminate\Validation\Validator;-use FireflyIII\Support\Facades\Amount;use FireflyIII\Models\TransactionCurrency;use FireflyIII\Repositories\Account\AccountRepositoryInterface;use FireflyIII\Rules\IsValidZeroOrMoreAmount;+use FireflyIII\Support\Facades\Amount;use FireflyIII\Support\Request\ChecksLogin;use FireflyIII\Support\Request\ConvertsDataTypes;use Illuminate\Foundation\Http\FormRequest;use Illuminate\Support\Facades\Log;+use Illuminate\Validation\Validator;/*** Class StoreRequestdiff --git a/app/Api/V1/Requests/Models/Recurrence/StoreRequest.php b/app/Api/V1/Requests/Models/Recurrence/StoreRequest.phpindex 98b15ae55b..387f28f930 100644--- a/app/Api/V1/Requests/Models/Recurrence/StoreRequest.php+++ b/app/Api/V1/Requests/Models/Recurrence/StoreRequest.php@@ -24,7 +24,6 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Requests\Models\Recurrence;-use Illuminate\Validation\Validator;use FireflyIII\Rules\BelongsUser;use FireflyIII\Rules\IsBoolean;use FireflyIII\Rules\IsValidPositiveAmount;@@ -36,6 +35,7 @@ use FireflyIII\Validation\RecurrenceValidation;use FireflyIII\Validation\TransactionValidation;use Illuminate\Foundation\Http\FormRequest;use Illuminate\Support\Facades\Log;+use Illuminate\Validation\Validator;/*** Class StoreRequestdiff --git a/app/Api/V1/Requests/Models/Recurrence/UpdateRequest.php b/app/Api/V1/Requests/Models/Recurrence/UpdateRequest.phpindex 1b5c1590a4..ea5cbd0f9a 100644--- a/app/Api/V1/Requests/Models/Recurrence/UpdateRequest.php+++ b/app/Api/V1/Requests/Models/Recurrence/UpdateRequest.php@@ -24,7 +24,6 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Requests\Models\Recurrence;-use Illuminate\Validation\Validator;use FireflyIII\Models\Recurrence;use FireflyIII\Rules\BelongsUser;use FireflyIII\Rules\IsBoolean;@@ -37,6 +36,7 @@ use FireflyIII\Validation\RecurrenceValidation;use FireflyIII\Validation\TransactionValidation;use Illuminate\Foundation\Http\FormRequest;use Illuminate\Support\Facades\Log;+use Illuminate\Validation\Validator;/*** Class UpdateRequestdiff --git a/app/Api/V1/Requests/Models/Rule/StoreRequest.php b/app/Api/V1/Requests/Models/Rule/StoreRequest.phpindex 5f9e0126c8..dd65d648a0 100644--- a/app/Api/V1/Requests/Models/Rule/StoreRequest.php+++ b/app/Api/V1/Requests/Models/Rule/StoreRequest.php@@ -24,7 +24,6 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Requests\Models\Rule;-use Illuminate\Validation\Validator;use FireflyIII\Rules\IsBoolean;use FireflyIII\Rules\IsValidActionExpression;use FireflyIII\Support\Request\ChecksLogin;@@ -32,6 +31,7 @@ use FireflyIII\Support\Request\ConvertsDataTypes;use FireflyIII\Support\Request\GetRuleConfiguration;use Illuminate\Foundation\Http\FormRequest;use Illuminate\Support\Facades\Log;+use Illuminate\Validation\Validator;/*** Class StoreRequestdiff --git a/app/Api/V1/Requests/Models/Rule/UpdateRequest.php b/app/Api/V1/Requests/Models/Rule/UpdateRequest.phpindex 22880b581a..13a8a97676 100644--- a/app/Api/V1/Requests/Models/Rule/UpdateRequest.php+++ b/app/Api/V1/Requests/Models/Rule/UpdateRequest.php@@ -24,7 +24,6 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Requests\Models\Rule;-use Illuminate\Validation\Validator;use FireflyIII\Models\Rule;use FireflyIII\Rules\IsBoolean;use FireflyIII\Rules\IsValidActionExpression;@@ -33,6 +32,7 @@ use FireflyIII\Support\Request\ConvertsDataTypes;use FireflyIII\Support\Request\GetRuleConfiguration;use Illuminate\Foundation\Http\FormRequest;use Illuminate\Support\Facades\Log;+use Illuminate\Validation\Validator;/*** Class UpdateRequestdiff --git a/app/Api/V1/Requests/Models/Transaction/StoreRequest.php b/app/Api/V1/Requests/Models/Transaction/StoreRequest.phpindex 4ad8a851cb..2b54cb977c 100644--- a/app/Api/V1/Requests/Models/Transaction/StoreRequest.php+++ b/app/Api/V1/Requests/Models/Transaction/StoreRequest.php@@ -24,7 +24,6 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Requests\Models\Transaction;-use Illuminate\Validation\Validator;use FireflyIII\Models\Location;use FireflyIII\Rules\BelongsUser;use FireflyIII\Rules\IsBoolean;@@ -40,6 +39,7 @@ use FireflyIII\Validation\GroupValidation;use FireflyIII\Validation\TransactionValidation;use Illuminate\Foundation\Http\FormRequest;use Illuminate\Support\Facades\Log;+use Illuminate\Validation\Validator;/*** Class StoreRequestdiff --git a/app/Api/V1/Requests/Models/Transaction/UpdateRequest.php b/app/Api/V1/Requests/Models/Transaction/UpdateRequest.phpindex 023a48169e..af1b57cb29 100644--- a/app/Api/V1/Requests/Models/Transaction/UpdateRequest.php+++ b/app/Api/V1/Requests/Models/Transaction/UpdateRequest.php@@ -24,7 +24,6 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Requests\Models\Transaction;-use Illuminate\Validation\Validator;use FireflyIII\Exceptions\FireflyException;use FireflyIII\Models\TransactionGroup;use FireflyIII\Rules\BelongsUser;@@ -38,6 +37,7 @@ use FireflyIII\Validation\GroupValidation;use FireflyIII\Validation\TransactionValidation;use Illuminate\Foundation\Http\FormRequest;use Illuminate\Support\Facades\Log;+use Illuminate\Validation\Validator;/*** Class UpdateRequestdiff --git a/app/Api/V1/Requests/Models/TransactionLink/StoreRequest.php b/app/Api/V1/Requests/Models/TransactionLink/StoreRequest.phpindex 693c109d5d..638bda8306 100644--- a/app/Api/V1/Requests/Models/TransactionLink/StoreRequest.php+++ b/app/Api/V1/Requests/Models/TransactionLink/StoreRequest.php@@ -24,7 +24,6 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Requests\Models\TransactionLink;-use Illuminate\Validation\Validator;use FireflyIII\Repositories\Journal\JournalRepositoryInterface;use FireflyIII\Repositories\LinkType\LinkTypeRepositoryInterface;use FireflyIII\Support\Request\ChecksLogin;@@ -32,6 +31,7 @@ use FireflyIII\Support\Request\ConvertsDataTypes;use FireflyIII\User;use Illuminate\Foundation\Http\FormRequest;use Illuminate\Support\Facades\Log;+use Illuminate\Validation\Validator;/*** Class StoreRequestdiff --git a/app/Api/V1/Requests/Models/TransactionLink/UpdateRequest.php b/app/Api/V1/Requests/Models/TransactionLink/UpdateRequest.phpindex 71a8090810..0ab51bccd0 100644--- a/app/Api/V1/Requests/Models/TransactionLink/UpdateRequest.php+++ b/app/Api/V1/Requests/Models/TransactionLink/UpdateRequest.php@@ -24,7 +24,6 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Requests\Models\TransactionLink;-use Illuminate\Validation\Validator;use FireflyIII\Models\TransactionJournalLink;use FireflyIII\Repositories\Journal\JournalRepositoryInterface;use FireflyIII\Repositories\LinkType\LinkTypeRepositoryInterface;@@ -32,6 +31,7 @@ use FireflyIII\Support\Request\ChecksLogin;use FireflyIII\Support\Request\ConvertsDataTypes;use Illuminate\Foundation\Http\FormRequest;use Illuminate\Support\Facades\Log;+use Illuminate\Validation\Validator;/*** Class UpdateRequestdiff --git a/app/Api/V1/Requests/System/UserUpdateRequest.php b/app/Api/V1/Requests/System/UserUpdateRequest.phpindex 03b201b6ad..553f8e54e4 100644--- a/app/Api/V1/Requests/System/UserUpdateRequest.php+++ b/app/Api/V1/Requests/System/UserUpdateRequest.php@@ -24,13 +24,13 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Requests\System;-use Illuminate\Validation\Validator;use FireflyIII\Rules\IsBoolean;use FireflyIII\Support\Request\ChecksLogin;use FireflyIII\Support\Request\ConvertsDataTypes;use FireflyIII\User;use Illuminate\Foundation\Http\FormRequest;use Illuminate\Support\Facades\Log;+use Illuminate\Validation\Validator;/*** Class UserUpdateRequestdiff --git a/app/Console/Commands/Correction/CorrectsUnevenAmount.php b/app/Console/Commands/Correction/CorrectsUnevenAmount.phpindex cc34405706..4f6519951c 100644--- a/app/Console/Commands/Correction/CorrectsUnevenAmount.php+++ b/app/Console/Commands/Correction/CorrectsUnevenAmount.php@@ -35,8 +35,8 @@ use FireflyIII\Support\Models\AccountBalanceCalculator;use Illuminate\Console\Command;use Illuminate\Support\Facades\DB;use Illuminate\Support\Facades\Log;-use ValueError;use stdClass;+use ValueError;class CorrectsUnevenAmount extends Command{diff --git a/app/Console/Commands/Correction/CreatesAccessTokens.php b/app/Console/Commands/Correction/CreatesAccessTokens.phpindex f73e8d2258..92603c83a6 100644--- a/app/Console/Commands/Correction/CreatesAccessTokens.php+++ b/app/Console/Commands/Correction/CreatesAccessTokens.php@@ -24,11 +24,11 @@ declare(strict_types=1);namespace FireflyIII\Console\Commands\Correction;+use Exception;use FireflyIII\Console\Commands\ShowsFriendlyMessages;use FireflyIII\Repositories\User\UserRepositoryInterface;use FireflyIII\User;use Illuminate\Console\Command;-use Exception;class CreatesAccessTokens extends Command{diff --git a/app/Console/Commands/Correction/RemovesEmptyGroups.php b/app/Console/Commands/Correction/RemovesEmptyGroups.phpindex 2fac48e95b..9058b2f2ab 100644--- a/app/Console/Commands/Correction/RemovesEmptyGroups.php+++ b/app/Console/Commands/Correction/RemovesEmptyGroups.php@@ -24,10 +24,10 @@ declare(strict_types=1);namespace FireflyIII\Console\Commands\Correction;+use Exception;use FireflyIII\Console\Commands\ShowsFriendlyMessages;use FireflyIII\Models\TransactionGroup;use Illuminate\Console\Command;-use Exception;class RemovesEmptyGroups extends Command{diff --git a/app/Console/Commands/Correction/RemovesOrphanedTransactions.php b/app/Console/Commands/Correction/RemovesOrphanedTransactions.phpindex 86eadad492..2fd8e94dd2 100644--- a/app/Console/Commands/Correction/RemovesOrphanedTransactions.php+++ b/app/Console/Commands/Correction/RemovesOrphanedTransactions.php@@ -24,11 +24,11 @@ declare(strict_types=1);namespace FireflyIII\Console\Commands\Correction;+use Exception;use FireflyIII\Console\Commands\ShowsFriendlyMessages;use FireflyIII\Models\Transaction;use FireflyIII\Models\TransactionJournal;use Illuminate\Console\Command;-use Exception;use stdClass;/**diff --git a/app/Console/Commands/Export/ExportsData.php b/app/Console/Commands/Export/ExportsData.phpindex 18b1df5a34..cd1d53e9f5 100644--- a/app/Console/Commands/Export/ExportsData.php+++ b/app/Console/Commands/Export/ExportsData.php@@ -24,22 +24,21 @@ declare(strict_types=1);namespace FireflyIII\Console\Commands\Export;-use FireflyIII\Models\TransactionJournal;use Carbon\Carbon;+use Exception;use FireflyIII\Console\Commands\ShowsFriendlyMessages;use FireflyIII\Console\Commands\VerifiesAccessToken;use FireflyIII\Enums\AccountTypeEnum;use FireflyIII\Exceptions\FireflyException;use FireflyIII\Models\Account;+use FireflyIII\Models\TransactionJournal;use FireflyIII\Repositories\Account\AccountRepositoryInterface;use FireflyIII\Repositories\Journal\JournalRepositoryInterface;use FireflyIII\Support\Export\ExportDataGenerator;use Illuminate\Console\Command;use Illuminate\Support\Collection;-use Exception;use Illuminate\Support\Facades\Log;use InvalidArgumentException;-use Safe\Exceptions\FilesystemException;use function Safe\file_put_contents;diff --git a/app/Console/Commands/System/ForcesDecimalSize.php b/app/Console/Commands/System/ForcesDecimalSize.phpindex 4f1ec2164e..c92183b8c3 100644--- a/app/Console/Commands/System/ForcesDecimalSize.php+++ b/app/Console/Commands/System/ForcesDecimalSize.php@@ -40,12 +40,10 @@ use FireflyIII\Models\TransactionCurrency;use Illuminate\Console\Command;use Illuminate\Database\Eloquent\Builder;use Illuminate\Database\Eloquent\Model;-use Illuminate\Support\Collection;use Illuminate\Support\Facades\DB;-use Illuminate\Support\Facades\Log;-use function Safe\mb_regex_encoding;use function Safe\json_encode;+use function Safe\mb_regex_encoding;/*** This command was inspired by https://github.com/elliot-gh. It will check all amount fieldsdiff --git a/app/Console/Commands/System/ResetsErrorMailLimit.php b/app/Console/Commands/System/ResetsErrorMailLimit.phpindex ffba1aad82..c896842a17 100644--- a/app/Console/Commands/System/ResetsErrorMailLimit.php+++ b/app/Console/Commands/System/ResetsErrorMailLimit.php@@ -28,7 +28,6 @@ namespace FireflyIII\Console\Commands\System;use FireflyIII\Console\Commands\ShowsFriendlyMessages;use Illuminate\Console\Command;use Symfony\Component\Console\Command\Command as CommandAlias;-use function Safe\file_put_contents;use function Safe\json_encode;diff --git a/app/Console/Commands/System/ScansAttachments.php b/app/Console/Commands/System/ScansAttachments.phpindex 0225cf0008..0e9b8c8128 100644--- a/app/Console/Commands/System/ScansAttachments.php+++ b/app/Console/Commands/System/ScansAttachments.php@@ -34,7 +34,6 @@ use Illuminate\Support\Facades\Storage;use Safe\Exceptions\FileinfoException;use Safe\Exceptions\FilesystemException;use Safe\Exceptions\StringsException;-use function Safe\file_put_contents;use function Safe\md5_file;use function Safe\mime_content_type;diff --git a/app/Console/Commands/System/VerifySecurityAlerts.php b/app/Console/Commands/System/VerifySecurityAlerts.phpindex ee739ef9a3..878f762711 100644--- a/app/Console/Commands/System/VerifySecurityAlerts.php+++ b/app/Console/Commands/System/VerifySecurityAlerts.php@@ -30,7 +30,6 @@ use Illuminate\Database\QueryException;use Illuminate\Support\Facades\Log;use Illuminate\Support\Facades\Storage;use League\Flysystem\FilesystemException;-use Safe\Exceptions\JsonException;use function Safe\json_decode;diff --git a/app/Console/Commands/Upgrade/AddsTransactionIdentifiers.php b/app/Console/Commands/Upgrade/AddsTransactionIdentifiers.phpindex 4ffa9a2981..79a8f0bfaf 100644--- a/app/Console/Commands/Upgrade/AddsTransactionIdentifiers.php+++ b/app/Console/Commands/Upgrade/AddsTransactionIdentifiers.php@@ -25,7 +25,6 @@ declare(strict_types=1);namespace FireflyIII\Console\Commands\Upgrade;use FireflyIII\Console\Commands\ShowsFriendlyMessages;-use FireflyIII\Exceptions\FireflyException;use FireflyIII\Models\Transaction;use FireflyIII\Models\TransactionJournal;use FireflyIII\Repositories\Journal\JournalCLIRepositoryInterface;diff --git a/app/Console/Commands/Upgrade/RemovesDatabaseDecryption.php b/app/Console/Commands/Upgrade/RemovesDatabaseDecryption.phpindex 22b335f8d2..cf66e8cc06 100644--- a/app/Console/Commands/Upgrade/RemovesDatabaseDecryption.php+++ b/app/Console/Commands/Upgrade/RemovesDatabaseDecryption.php@@ -34,7 +34,6 @@ use Illuminate\Support\Facades\DB;use Illuminate\Support\Facades\Log;use JsonException;use stdClass;-use function Safe\json_decode;class RemovesDatabaseDecryption extends Commanddiff --git a/app/Console/Commands/Upgrade/UpgradesAccountCurrencies.php b/app/Console/Commands/Upgrade/UpgradesAccountCurrencies.phpindex c67aae9280..50a9fc71c1 100644--- a/app/Console/Commands/Upgrade/UpgradesAccountCurrencies.php+++ b/app/Console/Commands/Upgrade/UpgradesAccountCurrencies.php@@ -24,14 +24,13 @@ declare(strict_types=1);namespace FireflyIII\Console\Commands\Upgrade;-use FireflyIII\Models\TransactionJournal;use FireflyIII\Console\Commands\ShowsFriendlyMessages;use FireflyIII\Enums\AccountTypeEnum;-use FireflyIII\Exceptions\FireflyException;use FireflyIII\Models\Account;use FireflyIII\Models\AccountMeta;use FireflyIII\Models\Transaction;use FireflyIII\Models\TransactionCurrency;+use FireflyIII\Models\TransactionJournal;use FireflyIII\Repositories\Account\AccountRepositoryInterface;use FireflyIII\Repositories\User\UserRepositoryInterface;use FireflyIII\User;diff --git a/app/Console/Commands/Upgrade/UpgradesDatabase.php b/app/Console/Commands/Upgrade/UpgradesDatabase.phpindex c2f6912b5a..bbc6c8ee68 100644--- a/app/Console/Commands/Upgrade/UpgradesDatabase.php+++ b/app/Console/Commands/Upgrade/UpgradesDatabase.php@@ -24,10 +24,11 @@ declare(strict_types=1);namespace FireflyIII\Console\Commands\Upgrade;+use FireflyIII\Console\Commands\ShowsFriendlyMessages;use FireflyIII\Support\Facades\FireflyConfig;+use Illuminate\Console\Command;use Illuminate\Support\Facades\Log;use Safe\Exceptions\InfoException;-use function Safe\set_time_limit;try {@@ -36,9 +37,6 @@ try {Log::warning('set_time_limit returned false. This could be an issue, unless you also run XDebug.');}-use FireflyIII\Console\Commands\ShowsFriendlyMessages;-use Illuminate\Console\Command;-class UpgradesDatabase extends Command{use ShowsFriendlyMessages;diff --git a/app/Console/Commands/Upgrade/UpgradesRecurrenceMetaData.php b/app/Console/Commands/Upgrade/UpgradesRecurrenceMetaData.phpindex 82dcb3d160..7ffd859065 100644--- a/app/Console/Commands/Upgrade/UpgradesRecurrenceMetaData.php+++ b/app/Console/Commands/Upgrade/UpgradesRecurrenceMetaData.php@@ -29,7 +29,6 @@ use FireflyIII\Models\Recurrence;use FireflyIII\Models\RecurrenceMeta;use FireflyIII\Models\RecurrenceTransactionMeta;use Illuminate\Console\Command;-use function Safe\json_encode;class UpgradesRecurrenceMetaData extends Commanddiff --git a/app/Console/Commands/Upgrade/UpgradesToGroups.php b/app/Console/Commands/Upgrade/UpgradesToGroups.phpindex 875df04cc4..95fbcf339b 100644--- a/app/Console/Commands/Upgrade/UpgradesToGroups.php+++ b/app/Console/Commands/Upgrade/UpgradesToGroups.php@@ -25,6 +25,7 @@ declare(strict_types=1);namespace FireflyIII\Console\Commands\Upgrade;use Carbon\Carbon;+use Exception;use FireflyIII\Console\Commands\ShowsFriendlyMessages;use FireflyIII\Factory\TransactionGroupFactory;use FireflyIII\Models\Budget;@@ -37,7 +38,6 @@ use FireflyIII\Services\Internal\Destroy\JournalDestroyService;use Illuminate\Console\Command;use Illuminate\Support\Collection;use Illuminate\Support\Facades\DB;-use Exception;use Illuminate\Support\Facades\Log;class UpgradesToGroups extends Commanddiff --git a/app/Exceptions/GracefulNotFoundHandler.php b/app/Exceptions/GracefulNotFoundHandler.phpindex 762da63c55..6f905adb22 100644--- a/app/Exceptions/GracefulNotFoundHandler.php+++ b/app/Exceptions/GracefulNotFoundHandler.php@@ -34,8 +34,8 @@ use FireflyIII\User;use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;use Illuminate\Http\Request;use Illuminate\Support\Facades\Log;-use Symfony\Component\HttpFoundation\Response;use Override;+use Symfony\Component\HttpFoundation\Response;use Throwable;/**diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.phpindex 3bde465581..f160030059 100644--- a/app/Exceptions/Handler.php+++ b/app/Exceptions/Handler.php@@ -24,8 +24,9 @@ declare(strict_types=1);namespace FireflyIII\Exceptions;-use Carbon\Carbon;use Brick\Math\Exception\NumberFormatException;+use Carbon\Carbon;+use ErrorException;use FireflyIII\Jobs\MailError;use Illuminate\Auth\Access\AuthorizationException;use Illuminate\Auth\AuthenticationException;@@ -40,16 +41,14 @@ use Illuminate\Support\Facades\Log;use Illuminate\Validation\ValidationException as LaravelValidationException;use Laravel\Passport\Exceptions\OAuthServerException as LaravelOAuthException;use League\OAuth2\Server\Exception\OAuthServerException;+use Override;use Symfony\Component\HttpFoundation\Exception\SuspiciousOperationException;use Symfony\Component\HttpFoundation\Response;use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;use Symfony\Component\HttpKernel\Exception\HttpException;use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException;use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;-use ErrorException;-use Override;use Throwable;-use function Safe\json_encode;use function Safe\parse_url;diff --git a/app/Exceptions/IntervalException.php b/app/Exceptions/IntervalException.phpindex 45fe7cddfb..4b6396ad19 100644--- a/app/Exceptions/IntervalException.php+++ b/app/Exceptions/IntervalException.php@@ -24,8 +24,8 @@ declare(strict_types=1);namespace FireflyIII\Exceptions;-use FireflyIII\Support\Calendar\Periodicity;use Exception;+use FireflyIII\Support\Calendar\Periodicity;use Throwable;/**diff --git a/app/Factory/BillFactory.php b/app/Factory/BillFactory.phpindex 1fe4567134..fb284ae921 100644--- a/app/Factory/BillFactory.php+++ b/app/Factory/BillFactory.php@@ -24,9 +24,9 @@ declare(strict_types=1);namespace FireflyIII\Factory;-use FireflyIII\Models\ObjectGroup;use FireflyIII\Exceptions\FireflyException;use FireflyIII\Models\Bill;+use FireflyIII\Models\ObjectGroup;use FireflyIII\Repositories\ObjectGroup\CreatesObjectGroups;use FireflyIII\Services\Internal\Support\BillServiceTrait;use FireflyIII\User;diff --git a/app/Factory/PiggyBankFactory.php b/app/Factory/PiggyBankFactory.phpindex b31056b10f..2cf4d35a68 100644--- a/app/Factory/PiggyBankFactory.php+++ b/app/Factory/PiggyBankFactory.php@@ -23,10 +23,10 @@ declare(strict_types=1);namespace FireflyIII\Factory;-use FireflyIII\Models\ObjectGroup;-use FireflyIII\Models\Account;use FireflyIII\Events\Model\PiggyBank\ChangedAmount;use FireflyIII\Exceptions\FireflyException;+use FireflyIII\Models\Account;+use FireflyIII\Models\ObjectGroup;use FireflyIII\Models\PiggyBank;use FireflyIII\Models\TransactionCurrency;use FireflyIII\Repositories\Account\AccountRepositoryInterface;@@ -36,7 +36,6 @@ use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;use FireflyIII\User;use Illuminate\Database\QueryException;use Illuminate\Support\Facades\Log;-use function Safe\json_encode;/**diff --git a/app/Factory/TransactionJournalFactory.php b/app/Factory/TransactionJournalFactory.phpindex 1c7f354c34..5f218c5d3f 100644--- a/app/Factory/TransactionJournalFactory.php+++ b/app/Factory/TransactionJournalFactory.php@@ -24,15 +24,16 @@ declare(strict_types=1);namespace FireflyIII\Factory;-use FireflyIII\Models\Bill;-use FireflyIII\Models\PiggyBank;use Carbon\Carbon;+use Exception;use FireflyIII\Enums\AccountTypeEnum;use FireflyIII\Enums\TransactionTypeEnum;use FireflyIII\Exceptions\DuplicateTransactionException;use FireflyIII\Exceptions\FireflyException;use FireflyIII\Models\Account;+use FireflyIII\Models\Bill;use FireflyIII\Models\Location;+use FireflyIII\Models\PiggyBank;use FireflyIII\Models\Transaction;use FireflyIII\Models\TransactionCurrency;use FireflyIII\Models\TransactionJournal;@@ -53,9 +54,7 @@ use FireflyIII\User;use FireflyIII\Validation\AccountValidator;use Illuminate\Support\Collection;use Illuminate\Support\Facades\Log;-use Exception;use JsonException;-use function Safe\json_encode;/**diff --git a/app/Handlers/Events/APIEventHandler.php b/app/Handlers/Events/APIEventHandler.phpindex 7d59a4b636..de67afd8e8 100644--- a/app/Handlers/Events/APIEventHandler.php+++ b/app/Handlers/Events/APIEventHandler.php@@ -24,11 +24,11 @@ declare(strict_types=1);namespace FireflyIII\Handlers\Events;+use Exception;use FireflyIII\Notifications\User\NewAccessToken;use FireflyIII\Repositories\User\UserRepositoryInterface;use Illuminate\Support\Facades\Notification;use Laravel\Passport\Events\AccessTokenCreated;-use Exception;/*** Class APIEventHandlerdiff --git a/app/Handlers/Events/AdminEventHandler.php b/app/Handlers/Events/AdminEventHandler.phpindex 6619763806..d3a9a1e73e 100644--- a/app/Handlers/Events/AdminEventHandler.php+++ b/app/Handlers/Events/AdminEventHandler.php@@ -23,6 +23,7 @@ declare(strict_types=1);namespace FireflyIII\Handlers\Events;+use Exception;use FireflyIII\Events\Admin\InvitationCreated;use FireflyIII\Events\NewVersionAvailable;use FireflyIII\Events\Security\UnknownUserAttemptedLogin;@@ -36,7 +37,6 @@ use FireflyIII\Notifications\Test\OwnerTestNotificationPushover;use FireflyIII\Notifications\Test\OwnerTestNotificationSlack;use Illuminate\Support\Facades\Log;use Illuminate\Support\Facades\Notification;-use Exception;/*** Class AdminEventHandler.diff --git a/app/Handlers/Events/AutomationHandler.php b/app/Handlers/Events/AutomationHandler.phpindex 11b11a7b65..7a59a78a10 100644--- a/app/Handlers/Events/AutomationHandler.php+++ b/app/Handlers/Events/AutomationHandler.php@@ -24,6 +24,7 @@ declare(strict_types=1);namespace FireflyIII\Handlers\Events;+use Exception;use FireflyIII\Events\RequestedReportOnJournals;use FireflyIII\Exceptions\FireflyException;use FireflyIII\Models\TransactionGroup;@@ -31,7 +32,6 @@ use FireflyIII\Notifications\User\TransactionCreation;use FireflyIII\Repositories\User\UserRepositoryInterface;use FireflyIII\Transformers\TransactionGroupTransformer;use Illuminate\Support\Facades\Notification;-use Exception;/*** Class AutomationHandlerdiff --git a/app/Handlers/Events/BillEventHandler.php b/app/Handlers/Events/BillEventHandler.phpindex 9969bfbf1c..aef9cb49d2 100644--- a/app/Handlers/Events/BillEventHandler.php+++ b/app/Handlers/Events/BillEventHandler.php@@ -33,7 +33,6 @@ use FireflyIII\Notifications\User\SubscriptionsOverdueReminder;use FireflyIII\Support\Facades\Preferences;use Illuminate\Support\Facades\Log;use Illuminate\Support\Facades\Notification;-use function Safe\json_encode;/**diff --git a/app/Handlers/Events/Model/PiggyBankEventHandler.php b/app/Handlers/Events/Model/PiggyBankEventHandler.phpindex cea67d76b0..b44c9e4741 100644--- a/app/Handlers/Events/Model/PiggyBankEventHandler.php+++ b/app/Handlers/Events/Model/PiggyBankEventHandler.php@@ -24,13 +24,13 @@ declare(strict_types=1);namespace FireflyIII\Handlers\Events\Model;+use FireflyIII\Events\Model\PiggyBank\ChangedAmount;use FireflyIII\Events\Model\PiggyBank\ChangedName;use FireflyIII\Models\Account;+use FireflyIII\Models\PiggyBankEvent;use FireflyIII\Models\Rule;use FireflyIII\Models\RuleAction;use FireflyIII\Models\TransactionGroup;-use FireflyIII\Events\Model\PiggyBank\ChangedAmount;-use FireflyIII\Models\PiggyBankEvent;/*** Class PiggyBankEventHandlerdiff --git a/app/Handlers/Events/Security/MFAHandler.php b/app/Handlers/Events/Security/MFAHandler.phpindex a259a742e2..f3b6dab533 100644--- a/app/Handlers/Events/Security/MFAHandler.php+++ b/app/Handlers/Events/Security/MFAHandler.php@@ -24,6 +24,7 @@ declare(strict_types=1);namespace FireflyIII\Handlers\Events\Security;+use Exception;use FireflyIII\Events\Security\DisabledMFA;use FireflyIII\Events\Security\EnabledMFA;use FireflyIII\Events\Security\MFABackupFewLeft;@@ -39,7 +40,6 @@ use FireflyIII\Notifications\Security\MFAManyFailedAttemptsNotification;use FireflyIII\Notifications\Security\MFAUsedBackupCodeNotification;use FireflyIII\Notifications\Security\NewBackupCodesNotification;use Illuminate\Support\Facades\Notification;-use Exception;class MFAHandler{diff --git a/app/Handlers/Events/UserEventHandler.php b/app/Handlers/Events/UserEventHandler.phpindex 775cdc878e..39271d86a2 100644--- a/app/Handlers/Events/UserEventHandler.php+++ b/app/Handlers/Events/UserEventHandler.php@@ -25,6 +25,7 @@ namespace FireflyIII\Handlers\Events;use Carbon\Carbon;use Database\Seeders\ExchangeRateSeeder;+use Exception;use FireflyIII\Enums\UserRoleEnum;use FireflyIII\Events\ActuallyLoggedIn;use FireflyIII\Events\Admin\InvitationCreated;@@ -55,7 +56,6 @@ use Illuminate\Auth\Events\Login;use Illuminate\Support\Facades\Log;use Illuminate\Support\Facades\Mail;use Illuminate\Support\Facades\Notification;-use Exception;/*** Class UserEventHandler.diff --git a/app/Handlers/Events/VersionCheckEventHandler.php b/app/Handlers/Events/VersionCheckEventHandler.phpindex 1d663855b0..2087d37f76 100644--- a/app/Handlers/Events/VersionCheckEventHandler.php+++ b/app/Handlers/Events/VersionCheckEventHandler.php@@ -23,8 +23,8 @@ declare(strict_types=1);namespace FireflyIII\Handlers\Events;-use Deprecated;use Carbon\Carbon;+use Deprecated;use FireflyIII\Events\RequestedVersionCheckStatus;use FireflyIII\Exceptions\FireflyException;use FireflyIII\Helpers\Update\UpdateTrait;diff --git a/app/Helpers/Attachments/AttachmentHelper.php b/app/Helpers/Attachments/AttachmentHelper.phpindex 846be0c312..ef0cf558d2 100644--- a/app/Helpers/Attachments/AttachmentHelper.php+++ b/app/Helpers/Attachments/AttachmentHelper.php@@ -27,7 +27,6 @@ use FireflyIII\Exceptions\FireflyException;use FireflyIII\Models\Attachment;use FireflyIII\Models\PiggyBank;use Illuminate\Contracts\Encryption\DecryptException;-use Illuminate\Contracts\Encryption\EncryptException;use Illuminate\Contracts\Filesystem\Filesystem;use Illuminate\Database\Eloquent\Model;use Illuminate\Support\Collection;@@ -39,13 +38,11 @@ use Safe\Exceptions\FileinfoException;use Safe\Exceptions\FilesystemException;use Safe\Exceptions\StringsException;use Symfony\Component\HttpFoundation\File\UploadedFile;--use function Safe\tmpfile;-use function Safe\fwrite;-use function Safe\finfo_open;use function Safe\fclose;+use function Safe\finfo_open;+use function Safe\fwrite;use function Safe\md5_file;-+use function Safe\tmpfile;use const DIRECTORY_SEPARATOR;/**diff --git a/app/Helpers/Collector/Extensions/MetaCollection.php b/app/Helpers/Collector/Extensions/MetaCollection.phpindex 11a15ef799..40185ef81c 100644--- a/app/Helpers/Collector/Extensions/MetaCollection.php+++ b/app/Helpers/Collector/Extensions/MetaCollection.php@@ -36,7 +36,6 @@ use Illuminate\Database\Eloquent\Builder as EloquentBuilder;use Illuminate\Database\Query\JoinClause;use Illuminate\Support\Collection;use Illuminate\Support\Facades\Log;-use function Safe\json_encode;/**diff --git a/app/Helpers/Collector/GroupCollector.php b/app/Helpers/Collector/GroupCollector.phpindex 0dd40ee445..db4834fbf2 100644--- a/app/Helpers/Collector/GroupCollector.php+++ b/app/Helpers/Collector/GroupCollector.php@@ -47,7 +47,6 @@ use Illuminate\Pagination\LengthAwarePaginator;use Illuminate\Support\Collection;use Illuminate\Support\Facades\Log;use Override;-use Safe\Exceptions\JsonException;use function Safe\json_decode;diff --git a/app/Helpers/Report/NetWorth.php b/app/Helpers/Report/NetWorth.phpindex bb58b8761b..0ea1ce6cfe 100644--- a/app/Helpers/Report/NetWorth.php+++ b/app/Helpers/Report/NetWorth.php@@ -24,8 +24,8 @@ declare(strict_types=1);namespace FireflyIII\Helpers\Report;-use Deprecated;use Carbon\Carbon;+use Deprecated;use FireflyIII\Enums\AccountTypeEnum;use FireflyIII\Exceptions\FireflyException;use FireflyIII\Models\Account;diff --git a/app/Helpers/Report/NetWorthInterface.php b/app/Helpers/Report/NetWorthInterface.phpindex 466a055a4c..421caa9a74 100644--- a/app/Helpers/Report/NetWorthInterface.php+++ b/app/Helpers/Report/NetWorthInterface.php@@ -24,8 +24,8 @@ declare(strict_types=1);namespace FireflyIII\Helpers\Report;-use Deprecated;use Carbon\Carbon;+use Deprecated;use FireflyIII\Models\UserGroup;use FireflyIII\User;use Illuminate\Contracts\Auth\Authenticatable;diff --git a/app/Helpers/Webhook/Sha3SignatureGenerator.php b/app/Helpers/Webhook/Sha3SignatureGenerator.phpindex 06967cff04..ce6a0680f7 100644--- a/app/Helpers/Webhook/Sha3SignatureGenerator.php+++ b/app/Helpers/Webhook/Sha3SignatureGenerator.php@@ -28,7 +28,6 @@ use Carbon\Carbon;use FireflyIII\Exceptions\FireflyException;use FireflyIII\Models\WebhookMessage;use JsonException;-use function Safe\json_encode;/**diff --git a/app/Http/Controllers/Account/CreateController.php b/app/Http/Controllers/Account/CreateController.phpindex e0cb55afc7..e884c7c5cc 100644--- a/app/Http/Controllers/Account/CreateController.php+++ b/app/Http/Controllers/Account/CreateController.php@@ -25,7 +25,6 @@ declare(strict_types=1);namespace FireflyIII\Http\Controllers\Account;use FireflyIII\Enums\AccountTypeEnum;-use FireflyIII\Exceptions\FireflyException;use FireflyIII\Helpers\Attachments\AttachmentHelperInterface;use FireflyIII\Http\Controllers\Controller;use FireflyIII\Http\Requests\AccountFormRequest;diff --git a/app/Http/Controllers/Account/EditController.php b/app/Http/Controllers/Account/EditController.phpindex 7d172bead1..8c2d083b13 100644--- a/app/Http/Controllers/Account/EditController.php+++ b/app/Http/Controllers/Account/EditController.php@@ -24,11 +24,11 @@ declare(strict_types=1);namespace FireflyIII\Http\Controllers\Account;-use FireflyIII\Models\Location;use FireflyIII\Helpers\Attachments\AttachmentHelperInterface;use FireflyIII\Http\Controllers\Controller;use FireflyIII\Http\Requests\AccountFormRequest;use FireflyIII\Models\Account;+use FireflyIII\Models\Location;use FireflyIII\Repositories\Account\AccountRepositoryInterface;use FireflyIII\Support\Http\Controllers\ModelInformation;use Illuminate\Contracts\View\Factory;diff --git a/app/Http/Controllers/Account/IndexController.php b/app/Http/Controllers/Account/IndexController.phpindex 66844d8ad2..8d35f6b56e 100644--- a/app/Http/Controllers/Account/IndexController.php+++ b/app/Http/Controllers/Account/IndexController.php@@ -24,7 +24,6 @@ declare(strict_types=1);namespace FireflyIII\Http\Controllers\Account;use Carbon\Carbon;-use FireflyIII\Exceptions\FireflyException;use FireflyIII\Http\Controllers\Controller;use FireflyIII\Models\Account;use FireflyIII\Repositories\Account\AccountRepositoryInterface;diff --git a/app/Http/Controllers/AttachmentController.php b/app/Http/Controllers/AttachmentController.phpindex b06fc9a007..2741d94812 100644--- a/app/Http/Controllers/AttachmentController.php+++ b/app/Http/Controllers/AttachmentController.php@@ -27,7 +27,6 @@ use FireflyIII\Exceptions\FireflyException;use FireflyIII\Http\Requests\AttachmentFormRequest;use FireflyIII\Models\Attachment;use FireflyIII\Repositories\Attachment\AttachmentRepositoryInterface;-use Illuminate\Contracts\Container\BindingResolutionException;use Illuminate\Contracts\View\Factory;use Illuminate\Http\RedirectResponse;use Illuminate\Http\Request;diff --git a/app/Http/Controllers/Auth/ForgotPasswordController.php b/app/Http/Controllers/Auth/ForgotPasswordController.phpindex 1b3607259c..c9d54c0982 100644--- a/app/Http/Controllers/Auth/ForgotPasswordController.php+++ b/app/Http/Controllers/Auth/ForgotPasswordController.php@@ -36,7 +36,6 @@ use Illuminate\View\View;use Psr\Container\ContainerExceptionInterface;use Psr\Container\NotFoundExceptionInterface;use Safe\Exceptions\UrlException;-use function Safe\parse_url;/**diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.phpindex 01b25bbd19..6e4bba5669 100644--- a/app/Http/Controllers/Auth/LoginController.php+++ b/app/Http/Controllers/Auth/LoginController.php@@ -24,8 +24,6 @@ declare(strict_types=1);namespace FireflyIII\Http\Controllers\Auth;use Carbon\Carbon;-use FireflyIII\User;-use Illuminate\Support\Facades\Cookie;use FireflyIII\Events\ActuallyLoggedIn;use FireflyIII\Events\Security\UnknownUserAttemptedLogin;use FireflyIII\Events\Security\UserAttemptedLogin;@@ -33,6 +31,7 @@ use FireflyIII\Exceptions\FireflyException;use FireflyIII\Http\Controllers\Controller;use FireflyIII\Providers\RouteServiceProvider;use FireflyIII\Repositories\User\UserRepositoryInterface;+use FireflyIII\User;use Illuminate\Contracts\Foundation\Application;use Illuminate\Contracts\View\Factory;use Illuminate\Contracts\View\View;@@ -43,6 +42,7 @@ use Illuminate\Http\RedirectResponse;use Illuminate\Http\Request;use Illuminate\Http\Response;use Illuminate\Routing\Redirector;+use Illuminate\Support\Facades\Cookie;use Illuminate\Support\Facades\DB;use Illuminate\Support\Facades\Log;use Illuminate\Validation\ValidationException;diff --git a/app/Http/Controllers/Bill/IndexController.php b/app/Http/Controllers/Bill/IndexController.phpindex 1725bad953..3896db77af 100644--- a/app/Http/Controllers/Bill/IndexController.php+++ b/app/Http/Controllers/Bill/IndexController.php@@ -24,7 +24,6 @@ declare(strict_types=1);namespace FireflyIII\Http\Controllers\Bill;-use FireflyIII\Exceptions\FireflyException;use FireflyIII\Http\Controllers\Controller;use FireflyIII\Models\Bill;use FireflyIII\Repositories\Bill\BillRepositoryInterface;diff --git a/app/Http/Controllers/Budget/EditController.php b/app/Http/Controllers/Budget/EditController.phpindex a3969e6d7d..6b0f820e20 100644--- a/app/Http/Controllers/Budget/EditController.php+++ b/app/Http/Controllers/Budget/EditController.php@@ -24,11 +24,11 @@ declare(strict_types=1);namespace FireflyIII\Http\Controllers\Budget;-use FireflyIII\Models\AutoBudget;use FireflyIII\Enums\AutoBudgetType;use FireflyIII\Helpers\Attachments\AttachmentHelperInterface;use FireflyIII\Http\Controllers\Controller;use FireflyIII\Http\Requests\BudgetFormUpdateRequest;+use FireflyIII\Models\AutoBudget;use FireflyIII\Models\Budget;use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;use Illuminate\Contracts\View\Factory;diff --git a/app/Http/Controllers/Budget/ShowController.php b/app/Http/Controllers/Budget/ShowController.phpindex c28e7455e8..77158fb699 100644--- a/app/Http/Controllers/Budget/ShowController.php+++ b/app/Http/Controllers/Budget/ShowController.php@@ -24,7 +24,6 @@ declare(strict_types=1);namespace FireflyIII\Http\Controllers\Budget;-use FireflyIII\Models\TransactionJournal;use Carbon\Carbon;use FireflyIII\Enums\TransactionTypeEnum;use FireflyIII\Exceptions\FireflyException;@@ -32,6 +31,7 @@ use FireflyIII\Helpers\Collector\GroupCollectorInterface;use FireflyIII\Http\Controllers\Controller;use FireflyIII\Models\Budget;use FireflyIII\Models\BudgetLimit;+use FireflyIII\Models\TransactionJournal;use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;use FireflyIII\Repositories\Journal\JournalRepositoryInterface;use FireflyIII\Support\Http\Controllers\AugumentData;diff --git a/app/Http/Controllers/Category/NoCategoryController.php b/app/Http/Controllers/Category/NoCategoryController.phpindex 609f351a46..065214b856 100644--- a/app/Http/Controllers/Category/NoCategoryController.php+++ b/app/Http/Controllers/Category/NoCategoryController.php@@ -24,12 +24,12 @@ declare(strict_types=1);namespace FireflyIII\Http\Controllers\Category;-use FireflyIII\Models\TransactionJournal;use Carbon\Carbon;use FireflyIII\Enums\TransactionTypeEnum;use FireflyIII\Exceptions\FireflyException;use FireflyIII\Helpers\Collector\GroupCollectorInterface;use FireflyIII\Http\Controllers\Controller;+use FireflyIII\Models\TransactionJournal;use FireflyIII\Repositories\Journal\JournalRepositoryInterface;use FireflyIII\Support\Http\Controllers\PeriodOverview;use Illuminate\Contracts\View\Factory;diff --git a/app/Http/Controllers/Chart/AccountController.php b/app/Http/Controllers/Chart/AccountController.phpindex 632589163f..9e0e34851c 100644--- a/app/Http/Controllers/Chart/AccountController.php+++ b/app/Http/Controllers/Chart/AccountController.php@@ -44,7 +44,6 @@ use FireflyIII\Support\Http\Controllers\DateCalculation;use Illuminate\Http\JsonResponse;use Illuminate\Support\Collection;use Illuminate\Support\Facades\Log;-use Safe\Exceptions\JsonException;use function Safe\json_encode;diff --git a/app/Http/Controllers/Chart/CategoryController.php b/app/Http/Controllers/Chart/CategoryController.phpindex d79700c4a2..1d3665b548 100644--- a/app/Http/Controllers/Chart/CategoryController.php+++ b/app/Http/Controllers/Chart/CategoryController.php@@ -24,7 +24,6 @@ declare(strict_types=1);namespace FireflyIII\Http\Controllers\Chart;use Carbon\Carbon;-use FireflyIII\Exceptions\FireflyException;use FireflyIII\Generator\Chart\Basic\GeneratorInterface;use FireflyIII\Http\Controllers\Controller;use FireflyIII\Models\Category;diff --git a/app/Http/Controllers/Chart/PiggyBankController.php b/app/Http/Controllers/Chart/PiggyBankController.phpindex 1321de9eea..065cc16f49 100644--- a/app/Http/Controllers/Chart/PiggyBankController.php+++ b/app/Http/Controllers/Chart/PiggyBankController.php@@ -24,7 +24,6 @@ declare(strict_types=1);namespace FireflyIII\Http\Controllers\Chart;use Carbon\Carbon;-use FireflyIII\Exceptions\FireflyException;use FireflyIII\Generator\Chart\Basic\GeneratorInterface;use FireflyIII\Http\Controllers\Controller;use FireflyIII\Models\PiggyBank;diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.phpindex 0919f8c199..daba3dbeae 100644--- a/app/Http/Controllers/Controller.php+++ b/app/Http/Controllers/Controller.php@@ -36,11 +36,10 @@ use Illuminate\Foundation\Validation\ValidatesRequests;use Illuminate\Routing\Controller as BaseController;use Illuminate\Support\Facades\Config;use Illuminate\Support\Facades\Log;-use Illuminate\Support\Facades\View;use Illuminate\Support\Facades\Route;--use function Safe\realpath;+use Illuminate\Support\Facades\View;use function Safe\ini_get;+use function Safe\realpath;/*** Class Controller.diff --git a/app/Http/Controllers/DebugController.php b/app/Http/Controllers/DebugController.phpindex 1ed00b4710..f83dfb0f37 100644--- a/app/Http/Controllers/DebugController.php+++ b/app/Http/Controllers/DebugController.php@@ -51,10 +51,8 @@ use Illuminate\View\View;use Monolog\Handler\RotatingFileHandler;use Safe\Exceptions\FilesystemException;use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;-use function Safe\file_get_contents;use function Safe\ini_get;-use const PHP_INT_SIZE;use const PHP_SAPI;diff --git a/app/Http/Controllers/Export/IndexController.php b/app/Http/Controllers/Export/IndexController.phpindex 3167f65525..3089c4ac35 100644--- a/app/Http/Controllers/Export/IndexController.php+++ b/app/Http/Controllers/Export/IndexController.php@@ -25,10 +25,10 @@ declare(strict_types=1);namespace FireflyIII\Http\Controllers\Export;use Carbon\Carbon;-use FireflyIII\Models\TransactionJournal;use FireflyIII\Exceptions\FireflyException;use FireflyIII\Http\Controllers\Controller;use FireflyIII\Http\Middleware\IsDemoUser;+use FireflyIII\Models\TransactionJournal;use FireflyIII\Repositories\Journal\JournalRepositoryInterface;use FireflyIII\Support\Export\ExportDataGenerator;use Illuminate\Contracts\View\Factory;diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.phpindex 3ab394545e..e72c691d41 100644--- a/app/Http/Controllers/HomeController.php+++ b/app/Http/Controllers/HomeController.php@@ -23,9 +23,9 @@ declare(strict_types=1);namespace FireflyIII\Http\Controllers;-use Exception;use Carbon\Carbon;use Carbon\Exceptions\InvalidFormatException;+use Exception;use FireflyIII\Enums\AccountTypeEnum;use FireflyIII\Events\RequestedVersionCheckStatus;use FireflyIII\Exceptions\FireflyException;diff --git a/app/Http/Controllers/Json/BoxController.php b/app/Http/Controllers/Json/BoxController.phpindex cd845df963..d202a80af0 100644--- a/app/Http/Controllers/Json/BoxController.php+++ b/app/Http/Controllers/Json/BoxController.php@@ -23,8 +23,8 @@ declare(strict_types=1);namespace FireflyIII\Http\Controllers\Json;-use Deprecated;use Carbon\Carbon;+use Deprecated;use FireflyIII\Enums\AccountTypeEnum;use FireflyIII\Enums\TransactionTypeEnum;use FireflyIII\Helpers\Collector\GroupCollectorInterface;diff --git a/app/Http/Controllers/Json/BudgetController.php b/app/Http/Controllers/Json/BudgetController.phpindex 23a687ed46..6a0b494194 100644--- a/app/Http/Controllers/Json/BudgetController.php+++ b/app/Http/Controllers/Json/BudgetController.php@@ -24,9 +24,9 @@ declare(strict_types=1);namespace FireflyIII\Http\Controllers\Json;-use FireflyIII\Models\AvailableBudget;use Carbon\Carbon;use FireflyIII\Http\Controllers\Controller;+use FireflyIII\Models\AvailableBudget;use FireflyIII\Models\TransactionCurrency;use FireflyIII\Repositories\Budget\AvailableBudgetRepositoryInterface;use FireflyIII\Repositories\Budget\BudgetLimitRepositoryInterface;diff --git a/app/Http/Controllers/Json/FrontpageController.php b/app/Http/Controllers/Json/FrontpageController.phpindex f66864866b..a51499cfc2 100644--- a/app/Http/Controllers/Json/FrontpageController.php+++ b/app/Http/Controllers/Json/FrontpageController.php@@ -23,12 +23,12 @@ declare(strict_types=1);namespace FireflyIII\Http\Controllers\Json;-use Throwable;use FireflyIII\Exceptions\FireflyException;use FireflyIII\Http\Controllers\Controller;use FireflyIII\Models\PiggyBank;use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;use Illuminate\Http\JsonResponse;+use Throwable;/*** Class FrontpageController.diff --git a/app/Http/Controllers/Json/IntroController.php b/app/Http/Controllers/Json/IntroController.phpindex a08c32b6be..8d1aa947a8 100644--- a/app/Http/Controllers/Json/IntroController.php+++ b/app/Http/Controllers/Json/IntroController.php@@ -23,7 +23,6 @@ declare(strict_types=1);namespace FireflyIII\Http\Controllers\Json;-use FireflyIII\Exceptions\FireflyException;use FireflyIII\Http\Controllers\Controller;use FireflyIII\Support\Http\Controllers\GetConfigurationData;use Illuminate\Http\JsonResponse;diff --git a/app/Http/Controllers/Json/ReconcileController.php b/app/Http/Controllers/Json/ReconcileController.phpindex a1208182e8..3d88bb0a88 100644--- a/app/Http/Controllers/Json/ReconcileController.php+++ b/app/Http/Controllers/Json/ReconcileController.php@@ -24,7 +24,6 @@ declare(strict_types=1);namespace FireflyIII\Http\Controllers\Json;-use Throwable;use Carbon\Carbon;use FireflyIII\Enums\TransactionTypeEnum;use FireflyIII\Exceptions\FireflyException;@@ -38,6 +37,7 @@ use Illuminate\Http\JsonResponse;use Illuminate\Http\Request;use Illuminate\Support\Collection;use Illuminate\Support\Facades\Log;+use Throwable;/*** Class ReconcileControllerdiff --git a/app/Http/Controllers/Json/RuleController.php b/app/Http/Controllers/Json/RuleController.phpindex a555015150..1826cd0a80 100644--- a/app/Http/Controllers/Json/RuleController.php+++ b/app/Http/Controllers/Json/RuleController.php@@ -24,11 +24,11 @@ declare(strict_types=1);namespace FireflyIII\Http\Controllers\Json;-use Throwable;use FireflyIII\Exceptions\FireflyException;use FireflyIII\Http\Controllers\Controller;use Illuminate\Http\JsonResponse;use Illuminate\Http\Request;+use Throwable;/*** Class RuleControllerdiff --git a/app/Http/Controllers/NewUserController.php b/app/Http/Controllers/NewUserController.phpindex 8350216064..e1c70c78f4 100644--- a/app/Http/Controllers/NewUserController.php+++ b/app/Http/Controllers/NewUserController.php@@ -23,10 +23,9 @@ declare(strict_types=1);namespace FireflyIII\Http\Controllers;-use FireflyIII\Models\TransactionCurrency;use FireflyIII\Enums\AccountTypeEnum;-use FireflyIII\Exceptions\FireflyException;use FireflyIII\Http\Requests\NewUserFormRequest;+use FireflyIII\Models\TransactionCurrency;use FireflyIII\Repositories\Account\AccountRepositoryInterface;use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;use FireflyIII\Support\Http\Controllers\CreateStuff;diff --git a/app/Http/Controllers/PiggyBank/IndexController.php b/app/Http/Controllers/PiggyBank/IndexController.phpindex 69bbd38780..199d90a3a8 100644--- a/app/Http/Controllers/PiggyBank/IndexController.php+++ b/app/Http/Controllers/PiggyBank/IndexController.php@@ -25,7 +25,6 @@ declare(strict_types=1);namespace FireflyIII\Http\Controllers\PiggyBank;use Carbon\Carbon;-use FireflyIII\Exceptions\FireflyException;use FireflyIII\Http\Controllers\Controller;use FireflyIII\Models\Account;use FireflyIII\Models\PiggyBank;diff --git a/app/Http/Controllers/PreferencesController.php b/app/Http/Controllers/PreferencesController.phpindex 7a22b91c06..723998cd3f 100644--- a/app/Http/Controllers/PreferencesController.php+++ b/app/Http/Controllers/PreferencesController.php@@ -23,8 +23,6 @@ declare(strict_types=1);namespace FireflyIII\Http\Controllers;-use FireflyIII\Support\Singleton\PreferencesSingleton;-use JsonException;use Carbon\Carbon;use FireflyIII\Enums\AccountTypeEnum;use FireflyIII\Events\Preferences\UserGroupChangedPrimaryCurrency;@@ -35,6 +33,7 @@ use FireflyIII\Models\Account;use FireflyIII\Models\Preference;use FireflyIII\Repositories\Account\AccountRepositoryInterface;use FireflyIII\Support\Facades\Preferences;+use FireflyIII\Support\Singleton\PreferencesSingleton;use FireflyIII\User;use Illuminate\Contracts\View\Factory;use Illuminate\Http\RedirectResponse;@@ -42,10 +41,10 @@ use Illuminate\Http\Request;use Illuminate\Routing\Redirector;use Illuminate\Support\Facades\Log;use Illuminate\View\View;-+use JsonException;use Safe\Exceptions\FilesystemException;-use function Safe\json_decode;use function Safe\file_get_contents;+use function Safe\json_decode;/*** Class PreferencesController.diff --git a/app/Http/Controllers/Profile/MfaController.php b/app/Http/Controllers/Profile/MfaController.phpindex 69537bd12f..7959f1cd54 100644--- a/app/Http/Controllers/Profile/MfaController.php+++ b/app/Http/Controllers/Profile/MfaController.php@@ -24,13 +24,10 @@ declare(strict_types=1);namespace FireflyIII\Http\Controllers\Profile;-use Illuminate\Support\Facades\Cookie;-use PragmaRX\Google2FALaravel\Facade as Google2FA;use Carbon\Carbon;use FireflyIII\Events\Security\DisabledMFA;use FireflyIII\Events\Security\EnabledMFA;use FireflyIII\Events\Security\MFANewBackupCodes;-use FireflyIII\Exceptions\FireflyException;use FireflyIII\Http\Controllers\Controller;use FireflyIII\Http\Middleware\IsDemoUser;use FireflyIII\Http\Requests\ExistingTokenFormRequest;@@ -41,8 +38,10 @@ use Illuminate\Contracts\View\Factory;use Illuminate\Http\RedirectResponse;use Illuminate\Http\Request;use Illuminate\Routing\Redirector;+use Illuminate\Support\Facades\Cookie;use Illuminate\Support\Facades\Log;use Illuminate\View\View;+use PragmaRX\Google2FALaravel\Facade as Google2FA;use PragmaRX\Recovery\Recovery;use Psr\Container\ContainerExceptionInterface;use Psr\Container\NotFoundExceptionInterface;diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.phpindex 7eb2e745cf..33f8b41866 100644--- a/app/Http/Controllers/ProfileController.php+++ b/app/Http/Controllers/ProfileController.php@@ -24,8 +24,6 @@ declare(strict_types=1);namespace FireflyIII\Http\Controllers;use Exception;-use Illuminate\Support\Facades\Auth;-use Illuminate\Support\Facades\Hash;use FireflyIII\Events\UserChangedEmail;use FireflyIII\Exceptions\FireflyException;use FireflyIII\Exceptions\ValidationException;@@ -45,7 +43,9 @@ use Illuminate\Http\RedirectResponse;use Illuminate\Http\Request;use Illuminate\Routing\Redirector;use Illuminate\Support\Collection;+use Illuminate\Support\Facades\Auth;use Illuminate\Support\Facades\DB;+use Illuminate\Support\Facades\Hash;use Illuminate\View\View;use Laravel\Passport\ClientRepository;use Psr\Container\ContainerExceptionInterface;diff --git a/app/Http/Controllers/Report/AccountController.php b/app/Http/Controllers/Report/AccountController.phpindex dcd9464ce3..c6818cd9c6 100644--- a/app/Http/Controllers/Report/AccountController.php+++ b/app/Http/Controllers/Report/AccountController.php@@ -23,13 +23,13 @@ declare(strict_types=1);namespace FireflyIII\Http\Controllers\Report;-use Throwable;use Carbon\Carbon;use FireflyIII\Exceptions\FireflyException;use FireflyIII\Http\Controllers\Controller;use FireflyIII\Repositories\Account\AccountTaskerInterface;use FireflyIII\Support\CacheProperties;use Illuminate\Support\Collection;+use Throwable;/*** Class AccountController.diff --git a/app/Http/Controllers/Report/BalanceController.php b/app/Http/Controllers/Report/BalanceController.phpindex 41b3010a4a..3764008f2a 100644--- a/app/Http/Controllers/Report/BalanceController.php+++ b/app/Http/Controllers/Report/BalanceController.php@@ -23,7 +23,6 @@ declare(strict_types=1);namespace FireflyIII\Http\Controllers\Report;-use Throwable;use Carbon\Carbon;use FireflyIII\Enums\TransactionTypeEnum;use FireflyIII\Exceptions\FireflyException;@@ -33,6 +32,7 @@ use FireflyIII\Models\Account;use FireflyIII\Models\Budget;use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;use Illuminate\Support\Collection;+use Throwable;/*** Class BalanceController.diff --git a/app/Http/Controllers/Report/BillController.php b/app/Http/Controllers/Report/BillController.phpindex 1fd70e3c48..9cea9f5edd 100644--- a/app/Http/Controllers/Report/BillController.php+++ b/app/Http/Controllers/Report/BillController.php@@ -24,13 +24,13 @@ declare(strict_types=1);namespace FireflyIII\Http\Controllers\Report;-use Throwable;use Carbon\Carbon;use FireflyIII\Exceptions\FireflyException;use FireflyIII\Helpers\Report\ReportHelperInterface;use FireflyIII\Http\Controllers\Controller;use FireflyIII\Support\CacheProperties;use Illuminate\Support\Collection;+use Throwable;/*** Class BillControllerdiff --git a/app/Http/Controllers/Report/BudgetController.php b/app/Http/Controllers/Report/BudgetController.phpindex a59076ab9a..29c802bb96 100644--- a/app/Http/Controllers/Report/BudgetController.php+++ b/app/Http/Controllers/Report/BudgetController.php@@ -23,8 +23,6 @@ declare(strict_types=1);namespace FireflyIII\Http\Controllers\Report;-use FireflyIII\Support\Facades\Navigation;-use Throwable;use Carbon\Carbon;use FireflyIII\Exceptions\FireflyException;use FireflyIII\Http\Controllers\Controller;@@ -32,11 +30,13 @@ use FireflyIII\Models\Account;use FireflyIII\Models\Budget;use FireflyIII\Repositories\Budget\OperationsRepositoryInterface;use FireflyIII\Support\CacheProperties;+use FireflyIII\Support\Facades\Navigation;use FireflyIII\Support\Http\Controllers\BasicDataSupport;use FireflyIII\Support\Report\Budget\BudgetReportGenerator;use Illuminate\Contracts\View\Factory;use Illuminate\Support\Collection;use Illuminate\View\View;+use Throwable;/*** Class BudgetController.diff --git a/app/Http/Controllers/Report/CategoryController.php b/app/Http/Controllers/Report/CategoryController.phpindex fc8d17421a..1ae30d59e8 100644--- a/app/Http/Controllers/Report/CategoryController.php+++ b/app/Http/Controllers/Report/CategoryController.php@@ -23,7 +23,6 @@ declare(strict_types=1);namespace FireflyIII\Http\Controllers\Report;-use Throwable;use Carbon\Carbon;use FireflyIII\Exceptions\FireflyException;use FireflyIII\Http\Controllers\Controller;@@ -37,6 +36,7 @@ use FireflyIII\Support\Report\Category\CategoryReportGenerator;use Illuminate\Contracts\View\Factory;use Illuminate\Support\Collection;use Illuminate\View\View;+use Throwable;/*** Class CategoryController.diff --git a/app/Http/Controllers/Report/DoubleController.php b/app/Http/Controllers/Report/DoubleController.phpindex 32a1736844..ffe0545273 100644--- a/app/Http/Controllers/Report/DoubleController.php+++ b/app/Http/Controllers/Report/DoubleController.php@@ -23,7 +23,6 @@ declare(strict_types=1);namespace FireflyIII\Http\Controllers\Report;-use Throwable;use Carbon\Carbon;use FireflyIII\Exceptions\FireflyException;use FireflyIII\Http\Controllers\Controller;@@ -34,6 +33,7 @@ use FireflyIII\Support\Http\Controllers\AugumentData;use Illuminate\Contracts\View\Factory;use Illuminate\Support\Collection;use Illuminate\View\View;+use Throwable;/*** Class DoubleControllerdiff --git a/app/Http/Controllers/Report/OperationsController.php b/app/Http/Controllers/Report/OperationsController.phpindex d2aaeaa3dd..e4f10fc574 100644--- a/app/Http/Controllers/Report/OperationsController.php+++ b/app/Http/Controllers/Report/OperationsController.php@@ -23,13 +23,13 @@ declare(strict_types=1);namespace FireflyIII\Http\Controllers\Report;-use Throwable;use Carbon\Carbon;use FireflyIII\Exceptions\FireflyException;use FireflyIII\Http\Controllers\Controller;use FireflyIII\Repositories\Account\AccountTaskerInterface;use FireflyIII\Support\CacheProperties;use Illuminate\Support\Collection;+use Throwable;/*** Class OperationsController.diff --git a/app/Http/Controllers/Report/TagController.php b/app/Http/Controllers/Report/TagController.phpindex 22bca3fd99..4eaeb46e90 100644--- a/app/Http/Controllers/Report/TagController.php+++ b/app/Http/Controllers/Report/TagController.php@@ -24,7 +24,6 @@ declare(strict_types=1);namespace FireflyIII\Http\Controllers\Report;-use Throwable;use Carbon\Carbon;use FireflyIII\Exceptions\FireflyException;use FireflyIII\Http\Controllers\Controller;@@ -34,6 +33,7 @@ use FireflyIII\Repositories\Tag\OperationsRepositoryInterface;use Illuminate\Contracts\View\Factory;use Illuminate\Support\Collection;use Illuminate\View\View;+use Throwable;/*** Class TagControllerdiff --git a/app/Http/Controllers/Rule/CreateController.php b/app/Http/Controllers/Rule/CreateController.phpindex 107042d458..24c9c8bd64 100644--- a/app/Http/Controllers/Rule/CreateController.php+++ b/app/Http/Controllers/Rule/CreateController.php@@ -24,11 +24,11 @@ declare(strict_types=1);namespace FireflyIII\Http\Controllers\Rule;-use FireflyIII\Models\Rule;use FireflyIII\Exceptions\FireflyException;use FireflyIII\Http\Controllers\Controller;use FireflyIII\Http\Requests\RuleFormRequest;use FireflyIII\Models\Bill;+use FireflyIII\Models\Rule;use FireflyIII\Models\RuleGroup;use FireflyIII\Models\TransactionJournal;use FireflyIII\Repositories\Rule\RuleRepositoryInterface;diff --git a/app/Http/Controllers/Rule/EditController.php b/app/Http/Controllers/Rule/EditController.phpindex 848fa259a3..f1888c425d 100644--- a/app/Http/Controllers/Rule/EditController.php+++ b/app/Http/Controllers/Rule/EditController.php@@ -24,7 +24,6 @@ declare(strict_types=1);namespace FireflyIII\Http\Controllers\Rule;-use Throwable;use FireflyIII\Exceptions\FireflyException;use FireflyIII\Http\Controllers\Controller;use FireflyIII\Http\Requests\RuleFormRequest;@@ -39,6 +38,7 @@ use Illuminate\Http\RedirectResponse;use Illuminate\Http\Request;use Illuminate\Routing\Redirector;use Illuminate\View\View;+use Throwable;/*** Class EditControllerdiff --git a/app/Http/Controllers/Rule/SelectController.php b/app/Http/Controllers/Rule/SelectController.phpindex 4d85f8ae3d..1084a9f2c8 100644--- a/app/Http/Controllers/Rule/SelectController.php+++ b/app/Http/Controllers/Rule/SelectController.php@@ -24,7 +24,6 @@ declare(strict_types=1);namespace FireflyIII\Http\Controllers\Rule;-use Throwable;use FireflyIII\Exceptions\FireflyException;use FireflyIII\Http\Controllers\Controller;use FireflyIII\Http\Requests\SelectTransactionsRequest;@@ -39,6 +38,7 @@ use Illuminate\Http\JsonResponse;use Illuminate\Http\RedirectResponse;use Illuminate\Support\Collection;use Illuminate\View\View;+use Throwable;/*** Class SelectController.diff --git a/app/Http/Controllers/SearchController.php b/app/Http/Controllers/SearchController.phpindex b30d1eefad..39fa3cea10 100644--- a/app/Http/Controllers/SearchController.php+++ b/app/Http/Controllers/SearchController.php@@ -23,7 +23,6 @@ declare(strict_types=1);namespace FireflyIII\Http\Controllers;-use Throwable;use FireflyIII\Exceptions\FireflyException;use FireflyIII\Repositories\Rule\RuleRepositoryInterface;use FireflyIII\Support\Search\SearchInterface;@@ -31,6 +30,7 @@ use Illuminate\Contracts\View\Factory;use Illuminate\Http\JsonResponse;use Illuminate\Http\Request;use Illuminate\View\View;+use Throwable;/*** Class SearchController.diff --git a/app/Http/Controllers/System/InstallController.php b/app/Http/Controllers/System/InstallController.phpindex cd800053d4..48ff8a64b0 100644--- a/app/Http/Controllers/System/InstallController.php+++ b/app/Http/Controllers/System/InstallController.php@@ -24,20 +24,19 @@ declare(strict_types=1);namespace FireflyIII\Http\Controllers\System;-use FireflyIII\Support\Facades\FireflyConfig;-use Illuminate\Support\Facades\Artisan;-use Illuminate\Support\Facades\Cache;use Exception;use FireflyIII\Exceptions\FireflyException;use FireflyIII\Http\Controllers\Controller;+use FireflyIII\Support\Facades\FireflyConfig;use FireflyIII\Support\Http\Controllers\GetConfigurationData;use Illuminate\Contracts\View\Factory;use Illuminate\Http\JsonResponse;use Illuminate\Http\Request;+use Illuminate\Support\Facades\Artisan;+use Illuminate\Support\Facades\Cache;use Illuminate\View\View;use Laravel\Passport\Passport;use phpseclib3\Crypt\RSA;-use function Safe\file_put_contents;/**diff --git a/app/Http/Controllers/TagController.php b/app/Http/Controllers/TagController.phpindex 0fd2ef0336..d062801d47 100644--- a/app/Http/Controllers/TagController.php+++ b/app/Http/Controllers/TagController.php@@ -23,12 +23,12 @@ declare(strict_types=1);namespace FireflyIII\Http\Controllers;-use FireflyIII\Models\Location;use Carbon\Carbon;use FireflyIII\Exceptions\FireflyException;use FireflyIII\Helpers\Attachments\AttachmentHelperInterface;use FireflyIII\Helpers\Collector\GroupCollectorInterface;use FireflyIII\Http\Requests\TagFormRequest;+use FireflyIII\Models\Location;use FireflyIII\Models\Tag;use FireflyIII\Repositories\Tag\TagRepositoryInterface;use FireflyIII\Support\Http\Controllers\PeriodOverview;diff --git a/app/Http/Controllers/Transaction/ConvertController.php b/app/Http/Controllers/Transaction/ConvertController.phpindex ec211a9b0d..bb5aa6f7d6 100644--- a/app/Http/Controllers/Transaction/ConvertController.php+++ b/app/Http/Controllers/Transaction/ConvertController.php@@ -23,8 +23,6 @@ declare(strict_types=1);namespace FireflyIII\Http\Controllers\Transaction;-use FireflyIII\Models\Transaction;-use FireflyIII\Models\TransactionCurrency;use Exception;use FireflyIII\Enums\AccountTypeEnum;use FireflyIII\Enums\TransactionTypeEnum;@@ -32,6 +30,8 @@ use FireflyIII\Events\UpdatedTransactionGroup;use FireflyIII\Exceptions\FireflyException;use FireflyIII\Http\Controllers\Controller;use FireflyIII\Models\Account;+use FireflyIII\Models\Transaction;+use FireflyIII\Models\TransactionCurrency;use FireflyIII\Models\TransactionGroup;use FireflyIII\Models\TransactionJournal;use FireflyIII\Models\TransactionType;diff --git a/app/Http/Controllers/Transaction/CreateController.php b/app/Http/Controllers/Transaction/CreateController.phpindex 1fc030e5e9..71012d3565 100644--- a/app/Http/Controllers/Transaction/CreateController.php+++ b/app/Http/Controllers/Transaction/CreateController.php@@ -24,10 +24,9 @@ declare(strict_types=1);namespace FireflyIII\Http\Controllers\Transaction;-use FireflyIII\Models\TransactionGroup;use FireflyIII\Events\StoredTransactionGroup;-use FireflyIII\Exceptions\FireflyException;use FireflyIII\Http\Controllers\Controller;+use FireflyIII\Models\TransactionGroup;use FireflyIII\Repositories\Account\AccountRepositoryInterface;use FireflyIII\Repositories\TransactionGroup\TransactionGroupRepositoryInterface;use FireflyIII\Services\Internal\Update\GroupCloneService;@@ -36,7 +35,6 @@ use Illuminate\Contracts\View\Factory;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;diff --git a/app/Http/Controllers/Transaction/EditController.php b/app/Http/Controllers/Transaction/EditController.phpindex 2fa41b6de9..dcf9e36ca3 100644--- a/app/Http/Controllers/Transaction/EditController.php+++ b/app/Http/Controllers/Transaction/EditController.php@@ -34,7 +34,6 @@ use Illuminate\Http\JsonResponse;use Illuminate\Http\RedirectResponse;use Illuminate\Routing\Redirector;use Illuminate\View\View;-use Psr\Container\ContainerExceptionInterface;use Psr\Container\NotFoundExceptionInterface;use Safe\Exceptions\UrlException;diff --git a/app/Http/Controllers/Transaction/IndexController.php b/app/Http/Controllers/Transaction/IndexController.phpindex 92f67137c6..e0d2c83359 100644--- a/app/Http/Controllers/Transaction/IndexController.php+++ b/app/Http/Controllers/Transaction/IndexController.php@@ -24,11 +24,11 @@ declare(strict_types=1);namespace FireflyIII\Http\Controllers\Transaction;-use FireflyIII\Models\TransactionJournal;use Carbon\Carbon;use FireflyIII\Exceptions\FireflyException;use FireflyIII\Helpers\Collector\GroupCollectorInterface;use FireflyIII\Http\Controllers\Controller;+use FireflyIII\Models\TransactionJournal;use FireflyIII\Repositories\Journal\JournalRepositoryInterface;use FireflyIII\Support\Http\Controllers\PeriodOverview;use Illuminate\Contracts\View\Factory;diff --git a/app/Http/Controllers/Transaction/MassController.php b/app/Http/Controllers/Transaction/MassController.phpindex bb7f4609ae..7fde459a35 100644--- a/app/Http/Controllers/Transaction/MassController.php+++ b/app/Http/Controllers/Transaction/MassController.php@@ -23,7 +23,6 @@ declare(strict_types=1);namespace FireflyIII\Http\Controllers\Transaction;-use InvalidArgumentException;use Carbon\Carbon;use FireflyIII\Enums\AccountTypeEnum;use FireflyIII\Enums\TransactionTypeEnum;@@ -42,6 +41,7 @@ use Illuminate\Http\RedirectResponse;use Illuminate\Routing\Redirector;use Illuminate\Support\Facades\Log;use Illuminate\View\View as IlluminateView;+use InvalidArgumentException;/*** Class MassController.diff --git a/app/Http/Controllers/TransactionCurrency/CreateController.php b/app/Http/Controllers/TransactionCurrency/CreateController.phpindex 2e7372b213..89febb82b5 100644--- a/app/Http/Controllers/TransactionCurrency/CreateController.php+++ b/app/Http/Controllers/TransactionCurrency/CreateController.php@@ -24,10 +24,10 @@ declare(strict_types=1);namespace FireflyIII\Http\Controllers\TransactionCurrency;-use FireflyIII\Models\TransactionCurrency;use FireflyIII\Exceptions\FireflyException;use FireflyIII\Http\Controllers\Controller;use FireflyIII\Http\Requests\CurrencyFormRequest;+use FireflyIII\Models\TransactionCurrency;use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;use FireflyIII\Repositories\User\UserRepositoryInterface;use FireflyIII\User;diff --git a/app/Http/Middleware/AcceptHeaders.php b/app/Http/Middleware/AcceptHeaders.phpindex d8884aebf3..c8b8749ad8 100644--- a/app/Http/Middleware/AcceptHeaders.php+++ b/app/Http/Middleware/AcceptHeaders.php@@ -29,7 +29,6 @@ use Illuminate\Http\Request;use Illuminate\Http\Response;use Safe\Exceptions\PcreException;use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;-use function Safe\preg_match;class AcceptHeadersdiff --git a/app/Http/Middleware/Range.php b/app/Http/Middleware/Range.phpindex a9e7a705cd..47bcf126e2 100644--- a/app/Http/Middleware/Range.php+++ b/app/Http/Middleware/Range.php@@ -23,14 +23,14 @@ declare(strict_types=1);namespace FireflyIII\Http\Middleware;-use Closure;-use FireflyIII\Support\Facades\Steam;-use Illuminate\Support\Facades\App;use Carbon\Carbon;+use Closure;use FireflyIII\Repositories\Journal\JournalRepositoryInterface;use FireflyIII\Support\Facades\Amount;+use FireflyIII\Support\Facades\Steam;use FireflyIII\Support\Http\Controllers\RequestInformation;use Illuminate\Http\Request;+use Illuminate\Support\Facades\App;use Illuminate\Support\Facades\Log;/**diff --git a/app/Http/Middleware/SecureHeaders.php b/app/Http/Middleware/SecureHeaders.phpindex 5f8b104992..246a9bf4a3 100644--- a/app/Http/Middleware/SecureHeaders.php+++ b/app/Http/Middleware/SecureHeaders.php@@ -24,9 +24,9 @@ declare(strict_types=1);namespace FireflyIII\Http\Middleware;+use Barryvdh\Debugbar\Facades\Debugbar;use Closure;use Exception;-use Barryvdh\Debugbar\Facades\Debugbar;use Illuminate\Http\Request;use Illuminate\Support\Facades\Vite;diff --git a/app/Http/Middleware/StartFireflySession.php b/app/Http/Middleware/StartFireflySession.phpindex 922bc3ad8c..02aab37b34 100644--- a/app/Http/Middleware/StartFireflySession.php+++ b/app/Http/Middleware/StartFireflySession.php@@ -23,10 +23,10 @@ declare(strict_types=1);namespace FireflyIII\Http\Middleware;-use Override;use Illuminate\Contracts\Session\Session;use Illuminate\Http\Request;use Illuminate\Session\Middleware\StartSession;+use Override;/*** Class StartFireflySession.diff --git a/app/Http/Middleware/TrustHosts.php b/app/Http/Middleware/TrustHosts.phpindex 4446201045..e41086a8db 100644--- a/app/Http/Middleware/TrustHosts.php+++ b/app/Http/Middleware/TrustHosts.php@@ -24,8 +24,8 @@ declare(strict_types=1);namespace FireflyIII\Http\Middleware;-use Override;use Illuminate\Http\Middleware\TrustHosts as Middleware;+use Override;class TrustHosts extends Middleware{diff --git a/app/Http/Requests/AccountFormRequest.php b/app/Http/Requests/AccountFormRequest.phpindex ced11547e0..9cd8d51163 100644--- a/app/Http/Requests/AccountFormRequest.php+++ b/app/Http/Requests/AccountFormRequest.php@@ -23,7 +23,6 @@ declare(strict_types=1);namespace FireflyIII\Http\Requests;-use Illuminate\Validation\Validator;use FireflyIII\Enums\UserRoleEnum;use FireflyIII\Models\Account;use FireflyIII\Models\Location;@@ -34,6 +33,7 @@ use FireflyIII\Support\Request\ChecksLogin;use FireflyIII\Support\Request\ConvertsDataTypes;use Illuminate\Foundation\Http\FormRequest;use Illuminate\Support\Facades\Log;+use Illuminate\Validation\Validator;/*** Class AccountFormRequest.diff --git a/app/Http/Requests/AttachmentFormRequest.php b/app/Http/Requests/AttachmentFormRequest.phpindex f2b4beb568..f481510ee6 100644--- a/app/Http/Requests/AttachmentFormRequest.php+++ b/app/Http/Requests/AttachmentFormRequest.php@@ -23,11 +23,11 @@ declare(strict_types=1);namespace FireflyIII\Http\Requests;-use Illuminate\Validation\Validator;use FireflyIII\Support\Request\ChecksLogin;use FireflyIII\Support\Request\ConvertsDataTypes;use Illuminate\Foundation\Http\FormRequest;use Illuminate\Support\Facades\Log;+use Illuminate\Validation\Validator;/*** Class AttachmentFormRequest.diff --git a/app/Http/Requests/BillStoreRequest.php b/app/Http/Requests/BillStoreRequest.phpindex 46436a7c9d..37e9f7ef02 100644--- a/app/Http/Requests/BillStoreRequest.php+++ b/app/Http/Requests/BillStoreRequest.php@@ -23,12 +23,12 @@ declare(strict_types=1);namespace FireflyIII\Http\Requests;-use Illuminate\Validation\Validator;use FireflyIII\Rules\IsValidPositiveAmount;use FireflyIII\Support\Request\ChecksLogin;use FireflyIII\Support\Request\ConvertsDataTypes;use Illuminate\Foundation\Http\FormRequest;use Illuminate\Support\Facades\Log;+use Illuminate\Validation\Validator;/*** Class BillStoreRequest.diff --git a/app/Http/Requests/BillUpdateRequest.php b/app/Http/Requests/BillUpdateRequest.phpindex 2f70b26df3..cde6978364 100644--- a/app/Http/Requests/BillUpdateRequest.php+++ b/app/Http/Requests/BillUpdateRequest.php@@ -23,13 +23,13 @@ declare(strict_types=1);namespace FireflyIII\Http\Requests;-use Illuminate\Validation\Validator;use FireflyIII\Models\Bill;use FireflyIII\Rules\IsValidPositiveAmount;use FireflyIII\Support\Request\ChecksLogin;use FireflyIII\Support\Request\ConvertsDataTypes;use Illuminate\Foundation\Http\FormRequest;use Illuminate\Support\Facades\Log;+use Illuminate\Validation\Validator;/*** Class BillUpdateRequest.diff --git a/app/Http/Requests/BudgetFormStoreRequest.php b/app/Http/Requests/BudgetFormStoreRequest.phpindex ac4edf6e69..86779d3794 100644--- a/app/Http/Requests/BudgetFormStoreRequest.php+++ b/app/Http/Requests/BudgetFormStoreRequest.php@@ -23,13 +23,13 @@ declare(strict_types=1);namespace FireflyIII\Http\Requests;-use Illuminate\Validation\Validator;use FireflyIII\Rules\IsValidPositiveAmount;use FireflyIII\Support\Request\ChecksLogin;use FireflyIII\Support\Request\ConvertsDataTypes;use FireflyIII\Validation\AutoBudget\ValidatesAutoBudgetRequest;use Illuminate\Foundation\Http\FormRequest;use Illuminate\Support\Facades\Log;+use Illuminate\Validation\Validator;/*** Class BudgetFormStoreRequestdiff --git a/app/Http/Requests/BudgetFormUpdateRequest.php b/app/Http/Requests/BudgetFormUpdateRequest.phpindex 539e613fff..cdebd759e7 100644--- a/app/Http/Requests/BudgetFormUpdateRequest.php+++ b/app/Http/Requests/BudgetFormUpdateRequest.php@@ -23,7 +23,6 @@ declare(strict_types=1);namespace FireflyIII\Http\Requests;-use Illuminate\Validation\Validator;use FireflyIII\Models\Budget;use FireflyIII\Rules\IsValidPositiveAmount;use FireflyIII\Support\Request\ChecksLogin;@@ -31,6 +30,7 @@ use FireflyIII\Support\Request\ConvertsDataTypes;use FireflyIII\Validation\AutoBudget\ValidatesAutoBudgetRequest;use Illuminate\Foundation\Http\FormRequest;use Illuminate\Support\Facades\Log;+use Illuminate\Validation\Validator;/*** Class BudgetFormUpdateRequestdiff --git a/app/Http/Requests/BudgetIncomeRequest.php b/app/Http/Requests/BudgetIncomeRequest.phpindex 49ed18de14..d75f81faa9 100644--- a/app/Http/Requests/BudgetIncomeRequest.php+++ b/app/Http/Requests/BudgetIncomeRequest.php@@ -23,11 +23,11 @@ declare(strict_types=1);namespace FireflyIII\Http\Requests;-use Illuminate\Validation\Validator;use FireflyIII\Rules\IsValidPositiveAmount;use FireflyIII\Support\Request\ChecksLogin;use Illuminate\Foundation\Http\FormRequest;use Illuminate\Support\Facades\Log;+use Illuminate\Validation\Validator;/*** Class BudgetIncomeRequest.diff --git a/app/Http/Requests/BulkEditJournalRequest.php b/app/Http/Requests/BulkEditJournalRequest.phpindex 169d1bc6ce..4bbaafa77b 100644--- a/app/Http/Requests/BulkEditJournalRequest.php+++ b/app/Http/Requests/BulkEditJournalRequest.php@@ -23,11 +23,11 @@ declare(strict_types=1);namespace FireflyIII\Http\Requests;-use Illuminate\Validation\Validator;use FireflyIII\Support\Request\ChecksLogin;use FireflyIII\Support\Request\ConvertsDataTypes;use Illuminate\Foundation\Http\FormRequest;use Illuminate\Support\Facades\Log;+use Illuminate\Validation\Validator;/*** Class MassEditBulkJournalRequest.diff --git a/app/Http/Requests/CategoryFormRequest.php b/app/Http/Requests/CategoryFormRequest.phpindex a4e5112669..8ca3455168 100644--- a/app/Http/Requests/CategoryFormRequest.php+++ b/app/Http/Requests/CategoryFormRequest.php@@ -23,12 +23,12 @@ declare(strict_types=1);namespace FireflyIII\Http\Requests;-use Illuminate\Validation\Validator;use FireflyIII\Models\Category;use FireflyIII\Support\Request\ChecksLogin;use FireflyIII\Support\Request\ConvertsDataTypes;use Illuminate\Foundation\Http\FormRequest;use Illuminate\Support\Facades\Log;+use Illuminate\Validation\Validator;/*** Class CategoryFormRequest.diff --git a/app/Http/Requests/ConfigurationRequest.php b/app/Http/Requests/ConfigurationRequest.phpindex 712d2be5a4..57f8a969b4 100644--- a/app/Http/Requests/ConfigurationRequest.php+++ b/app/Http/Requests/ConfigurationRequest.php@@ -23,10 +23,10 @@ declare(strict_types=1);namespace FireflyIII\Http\Requests;-use Illuminate\Validation\Validator;use FireflyIII\Support\Request\ChecksLogin;use Illuminate\Foundation\Http\FormRequest;use Illuminate\Support\Facades\Log;+use Illuminate\Validation\Validator;/*** Class ConfigurationRequest.diff --git a/app/Http/Requests/CurrencyFormRequest.php b/app/Http/Requests/CurrencyFormRequest.phpindex 60ce09cbba..959678e64c 100644--- a/app/Http/Requests/CurrencyFormRequest.php+++ b/app/Http/Requests/CurrencyFormRequest.php@@ -23,12 +23,12 @@ declare(strict_types=1);namespace FireflyIII\Http\Requests;-use Illuminate\Validation\Validator;use FireflyIII\Models\TransactionCurrency;use FireflyIII\Support\Request\ChecksLogin;use FireflyIII\Support\Request\ConvertsDataTypes;use Illuminate\Foundation\Http\FormRequest;use Illuminate\Support\Facades\Log;+use Illuminate\Validation\Validator;/*** Class CurrencyFormRequest.diff --git a/app/Http/Requests/DeleteAccountFormRequest.php b/app/Http/Requests/DeleteAccountFormRequest.phpindex eb36622b3a..31222e084a 100644--- a/app/Http/Requests/DeleteAccountFormRequest.php+++ b/app/Http/Requests/DeleteAccountFormRequest.php@@ -23,10 +23,10 @@ declare(strict_types=1);namespace FireflyIII\Http\Requests;-use Illuminate\Validation\Validator;use FireflyIII\Support\Request\ChecksLogin;use Illuminate\Foundation\Http\FormRequest;use Illuminate\Support\Facades\Log;+use Illuminate\Validation\Validator;/*** Class DeleteAccountFormRequest.diff --git a/app/Http/Requests/EmailFormRequest.php b/app/Http/Requests/EmailFormRequest.phpindex 1f499245eb..cd4369f3ec 100644--- a/app/Http/Requests/EmailFormRequest.php+++ b/app/Http/Requests/EmailFormRequest.php@@ -23,11 +23,11 @@ declare(strict_types=1);namespace FireflyIII\Http\Requests;-use Illuminate\Validation\Validator;use FireflyIII\Support\Request\ChecksLogin;use FireflyIII\Support\Request\ConvertsDataTypes;use Illuminate\Foundation\Http\FormRequest;use Illuminate\Support\Facades\Log;+use Illuminate\Validation\Validator;/*** Class EmailFormRequest.diff --git a/app/Http/Requests/ExistingTokenFormRequest.php b/app/Http/Requests/ExistingTokenFormRequest.phpindex f3222a8d57..b843012fba 100644--- a/app/Http/Requests/ExistingTokenFormRequest.php+++ b/app/Http/Requests/ExistingTokenFormRequest.php@@ -23,10 +23,10 @@ declare(strict_types=1);namespace FireflyIII\Http\Requests;-use Illuminate\Validation\Validator;use FireflyIII\Support\Request\ChecksLogin;use Illuminate\Foundation\Http\FormRequest;use Illuminate\Support\Facades\Log;+use Illuminate\Validation\Validator;/*** Class ExistingTokenFormRequest.diff --git a/app/Http/Requests/InviteUserFormRequest.php b/app/Http/Requests/InviteUserFormRequest.phpindex 70ebad1f19..2c31d965ce 100644--- a/app/Http/Requests/InviteUserFormRequest.php+++ b/app/Http/Requests/InviteUserFormRequest.php@@ -24,11 +24,11 @@ declare(strict_types=1);namespace FireflyIII\Http\Requests;-use Illuminate\Validation\Validator;use FireflyIII\Support\Request\ChecksLogin;use FireflyIII\Support\Request\ConvertsDataTypes;use Illuminate\Foundation\Http\FormRequest;use Illuminate\Support\Facades\Log;+use Illuminate\Validation\Validator;/*** Class InviteUserFormRequestdiff --git a/app/Http/Requests/JournalLinkRequest.php b/app/Http/Requests/JournalLinkRequest.phpindex 487b47f91c..185aaea191 100644--- a/app/Http/Requests/JournalLinkRequest.php+++ b/app/Http/Requests/JournalLinkRequest.php@@ -23,12 +23,12 @@ declare(strict_types=1);namespace FireflyIII\Http\Requests;-use Illuminate\Validation\Validator;use FireflyIII\Models\LinkType;use FireflyIII\Support\Request\ChecksLogin;use FireflyIII\Support\Request\ConvertsDataTypes;use Illuminate\Foundation\Http\FormRequest;use Illuminate\Support\Facades\Log;+use Illuminate\Validation\Validator;/*** Class JournalLink.diff --git a/app/Http/Requests/LinkTypeFormRequest.php b/app/Http/Requests/LinkTypeFormRequest.phpindex bc0a56c933..3fb7511c6a 100644--- a/app/Http/Requests/LinkTypeFormRequest.php+++ b/app/Http/Requests/LinkTypeFormRequest.php@@ -23,11 +23,11 @@ declare(strict_types=1);namespace FireflyIII\Http\Requests;-use Illuminate\Validation\Validator;use FireflyIII\Support\Request\ChecksLogin;use FireflyIII\Support\Request\ConvertsDataTypes;use Illuminate\Foundation\Http\FormRequest;use Illuminate\Support\Facades\Log;+use Illuminate\Validation\Validator;/*** Class LinkTypeFormRequest.diff --git a/app/Http/Requests/MassDeleteJournalRequest.php b/app/Http/Requests/MassDeleteJournalRequest.phpindex fc1c5e93f8..603e8a7d51 100644--- a/app/Http/Requests/MassDeleteJournalRequest.php+++ b/app/Http/Requests/MassDeleteJournalRequest.php@@ -23,10 +23,10 @@ declare(strict_types=1);namespace FireflyIII\Http\Requests;-use Illuminate\Validation\Validator;use FireflyIII\Support\Request\ChecksLogin;use Illuminate\Foundation\Http\FormRequest;use Illuminate\Support\Facades\Log;+use Illuminate\Validation\Validator;/*** Class MassDeleteJournalRequest.diff --git a/app/Http/Requests/MassEditJournalRequest.php b/app/Http/Requests/MassEditJournalRequest.phpindex ccf00f8988..7f217aaf67 100644--- a/app/Http/Requests/MassEditJournalRequest.php+++ b/app/Http/Requests/MassEditJournalRequest.php@@ -23,10 +23,10 @@ declare(strict_types=1);namespace FireflyIII\Http\Requests;-use Illuminate\Validation\Validator;use FireflyIII\Support\Request\ChecksLogin;use Illuminate\Foundation\Http\FormRequest;use Illuminate\Support\Facades\Log;+use Illuminate\Validation\Validator;/*** Class MassEditJournalRequest.diff --git a/app/Http/Requests/NewUserFormRequest.php b/app/Http/Requests/NewUserFormRequest.phpindex 967d7fe461..bed1e3def7 100644--- a/app/Http/Requests/NewUserFormRequest.php+++ b/app/Http/Requests/NewUserFormRequest.php@@ -23,12 +23,12 @@ declare(strict_types=1);namespace FireflyIII\Http\Requests;-use Illuminate\Validation\Validator;use FireflyIII\Rules\IsValidAmount;use FireflyIII\Support\Request\ChecksLogin;use FireflyIII\Support\Request\ConvertsDataTypes;use Illuminate\Foundation\Http\FormRequest;use Illuminate\Support\Facades\Log;+use Illuminate\Validation\Validator;/*** Class NewUserFormRequest.diff --git a/app/Http/Requests/ObjectGroupFormRequest.php b/app/Http/Requests/ObjectGroupFormRequest.phpindex ccc0cf24f5..8d8dcb1b8a 100644--- a/app/Http/Requests/ObjectGroupFormRequest.php+++ b/app/Http/Requests/ObjectGroupFormRequest.php@@ -23,12 +23,12 @@ declare(strict_types=1);namespace FireflyIII\Http\Requests;-use Illuminate\Validation\Validator;use FireflyIII\Models\ObjectGroup;use FireflyIII\Support\Request\ChecksLogin;use FireflyIII\Support\Request\ConvertsDataTypes;use Illuminate\Foundation\Http\FormRequest;use Illuminate\Support\Facades\Log;+use Illuminate\Validation\Validator;/*** Class ObjectGroupFormRequest.diff --git a/app/Http/Requests/PiggyBankStoreRequest.php b/app/Http/Requests/PiggyBankStoreRequest.phpindex 868b1cc4bd..87a13140da 100644--- a/app/Http/Requests/PiggyBankStoreRequest.php+++ b/app/Http/Requests/PiggyBankStoreRequest.php@@ -23,7 +23,6 @@ declare(strict_types=1);namespace FireflyIII\Http\Requests;-use Illuminate\Validation\Validator;use FireflyIII\Exceptions\FireflyException;use FireflyIII\Models\TransactionCurrency;use FireflyIII\Repositories\Account\AccountRepositoryInterface;@@ -33,6 +32,7 @@ use FireflyIII\Support\Request\ChecksLogin;use FireflyIII\Support\Request\ConvertsDataTypes;use Illuminate\Foundation\Http\FormRequest;use Illuminate\Support\Facades\Log;+use Illuminate\Validation\Validator;/*** Class PiggyBankStoreRequest.diff --git a/app/Http/Requests/PiggyBankUpdateRequest.php b/app/Http/Requests/PiggyBankUpdateRequest.phpindex e0ecaf9614..a93fcada2f 100644--- a/app/Http/Requests/PiggyBankUpdateRequest.php+++ b/app/Http/Requests/PiggyBankUpdateRequest.php@@ -23,7 +23,6 @@ declare(strict_types=1);namespace FireflyIII\Http\Requests;-use Illuminate\Validation\Validator;use FireflyIII\Exceptions\FireflyException;use FireflyIII\Models\PiggyBank;use FireflyIII\Models\TransactionCurrency;@@ -34,6 +33,7 @@ use FireflyIII\Support\Request\ChecksLogin;use FireflyIII\Support\Request\ConvertsDataTypes;use Illuminate\Foundation\Http\FormRequest;use Illuminate\Support\Facades\Log;+use Illuminate\Validation\Validator;/*** Class PiggyBankFormRequest.diff --git a/app/Http/Requests/ProfileFormRequest.php b/app/Http/Requests/ProfileFormRequest.phpindex 1a7956d647..bf741778e6 100644--- a/app/Http/Requests/ProfileFormRequest.php+++ b/app/Http/Requests/ProfileFormRequest.php@@ -23,10 +23,10 @@ declare(strict_types=1);namespace FireflyIII\Http\Requests;-use Illuminate\Validation\Validator;use FireflyIII\Support\Request\ChecksLogin;use Illuminate\Foundation\Http\FormRequest;use Illuminate\Support\Facades\Log;+use Illuminate\Validation\Validator;/*** Class ProfileFormRequest.diff --git a/app/Http/Requests/ReconciliationStoreRequest.php b/app/Http/Requests/ReconciliationStoreRequest.phpindex e8c8b1a9be..75a1a6d8e3 100644--- a/app/Http/Requests/ReconciliationStoreRequest.php+++ b/app/Http/Requests/ReconciliationStoreRequest.php@@ -24,13 +24,13 @@ declare(strict_types=1);namespace FireflyIII\Http\Requests;-use Illuminate\Validation\Validator;use FireflyIII\Rules\IsValidAmount;use FireflyIII\Rules\ValidJournals;use FireflyIII\Support\Request\ChecksLogin;use FireflyIII\Support\Request\ConvertsDataTypes;use Illuminate\Foundation\Http\FormRequest;use Illuminate\Support\Facades\Log;+use Illuminate\Validation\Validator;/*** Class ReconciliationStoreRequestdiff --git a/app/Http/Requests/RecurrenceFormRequest.php b/app/Http/Requests/RecurrenceFormRequest.phpindex a4f9014078..d7340dd793 100644--- a/app/Http/Requests/RecurrenceFormRequest.php+++ b/app/Http/Requests/RecurrenceFormRequest.php@@ -24,7 +24,6 @@ declare(strict_types=1);namespace FireflyIII\Http\Requests;-use Illuminate\Validation\Validator;use FireflyIII\Enums\TransactionTypeEnum;use FireflyIII\Exceptions\FireflyException;use FireflyIII\Factory\CategoryFactory;@@ -37,6 +36,7 @@ use FireflyIII\Support\Request\ConvertsDataTypes;use FireflyIII\Validation\AccountValidator;use Illuminate\Foundation\Http\FormRequest;use Illuminate\Support\Facades\Log;+use Illuminate\Validation\Validator;/*** Class RecurrenceFormRequestdiff --git a/app/Http/Requests/ReportFormRequest.php b/app/Http/Requests/ReportFormRequest.phpindex 0061ca310a..fd11a32096 100644--- a/app/Http/Requests/ReportFormRequest.php+++ b/app/Http/Requests/ReportFormRequest.php@@ -23,7 +23,6 @@ declare(strict_types=1);namespace FireflyIII\Http\Requests;-use Illuminate\Validation\Validator;use Carbon\Carbon;use Exception;use FireflyIII\Exceptions\FireflyException;@@ -35,7 +34,7 @@ use FireflyIII\Support\Request\ChecksLogin;use Illuminate\Foundation\Http\FormRequest;use Illuminate\Support\Collection;use Illuminate\Support\Facades\Log;-+use Illuminate\Validation\Validator;use Safe\Exceptions\PcreException;use function Safe\preg_match;diff --git a/app/Http/Requests/RuleFormRequest.php b/app/Http/Requests/RuleFormRequest.phpindex f47f4b7c3f..8b7d9ca061 100644--- a/app/Http/Requests/RuleFormRequest.php+++ b/app/Http/Requests/RuleFormRequest.php@@ -23,7 +23,6 @@ declare(strict_types=1);namespace FireflyIII\Http\Requests;-use Illuminate\Validation\Validator;use FireflyIII\Models\Rule;use FireflyIII\Rules\IsValidActionExpression;use FireflyIII\Support\Request\ChecksLogin;@@ -31,6 +30,7 @@ use FireflyIII\Support\Request\ConvertsDataTypes;use FireflyIII\Support\Request\GetRuleConfiguration;use Illuminate\Foundation\Http\FormRequest;use Illuminate\Support\Facades\Log;+use Illuminate\Validation\Validator;/*** Class RuleFormRequest.diff --git a/app/Http/Requests/RuleGroupFormRequest.php b/app/Http/Requests/RuleGroupFormRequest.phpindex 6ebc1a6233..8f5c4af01b 100644--- a/app/Http/Requests/RuleGroupFormRequest.php+++ b/app/Http/Requests/RuleGroupFormRequest.php@@ -23,13 +23,13 @@ declare(strict_types=1);namespace FireflyIII\Http\Requests;-use Illuminate\Validation\Validator;use FireflyIII\Models\RuleGroup;use FireflyIII\Rules\IsBoolean;use FireflyIII\Support\Request\ChecksLogin;use FireflyIII\Support\Request\ConvertsDataTypes;use Illuminate\Foundation\Http\FormRequest;use Illuminate\Support\Facades\Log;+use Illuminate\Validation\Validator;/*** Class RuleGroupFormRequest.diff --git a/app/Http/Requests/SelectTransactionsRequest.php b/app/Http/Requests/SelectTransactionsRequest.phpindex 6b27652abc..fdd9e0ecf8 100644--- a/app/Http/Requests/SelectTransactionsRequest.php+++ b/app/Http/Requests/SelectTransactionsRequest.php@@ -23,10 +23,10 @@ declare(strict_types=1);namespace FireflyIII\Http\Requests;-use Illuminate\Validation\Validator;use FireflyIII\Support\Request\ChecksLogin;use Illuminate\Foundation\Http\FormRequest;use Illuminate\Support\Facades\Log;+use Illuminate\Validation\Validator;/*** Class SelectTransactionsRequest.diff --git a/app/Http/Requests/TagFormRequest.php b/app/Http/Requests/TagFormRequest.phpindex 28a733b78c..a156257b78 100644--- a/app/Http/Requests/TagFormRequest.php+++ b/app/Http/Requests/TagFormRequest.php@@ -23,7 +23,6 @@ declare(strict_types=1);namespace FireflyIII\Http\Requests;-use Illuminate\Validation\Validator;use FireflyIII\Models\Location;use FireflyIII\Models\Tag;use FireflyIII\Support\Request\AppendsLocationData;@@ -31,6 +30,7 @@ use FireflyIII\Support\Request\ChecksLogin;use FireflyIII\Support\Request\ConvertsDataTypes;use Illuminate\Foundation\Http\FormRequest;use Illuminate\Support\Facades\Log;+use Illuminate\Validation\Validator;/*** Class TagFormRequest.diff --git a/app/Http/Requests/TestRuleFormRequest.php b/app/Http/Requests/TestRuleFormRequest.phpindex 880c45625e..0cf0524667 100644--- a/app/Http/Requests/TestRuleFormRequest.php+++ b/app/Http/Requests/TestRuleFormRequest.php@@ -23,11 +23,11 @@ declare(strict_types=1);namespace FireflyIII\Http\Requests;-use Illuminate\Validation\Validator;use FireflyIII\Support\Request\ChecksLogin;use FireflyIII\Support\Request\GetRuleConfiguration;use Illuminate\Foundation\Http\FormRequest;use Illuminate\Support\Facades\Log;+use Illuminate\Validation\Validator;/*** Class TestRuleFormRequest.diff --git a/app/Http/Requests/TokenFormRequest.php b/app/Http/Requests/TokenFormRequest.phpindex a54a1e786b..3a53cbe7ab 100644--- a/app/Http/Requests/TokenFormRequest.php+++ b/app/Http/Requests/TokenFormRequest.php@@ -23,10 +23,10 @@ declare(strict_types=1);namespace FireflyIII\Http\Requests;-use Illuminate\Validation\Validator;use FireflyIII\Support\Request\ChecksLogin;use Illuminate\Foundation\Http\FormRequest;use Illuminate\Support\Facades\Log;+use Illuminate\Validation\Validator;/*** Class TokenFormRequest.diff --git a/app/Http/Requests/TriggerRecurrenceRequest.php b/app/Http/Requests/TriggerRecurrenceRequest.phpindex 4b929adaa7..c03e531a00 100644--- a/app/Http/Requests/TriggerRecurrenceRequest.php+++ b/app/Http/Requests/TriggerRecurrenceRequest.php@@ -24,11 +24,11 @@ declare(strict_types=1);namespace FireflyIII\Http\Requests;-use Illuminate\Validation\Validator;use FireflyIII\Support\Request\ChecksLogin;use FireflyIII\Support\Request\ConvertsDataTypes;use Illuminate\Foundation\Http\FormRequest;use Illuminate\Support\Facades\Log;+use Illuminate\Validation\Validator;/*** Class TriggerRecurrenceRequestdiff --git a/app/Http/Requests/UserFormRequest.php b/app/Http/Requests/UserFormRequest.phpindex b53be02934..409cfba453 100644--- a/app/Http/Requests/UserFormRequest.php+++ b/app/Http/Requests/UserFormRequest.php@@ -23,11 +23,11 @@ declare(strict_types=1);namespace FireflyIII\Http\Requests;-use Illuminate\Validation\Validator;use FireflyIII\Support\Request\ChecksLogin;use FireflyIII\Support\Request\ConvertsDataTypes;use Illuminate\Foundation\Http\FormRequest;use Illuminate\Support\Facades\Log;+use Illuminate\Validation\Validator;/*** Class UserFormRequest.diff --git a/app/Http/Requests/UserRegistrationRequest.php b/app/Http/Requests/UserRegistrationRequest.phpindex 64df7a021b..6e26763831 100644--- a/app/Http/Requests/UserRegistrationRequest.php+++ b/app/Http/Requests/UserRegistrationRequest.php@@ -23,10 +23,10 @@ declare(strict_types=1);namespace FireflyIII\Http\Requests;-use Illuminate\Validation\Validator;use FireflyIII\Support\Request\ChecksLogin;use Illuminate\Foundation\Http\FormRequest;use Illuminate\Support\Facades\Log;+use Illuminate\Validation\Validator;/*** Class UserRegistrationRequest.diff --git a/app/Jobs/DownloadExchangeRates.php b/app/Jobs/DownloadExchangeRates.phpindex 1bbb3ee10e..9b29bcaac5 100644--- a/app/Jobs/DownloadExchangeRates.php+++ b/app/Jobs/DownloadExchangeRates.php@@ -24,8 +24,8 @@ declare(strict_types=1);namespace FireflyIII\Jobs;-use FireflyIII\Models\CurrencyExchangeRate;use Carbon\Carbon;+use FireflyIII\Models\CurrencyExchangeRate;use FireflyIII\Models\TransactionCurrency;use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;use FireflyIII\Repositories\User\UserRepositoryInterface;@@ -40,7 +40,6 @@ use Illuminate\Queue\InteractsWithQueue;use Illuminate\Queue\SerializesModels;use Illuminate\Support\Collection;use Illuminate\Support\Facades\Log;-use Safe\Exceptions\JsonException;use function Safe\json_decode;diff --git a/app/Jobs/MailError.php b/app/Jobs/MailError.phpindex 57cfaf7feb..70c7f407b4 100644--- a/app/Jobs/MailError.php+++ b/app/Jobs/MailError.php@@ -24,6 +24,7 @@ declare(strict_types=1);namespace FireflyIII\Jobs;use Carbon\Carbon;+use Exception;use Illuminate\Contracts\Queue\ShouldQueue;use Illuminate\Mail\Message;use Illuminate\Queue\InteractsWithQueue;@@ -31,12 +32,10 @@ use Illuminate\Queue\SerializesModels;use Illuminate\Support\Facades\Log;use Illuminate\Support\Facades\Mail;use Symfony\Component\Mailer\Exception\TransportException;-use Exception;--use function Safe\json_encode;+use function Safe\file_get_contents;use function Safe\file_put_contents;use function Safe\json_decode;-use function Safe\file_get_contents;+use function Safe\json_encode;/*** Class MailError.diff --git a/app/Mail/InvitationMail.php b/app/Mail/InvitationMail.phpindex 14ad8821b5..0c886bc21e 100644--- a/app/Mail/InvitationMail.php+++ b/app/Mail/InvitationMail.php@@ -27,7 +27,6 @@ namespace FireflyIII\Mail;use Illuminate\Bus\Queueable;use Illuminate\Mail\Mailable;use Illuminate\Queue\SerializesModels;-use function Safe\parse_url;/**diff --git a/app/Models/AccountMeta.php b/app/Models/AccountMeta.phpindex a91e5eb778..ff42cb44f7 100644--- a/app/Models/AccountMeta.php+++ b/app/Models/AccountMeta.php@@ -27,7 +27,6 @@ use FireflyIII\Support\Models\ReturnsIntegerIdTrait;use Illuminate\Database\Eloquent\Casts\Attribute;use Illuminate\Database\Eloquent\Model;use Illuminate\Database\Eloquent\Relations\BelongsTo;-use function Safe\json_decode;use function Safe\json_encode;diff --git a/app/Models/Configuration.php b/app/Models/Configuration.phpindex 3fd2d82a19..e1fe1be20f 100644--- a/app/Models/Configuration.php+++ b/app/Models/Configuration.php@@ -27,7 +27,6 @@ use FireflyIII\Support\Models\ReturnsIntegerIdTrait;use Illuminate\Database\Eloquent\Casts\Attribute;use Illuminate\Database\Eloquent\Model;use Illuminate\Database\Eloquent\SoftDeletes;-use function Safe\json_decode;use function Safe\json_encode;diff --git a/app/Models/TransactionJournalMeta.php b/app/Models/TransactionJournalMeta.phpindex 4a748bfb8b..8c2c02ad72 100644--- a/app/Models/TransactionJournalMeta.php+++ b/app/Models/TransactionJournalMeta.php@@ -28,7 +28,6 @@ use Illuminate\Database\Eloquent\Casts\Attribute;use Illuminate\Database\Eloquent\Model;use Illuminate\Database\Eloquent\Relations\BelongsTo;use Illuminate\Database\Eloquent\SoftDeletes;-use function Safe\json_decode;use function Safe\json_encode;diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.phpindex 263342b753..e28f83d871 100644--- a/app/Providers/AppServiceProvider.php+++ b/app/Providers/AppServiceProvider.php@@ -30,7 +30,6 @@ use Illuminate\Support\Facades\Schema;use Illuminate\Support\ServiceProvider;use Laravel\Passport\Passport;use Override;-use function Safe\preg_match;/**diff --git a/app/Providers/FireflyServiceProvider.php b/app/Providers/FireflyServiceProvider.phpindex e900b72f9e..cb9bebbbf4 100644--- a/app/Providers/FireflyServiceProvider.php+++ b/app/Providers/FireflyServiceProvider.php@@ -77,8 +77,8 @@ use FireflyIII\Validation\FireflyValidator;use Illuminate\Foundation\Application;use Illuminate\Support\Facades\Validator;use Illuminate\Support\ServiceProvider;-use Symfony\Component\ExpressionLanguage\ExpressionLanguage;use Override;+use Symfony\Component\ExpressionLanguage\ExpressionLanguage;/*** Class FireflyServiceProvider.diff --git a/app/Repositories/Account/AccountRepository.php b/app/Repositories/Account/AccountRepository.phpindex 8eacb438b4..4b0278de7d 100644--- a/app/Repositories/Account/AccountRepository.php+++ b/app/Repositories/Account/AccountRepository.php@@ -48,7 +48,6 @@ use Illuminate\Support\Collection;use Illuminate\Support\Facades\Log;use Illuminate\Support\Facades\Storage;use Override;-use function Safe\json_encode;/**diff --git a/app/Repositories/Attachment/AttachmentRepository.php b/app/Repositories/Attachment/AttachmentRepository.phpindex 0e41c59cf4..cd0d3ea249 100644--- a/app/Repositories/Attachment/AttachmentRepository.php+++ b/app/Repositories/Attachment/AttachmentRepository.php@@ -23,6 +23,7 @@ declare(strict_types=1);namespace FireflyIII\Repositories\Attachment;+use Exception;use FireflyIII\Exceptions\FireflyException;use FireflyIII\Factory\AttachmentFactory;use FireflyIII\Helpers\Attachments\AttachmentHelperInterface;@@ -35,7 +36,6 @@ use Illuminate\Support\Collection;use Illuminate\Support\Facades\Crypt;use Illuminate\Support\Facades\Storage;use League\Flysystem\UnableToDeleteFile;-use Exception;use LogicException;/**diff --git a/app/Repositories/Bill/BillRepository.php b/app/Repositories/Bill/BillRepository.phpindex 99c484f4a8..daa88a5a65 100644--- a/app/Repositories/Bill/BillRepository.php+++ b/app/Repositories/Bill/BillRepository.php@@ -23,13 +23,13 @@ declare(strict_types=1);namespace FireflyIII\Repositories\Bill;-use FireflyIII\Models\ObjectGroup;use Carbon\Carbon;use FireflyIII\Exceptions\FireflyException;use FireflyIII\Factory\BillFactory;use FireflyIII\Models\Attachment;use FireflyIII\Models\Bill;use FireflyIII\Models\Note;+use FireflyIII\Models\ObjectGroup;use FireflyIII\Models\Rule;use FireflyIII\Models\Transaction;use FireflyIII\Models\TransactionJournal;diff --git a/app/Repositories/Budget/AvailableBudgetRepository.php b/app/Repositories/Budget/AvailableBudgetRepository.phpindex ee9db0ca62..cc2916cb92 100644--- a/app/Repositories/Budget/AvailableBudgetRepository.php+++ b/app/Repositories/Budget/AvailableBudgetRepository.php@@ -24,8 +24,8 @@ declare(strict_types=1);namespace FireflyIII\Repositories\Budget;-use Deprecated;use Carbon\Carbon;+use Deprecated;use FireflyIII\Models\AvailableBudget;use FireflyIII\Models\TransactionCurrency;use FireflyIII\Support\Facades\Amount;diff --git a/app/Repositories/Budget/AvailableBudgetRepositoryInterface.php b/app/Repositories/Budget/AvailableBudgetRepositoryInterface.phpindex 3d54e3f20b..46251e79d2 100644--- a/app/Repositories/Budget/AvailableBudgetRepositoryInterface.php+++ b/app/Repositories/Budget/AvailableBudgetRepositoryInterface.php@@ -24,8 +24,8 @@ declare(strict_types=1);namespace FireflyIII\Repositories\Budget;-use Deprecated;use Carbon\Carbon;+use Deprecated;use FireflyIII\Enums\UserRoleEnum;use FireflyIII\Models\AvailableBudget;use FireflyIII\Models\TransactionCurrency;diff --git a/app/Repositories/Budget/NoBudgetRepositoryInterface.php b/app/Repositories/Budget/NoBudgetRepositoryInterface.phpindex 01b42c3396..13d12a1122 100644--- a/app/Repositories/Budget/NoBudgetRepositoryInterface.php+++ b/app/Repositories/Budget/NoBudgetRepositoryInterface.php@@ -24,8 +24,8 @@ declare(strict_types=1);namespace FireflyIII\Repositories\Budget;-use Deprecated;use Carbon\Carbon;+use Deprecated;use FireflyIII\Enums\UserRoleEnum;use FireflyIII\Models\TransactionCurrency;use FireflyIII\Models\UserGroup;diff --git a/app/Repositories/Category/CategoryRepository.php b/app/Repositories/Category/CategoryRepository.phpindex 6856e3552a..7e46ff30d9 100644--- a/app/Repositories/Category/CategoryRepository.php+++ b/app/Repositories/Category/CategoryRepository.php@@ -24,6 +24,7 @@ declare(strict_types=1);namespace FireflyIII\Repositories\Category;use Carbon\Carbon;+use Exception;use FireflyIII\Exceptions\FireflyException;use FireflyIII\Factory\CategoryFactory;use FireflyIII\Models\Attachment;@@ -39,7 +40,6 @@ use Illuminate\Support\Collection;use Illuminate\Support\Facades\DB;use Illuminate\Support\Facades\Log;use Illuminate\Support\Facades\Storage;-use Exception;/*** Class CategoryRepository.diff --git a/app/Repositories/Currency/CurrencyRepository.php b/app/Repositories/Currency/CurrencyRepository.phpindex c76b5badfb..a3f673f108 100644--- a/app/Repositories/Currency/CurrencyRepository.php+++ b/app/Repositories/Currency/CurrencyRepository.php@@ -44,7 +44,6 @@ use FireflyIII\Support\Repositories\UserGroup\UserGroupTrait;use Illuminate\Support\Collection;use Illuminate\Support\Facades\Log;use Override;-use Safe\Exceptions\JsonException;use function Safe\json_encode;diff --git a/app/Repositories/PiggyBank/PiggyBankRepository.php b/app/Repositories/PiggyBank/PiggyBankRepository.phpindex 8ca1f14723..056825e7d8 100644--- a/app/Repositories/PiggyBank/PiggyBankRepository.php+++ b/app/Repositories/PiggyBank/PiggyBankRepository.php@@ -23,9 +23,8 @@ declare(strict_types=1);namespace FireflyIII\Repositories\PiggyBank;-use FireflyIII\Events\Model\PiggyBank\ChangedAmount;-use FireflyIII\User;use Carbon\Carbon;+use FireflyIII\Events\Model\PiggyBank\ChangedAmount;use FireflyIII\Exceptions\FireflyException;use FireflyIII\Factory\PiggyBankFactory;use FireflyIII\Models\Account;@@ -40,6 +39,7 @@ use FireflyIII\Repositories\Journal\JournalRepositoryInterface;use FireflyIII\Support\Facades\Steam;use FireflyIII\Support\Repositories\UserGroup\UserGroupInterface;use FireflyIII\Support\Repositories\UserGroup\UserGroupTrait;+use FireflyIII\User;use Illuminate\Support\Collection;use Illuminate\Support\Facades\Log;use Illuminate\Support\Facades\Storage;diff --git a/app/Repositories/Recurring/RecurringRepository.php b/app/Repositories/Recurring/RecurringRepository.phpindex f131b3d1f6..c519ab397f 100644--- a/app/Repositories/Recurring/RecurringRepository.php+++ b/app/Repositories/Recurring/RecurringRepository.php@@ -50,9 +50,8 @@ use Illuminate\Database\Eloquent\Builder;use Illuminate\Pagination\LengthAwarePaginator;use Illuminate\Support\Collection;use Illuminate\Support\Facades\Log;--use function Safe\json_encode;use function Safe\json_decode;+use function Safe\json_encode;/*** Class RecurringRepositorydiff --git a/app/Repositories/Rule/RuleRepository.php b/app/Repositories/Rule/RuleRepository.phpindex 5774e84e9e..e8435dc6c2 100644--- a/app/Repositories/Rule/RuleRepository.php+++ b/app/Repositories/Rule/RuleRepository.php@@ -23,6 +23,7 @@ declare(strict_types=1);namespace FireflyIII\Repositories\Rule;+use Exception;use FireflyIII\Exceptions\FireflyException;use FireflyIII\Models\Rule;use FireflyIII\Models\RuleAction;@@ -33,7 +34,6 @@ use FireflyIII\Support\Repositories\UserGroup\UserGroupInterface;use FireflyIII\Support\Repositories\UserGroup\UserGroupTrait;use FireflyIII\Support\Search\OperatorQuerySearch;use Illuminate\Support\Collection;-use Exception;/*** Class RuleRepository.diff --git a/app/Repositories/RuleGroup/RuleGroupRepository.php b/app/Repositories/RuleGroup/RuleGroupRepository.phpindex 3e1694baee..a3256ccf50 100644--- a/app/Repositories/RuleGroup/RuleGroupRepository.php+++ b/app/Repositories/RuleGroup/RuleGroupRepository.php@@ -23,6 +23,7 @@ declare(strict_types=1);namespace FireflyIII\Repositories\RuleGroup;+use Exception;use FireflyIII\Models\Rule;use FireflyIII\Models\RuleAction;use FireflyIII\Models\RuleGroup;@@ -32,7 +33,6 @@ use FireflyIII\Support\Repositories\UserGroup\UserGroupTrait;use Illuminate\Database\Eloquent\Relations\HasMany;use Illuminate\Support\Collection;use Illuminate\Support\Facades\Log;-use Exception;/*** Class RuleGroupRepository.diff --git a/app/Repositories/Tag/TagRepository.php b/app/Repositories/Tag/TagRepository.phpindex eb50e2ef8f..b900e9143a 100644--- a/app/Repositories/Tag/TagRepository.php+++ b/app/Repositories/Tag/TagRepository.php@@ -23,8 +23,8 @@ declare(strict_types=1);namespace FireflyIII\Repositories\Tag;-use Override;use Carbon\Carbon;+use Exception;use FireflyIII\Enums\TransactionTypeEnum;use FireflyIII\Factory\TagFactory;use FireflyIII\Helpers\Collector\GroupCollectorInterface;@@ -39,7 +39,7 @@ use Illuminate\Support\Collection;use Illuminate\Support\Facades\DB;use Illuminate\Support\Facades\Log;use Illuminate\Support\Facades\Storage;-use Exception;+use Override;/*** Class TagRepository.diff --git a/app/Repositories/TransactionGroup/TransactionGroupRepository.php b/app/Repositories/TransactionGroup/TransactionGroupRepository.phpindex 78acf6d253..8e8eac95e3 100644--- a/app/Repositories/TransactionGroup/TransactionGroupRepository.php+++ b/app/Repositories/TransactionGroup/TransactionGroupRepository.php@@ -49,7 +49,6 @@ use FireflyIII\Support\Repositories\UserGroup\UserGroupTrait;use Illuminate\Database\Eloquent\Builder;use Illuminate\Support\Collection;use Illuminate\Support\Facades\DB;-use function Safe\json_decode;/**diff --git a/app/Repositories/User/UserRepository.php b/app/Repositories/User/UserRepository.phpindex e00b15ba9d..d2e5c3fa81 100644--- a/app/Repositories/User/UserRepository.php+++ b/app/Repositories/User/UserRepository.php@@ -24,6 +24,7 @@ declare(strict_types=1);namespace FireflyIII\Repositories\User;use Carbon\Carbon;+use Exception;use FireflyIII\Exceptions\FireflyException;use FireflyIII\Models\BudgetLimit;use FireflyIII\Models\GroupMembership;@@ -35,7 +36,6 @@ use Illuminate\Contracts\Auth\Authenticatable;use Illuminate\Database\QueryException;use Illuminate\Support\Collection;use Illuminate\Support\Str;-use Exception;use Override;/**diff --git a/app/Rules/Account/IsValidAccountType.php b/app/Rules/Account/IsValidAccountType.phpindex d2287ff702..d2ac0603cf 100644--- a/app/Rules/Account/IsValidAccountType.php+++ b/app/Rules/Account/IsValidAccountType.php@@ -24,9 +24,9 @@ declare(strict_types=1);namespace FireflyIII\Rules\Account;+use Closure;use FireflyIII\Support\Http\Api\AccountFilter;use Illuminate\Contracts\Validation\ValidationRule;-use Closure;use Override;class IsValidAccountType implements ValidationRulediff --git a/app/Rules/Admin/IsValidDiscordUrl.php b/app/Rules/Admin/IsValidDiscordUrl.phpindex ccb4800935..a45bb12a4f 100644--- a/app/Rules/Admin/IsValidDiscordUrl.php+++ b/app/Rules/Admin/IsValidDiscordUrl.php@@ -25,10 +25,10 @@ declare(strict_types=1);namespace FireflyIII\Rules\Admin;+use Closure;use FireflyIII\Support\Validation\ValidatesAmountsTrait;use Illuminate\Contracts\Validation\ValidationRule;use Illuminate\Support\Facades\Log;-use Closure;class IsValidDiscordUrl implements ValidationRule{diff --git a/app/Rules/Admin/IsValidSlackOrDiscordUrl.php b/app/Rules/Admin/IsValidSlackOrDiscordUrl.phpindex 5b9f6063da..8efbf682c9 100644--- a/app/Rules/Admin/IsValidSlackOrDiscordUrl.php+++ b/app/Rules/Admin/IsValidSlackOrDiscordUrl.php@@ -25,10 +25,10 @@ declare(strict_types=1);namespace FireflyIII\Rules\Admin;+use Closure;use FireflyIII\Support\Validation\ValidatesAmountsTrait;use Illuminate\Contracts\Validation\ValidationRule;use Illuminate\Support\Facades\Log;-use Closure;class IsValidSlackOrDiscordUrl implements ValidationRule{diff --git a/app/Rules/Admin/IsValidSlackUrl.php b/app/Rules/Admin/IsValidSlackUrl.phpindex 90fc1dafcd..0355b03f97 100644--- a/app/Rules/Admin/IsValidSlackUrl.php+++ b/app/Rules/Admin/IsValidSlackUrl.php@@ -25,10 +25,10 @@ declare(strict_types=1);namespace FireflyIII\Rules\Admin;+use Closure;use FireflyIII\Support\Validation\ValidatesAmountsTrait;use Illuminate\Contracts\Validation\ValidationRule;use Illuminate\Support\Facades\Log;-use Closure;class IsValidSlackUrl implements ValidationRule{diff --git a/app/Rules/BelongsUser.php b/app/Rules/BelongsUser.phpindex 2e1fa3a9c2..48e44ddcbc 100644--- a/app/Rules/BelongsUser.php+++ b/app/Rules/BelongsUser.php@@ -24,6 +24,7 @@ declare(strict_types=1);namespace FireflyIII\Rules;+use Closure;use FireflyIII\Exceptions\FireflyException;use FireflyIII\Models\Account;use FireflyIII\Models\Bill;@@ -32,7 +33,6 @@ use FireflyIII\Models\Category;use FireflyIII\Models\PiggyBank;use FireflyIII\Models\TransactionJournal;use Illuminate\Contracts\Validation\ValidationRule;-use Closure;/*** Class BelongsUserdiff --git a/app/Rules/BelongsUserGroup.php b/app/Rules/BelongsUserGroup.phpindex fe29b1fbef..488080a176 100644--- a/app/Rules/BelongsUserGroup.php+++ b/app/Rules/BelongsUserGroup.php@@ -24,6 +24,7 @@ declare(strict_types=1);namespace FireflyIII\Rules;+use Closure;use FireflyIII\Exceptions\FireflyException;use FireflyIII\Models\Account;use FireflyIII\Models\Bill;@@ -33,7 +34,6 @@ use FireflyIII\Models\PiggyBank;use FireflyIII\Models\TransactionJournal;use FireflyIII\Models\UserGroup;use Illuminate\Contracts\Validation\ValidationRule;-use Closure;/*** Class BelongsUserGroupdiff --git a/app/Rules/IsAllowedGroupAction.php b/app/Rules/IsAllowedGroupAction.phpindex f3a197f113..7e30cd30ec 100644--- a/app/Rules/IsAllowedGroupAction.php+++ b/app/Rules/IsAllowedGroupAction.php@@ -24,6 +24,7 @@ declare(strict_types=1);namespace FireflyIII\Rules;+use Closure;use FireflyIII\Enums\UserRoleEnum;use FireflyIII\Models\Account;use FireflyIII\Repositories\UserGroup\UserGroupRepositoryInterface;@@ -31,7 +32,6 @@ use FireflyIII\User;use Illuminate\Auth\Access\AuthorizationException;use Illuminate\Contracts\Validation\ValidationRule;use Illuminate\Support\Facades\Log;-use Closure;use Override;class IsAllowedGroupAction implements ValidationRulediff --git a/app/Rules/IsAssetAccountId.php b/app/Rules/IsAssetAccountId.phpindex e8d26937fd..eadc485442 100644--- a/app/Rules/IsAssetAccountId.php+++ b/app/Rules/IsAssetAccountId.php@@ -23,10 +23,10 @@ declare(strict_types=1);namespace FireflyIII\Rules;+use Closure;use FireflyIII\Enums\AccountTypeEnum;use FireflyIII\Models\Account;use Illuminate\Contracts\Validation\ValidationRule;-use Closure;/*** Class IsAssetAccountIddiff --git a/app/Rules/IsBoolean.php b/app/Rules/IsBoolean.phpindex 28c1ca3781..7c2b31c99f 100644--- a/app/Rules/IsBoolean.php+++ b/app/Rules/IsBoolean.php@@ -24,8 +24,8 @@ declare(strict_types=1);namespace FireflyIII\Rules;-use Illuminate\Contracts\Validation\ValidationRule;use Closure;+use Illuminate\Contracts\Validation\ValidationRule;/*** Class IsBooleandiff --git a/app/Rules/IsDateOrTime.php b/app/Rules/IsDateOrTime.phpindex 64d711ec99..ae732d0ab3 100644--- a/app/Rules/IsDateOrTime.php+++ b/app/Rules/IsDateOrTime.php@@ -27,8 +27,8 @@ namespace FireflyIII\Rules;use Carbon\Carbon;use Carbon\Exceptions\InvalidDateException;use Carbon\Exceptions\InvalidFormatException;-use Illuminate\Contracts\Validation\ValidationRule;use Closure;+use Illuminate\Contracts\Validation\ValidationRule;/*** Class IsDateOrTimediff --git a/app/Rules/IsDefaultUserGroupName.php b/app/Rules/IsDefaultUserGroupName.phpindex 81b366a2e6..f59ff49327 100644--- a/app/Rules/IsDefaultUserGroupName.php+++ b/app/Rules/IsDefaultUserGroupName.php@@ -24,11 +24,11 @@ declare(strict_types=1);namespace FireflyIII\Rules;+use Closure;use FireflyIII\Models\UserGroup;use FireflyIII\Repositories\User\UserRepositoryInterface;use FireflyIII\User;use Illuminate\Contracts\Validation\ValidationRule;-use Closure;/*** Class IsDefaultUserGroupNamediff --git a/app/Rules/IsDuplicateTransaction.php b/app/Rules/IsDuplicateTransaction.phpindex 1f9a125205..bceb22b95f 100644--- a/app/Rules/IsDuplicateTransaction.php+++ b/app/Rules/IsDuplicateTransaction.php@@ -24,8 +24,8 @@ declare(strict_types=1);namespace FireflyIII\Rules;-use Illuminate\Contracts\Validation\ValidationRule;use Closure;+use Illuminate\Contracts\Validation\ValidationRule;/*** TODO not sure where this is used.diff --git a/app/Rules/IsFilterValueIn.php b/app/Rules/IsFilterValueIn.phpindex e167bdb79c..f7f41eb545 100644--- a/app/Rules/IsFilterValueIn.php+++ b/app/Rules/IsFilterValueIn.php@@ -24,8 +24,8 @@ declare(strict_types=1);namespace FireflyIII\Rules;-use Illuminate\Contracts\Validation\ValidationRule;use Closure;+use Illuminate\Contracts\Validation\ValidationRule;class IsFilterValueIn implements ValidationRule{diff --git a/app/Rules/IsTransferAccount.php b/app/Rules/IsTransferAccount.phpindex 22f1fc5d8c..d64f30fa38 100644--- a/app/Rules/IsTransferAccount.php+++ b/app/Rules/IsTransferAccount.php@@ -24,10 +24,10 @@ declare(strict_types=1);namespace FireflyIII\Rules;+use Closure;use FireflyIII\Enums\TransactionTypeEnum;use FireflyIII\Validation\AccountValidator;use Illuminate\Contracts\Validation\ValidationRule;-use Closure;/*** Class IsTransferAccountdiff --git a/app/Rules/IsValidActionExpression.php b/app/Rules/IsValidActionExpression.phpindex d12b507bd3..f6080a0903 100644--- a/app/Rules/IsValidActionExpression.php+++ b/app/Rules/IsValidActionExpression.php@@ -25,10 +25,10 @@ declare(strict_types=1);namespace FireflyIII\Rules;+use Closure;use FireflyIII\TransactionRules\Expressions\ActionExpression;use Illuminate\Contracts\Validation\ValidationRule;use Illuminate\Translation\PotentiallyTranslatedString;-use Closure;class IsValidActionExpression implements ValidationRule{diff --git a/app/Rules/IsValidAmount.php b/app/Rules/IsValidAmount.phpindex 208d60c696..26b06c8ac0 100644--- a/app/Rules/IsValidAmount.php+++ b/app/Rules/IsValidAmount.php@@ -25,10 +25,10 @@ declare(strict_types=1);namespace FireflyIII\Rules;+use Closure;use FireflyIII\Support\Validation\ValidatesAmountsTrait;use Illuminate\Contracts\Validation\ValidationRule;use Illuminate\Support\Facades\Log;-use Closure;class IsValidAmount implements ValidationRule{diff --git a/app/Rules/IsValidAttachmentModel.php b/app/Rules/IsValidAttachmentModel.phpindex 093e650cf2..69d09b708c 100644--- a/app/Rules/IsValidAttachmentModel.php+++ b/app/Rules/IsValidAttachmentModel.php@@ -24,6 +24,7 @@ declare(strict_types=1);namespace FireflyIII\Rules;+use Closure;use FireflyIII\Models\Account;use FireflyIII\Models\Bill;use FireflyIII\Models\Budget;@@ -41,7 +42,6 @@ use FireflyIII\Repositories\Journal\JournalRepositoryInterface;use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;use FireflyIII\Repositories\Tag\TagRepositoryInterface;use Illuminate\Contracts\Validation\ValidationRule;-use Closure;/*** Class IsValidAttachmentModeldiff --git a/app/Rules/IsValidBulkClause.php b/app/Rules/IsValidBulkClause.phpindex 7d5ed57290..f3c74630b1 100644--- a/app/Rules/IsValidBulkClause.php+++ b/app/Rules/IsValidBulkClause.php@@ -24,11 +24,10 @@ declare(strict_types=1);namespace FireflyIII\Rules;+use Closure;use Illuminate\Contracts\Validation\ValidationRule;use Illuminate\Support\Facades\Validator;-use Closure;use JsonException;-use function Safe\json_decode;/**diff --git a/app/Rules/IsValidDateRange.php b/app/Rules/IsValidDateRange.phpindex faf4b4343e..75a6846fab 100644--- a/app/Rules/IsValidDateRange.php+++ b/app/Rules/IsValidDateRange.php@@ -27,8 +27,8 @@ namespace FireflyIII\Rules;use Carbon\Carbon;use Carbon\Exceptions\InvalidDateException;use Carbon\Exceptions\InvalidFormatException;-use Illuminate\Contracts\Validation\ValidationRule;use Closure;+use Illuminate\Contracts\Validation\ValidationRule;class IsValidDateRange implements ValidationRule{diff --git a/app/Rules/IsValidPositiveAmount.php b/app/Rules/IsValidPositiveAmount.phpindex 2c6eeb63cd..f637cdbc6d 100644--- a/app/Rules/IsValidPositiveAmount.php+++ b/app/Rules/IsValidPositiveAmount.php@@ -25,11 +25,10 @@ declare(strict_types=1);namespace FireflyIII\Rules;+use Closure;use FireflyIII\Support\Validation\ValidatesAmountsTrait;use Illuminate\Contracts\Validation\ValidationRule;use Illuminate\Support\Facades\Log;-use Closure;-use function Safe\json_encode;class IsValidPositiveAmount implements ValidationRulediff --git a/app/Rules/IsValidZeroOrMoreAmount.php b/app/Rules/IsValidZeroOrMoreAmount.phpindex 3c93762333..f5880fa78a 100644--- a/app/Rules/IsValidZeroOrMoreAmount.php+++ b/app/Rules/IsValidZeroOrMoreAmount.php@@ -25,10 +25,10 @@ declare(strict_types=1);namespace FireflyIII\Rules;+use Closure;use FireflyIII\Support\Validation\ValidatesAmountsTrait;use Illuminate\Contracts\Validation\ValidationRule;use Illuminate\Support\Facades\Log;-use Closure;class IsValidZeroOrMoreAmount implements ValidationRule{diff --git a/app/Rules/LessThanPiggyTarget.php b/app/Rules/LessThanPiggyTarget.phpindex 78df186875..3f34ab068a 100644--- a/app/Rules/LessThanPiggyTarget.php+++ b/app/Rules/LessThanPiggyTarget.php@@ -24,8 +24,8 @@ declare(strict_types=1);namespace FireflyIII\Rules;-use Illuminate\Contracts\Validation\ValidationRule;use Closure;+use Illuminate\Contracts\Validation\ValidationRule;/*** Class LessThanPiggyTargetdiff --git a/app/Rules/UniqueAccountNumber.php b/app/Rules/UniqueAccountNumber.phpindex 9cfae9d359..d605010d9d 100644--- a/app/Rules/UniqueAccountNumber.php+++ b/app/Rules/UniqueAccountNumber.php@@ -24,12 +24,11 @@ declare(strict_types=1);namespace FireflyIII\Rules;+use Closure;use FireflyIII\Enums\AccountTypeEnum;use FireflyIII\Models\Account;use FireflyIII\Models\AccountMeta;use Illuminate\Contracts\Validation\ValidationRule;-use Closure;-use function Safe\json_encode;/**diff --git a/app/Rules/UniqueIban.php b/app/Rules/UniqueIban.phpindex 9246326c15..3f83ab76bf 100644--- a/app/Rules/UniqueIban.php+++ b/app/Rules/UniqueIban.php@@ -24,11 +24,11 @@ declare(strict_types=1);namespace FireflyIII\Rules;+use Closure;use FireflyIII\Enums\AccountTypeEnum;use FireflyIII\Models\Account;use FireflyIII\Support\Facades\Steam;use Illuminate\Contracts\Validation\ValidationRule;-use Closure;/*** Class UniqueIbandiff --git a/app/Rules/ValidJournals.php b/app/Rules/ValidJournals.phpindex 2e2b6c6230..221bef831d 100644--- a/app/Rules/ValidJournals.php+++ b/app/Rules/ValidJournals.php@@ -24,9 +24,9 @@ declare(strict_types=1);namespace FireflyIII\Rules;+use Closure;use FireflyIII\Models\TransactionJournal;use Illuminate\Contracts\Validation\ValidationRule;-use Closure;/*** Class ValidJournalsdiff --git a/app/Rules/ValidRecurrenceRepetitionType.php b/app/Rules/ValidRecurrenceRepetitionType.phpindex f8e0fe3606..a9a923c892 100644--- a/app/Rules/ValidRecurrenceRepetitionType.php+++ b/app/Rules/ValidRecurrenceRepetitionType.php@@ -24,8 +24,8 @@ declare(strict_types=1);namespace FireflyIII\Rules;-use Illuminate\Contracts\Validation\ValidationRule;use Closure;+use Illuminate\Contracts\Validation\ValidationRule;/*** Class ValidRecurrenceRepetitionTypediff --git a/app/Rules/ValidRecurrenceRepetitionValue.php b/app/Rules/ValidRecurrenceRepetitionValue.phpindex 5a1a4b9031..9cd29b261b 100644--- a/app/Rules/ValidRecurrenceRepetitionValue.php+++ b/app/Rules/ValidRecurrenceRepetitionValue.php@@ -25,8 +25,8 @@ declare(strict_types=1);namespace FireflyIII\Rules;use Carbon\Carbon;-use Illuminate\Contracts\Validation\ValidationRule;use Closure;+use Illuminate\Contracts\Validation\ValidationRule;use InvalidArgumentException;/**diff --git a/app/Services/FireflyIIIOrg/Update/UpdateRequest.php b/app/Services/FireflyIIIOrg/Update/UpdateRequest.phpindex ad55aee903..99ead72517 100644--- a/app/Services/FireflyIIIOrg/Update/UpdateRequest.php+++ b/app/Services/FireflyIIIOrg/Update/UpdateRequest.php@@ -31,7 +31,6 @@ use GuzzleHttp\Client;use GuzzleHttp\Exception\GuzzleException;use Illuminate\Support\Facades\Log;use JsonException;-use function Safe\json_decode;/**diff --git a/app/Services/Internal/Support/AccountServiceTrait.php b/app/Services/Internal/Support/AccountServiceTrait.phpindex 5525181b97..cf2f0e4dc6 100644--- a/app/Services/Internal/Support/AccountServiceTrait.php+++ b/app/Services/Internal/Support/AccountServiceTrait.php@@ -24,8 +24,8 @@ declare(strict_types=1);namespace FireflyIII\Services\Internal\Support;-use Deprecated;use Carbon\Carbon;+use Deprecated;use FireflyIII\Enums\AccountTypeEnum;use FireflyIII\Exceptions\DuplicateTransactionException;use FireflyIII\Exceptions\FireflyException;diff --git a/app/Services/Internal/Support/JournalServiceTrait.php b/app/Services/Internal/Support/JournalServiceTrait.phpindex abe783365f..757ce01c0d 100644--- a/app/Services/Internal/Support/JournalServiceTrait.php+++ b/app/Services/Internal/Support/JournalServiceTrait.php@@ -38,7 +38,6 @@ use FireflyIII\Repositories\Category\CategoryRepositoryInterface;use FireflyIII\Rules\UniqueIban;use FireflyIII\Support\NullArrayObject;use Illuminate\Support\Facades\Log;-use Safe\Exceptions\JsonException;use function Safe\json_encode;diff --git a/app/Services/Internal/Support/RecurringTransactionTrait.php b/app/Services/Internal/Support/RecurringTransactionTrait.phpindex ebb7aad99f..b6f5955cb2 100644--- a/app/Services/Internal/Support/RecurringTransactionTrait.php+++ b/app/Services/Internal/Support/RecurringTransactionTrait.php@@ -42,7 +42,6 @@ use FireflyIII\Models\RecurrenceTransactionMeta;use FireflyIII\Repositories\Account\AccountRepositoryInterface;use FireflyIII\Validation\AccountValidator;use Illuminate\Support\Facades\Log;-use function Safe\json_encode;/**diff --git a/app/Services/Internal/Update/BillUpdateService.php b/app/Services/Internal/Update/BillUpdateService.phpindex d71d82a524..4fdd94aae0 100644--- a/app/Services/Internal/Update/BillUpdateService.php+++ b/app/Services/Internal/Update/BillUpdateService.php@@ -24,10 +24,9 @@ declare(strict_types=1);namespace FireflyIII\Services\Internal\Update;-use FireflyIII\Models\ObjectGroup;-use FireflyIII\Exceptions\FireflyException;use FireflyIII\Factory\TransactionCurrencyFactory;use FireflyIII\Models\Bill;+use FireflyIII\Models\ObjectGroup;use FireflyIII\Models\Rule;use FireflyIII\Models\RuleTrigger;use FireflyIII\Repositories\Bill\BillRepositoryInterface;diff --git a/app/Services/Internal/Update/CategoryUpdateService.php b/app/Services/Internal/Update/CategoryUpdateService.phpindex 193a5957b2..b04c06686e 100644--- a/app/Services/Internal/Update/CategoryUpdateService.php+++ b/app/Services/Internal/Update/CategoryUpdateService.php@@ -24,13 +24,13 @@ declare(strict_types=1);namespace FireflyIII\Services\Internal\Update;+use Exception;use FireflyIII\Models\Category;use FireflyIII\Models\Note;use FireflyIII\Models\RecurrenceTransactionMeta;use FireflyIII\Models\RuleAction;use FireflyIII\Models\RuleTrigger;use FireflyIII\User;-use Exception;/*** Class CategoryUpdateServicediff --git a/app/Services/Webhook/StandardWebhookSender.php b/app/Services/Webhook/StandardWebhookSender.phpindex ab9a82108a..e0f6cd5dfb 100644--- a/app/Services/Webhook/StandardWebhookSender.php+++ b/app/Services/Webhook/StandardWebhookSender.php@@ -34,7 +34,6 @@ use GuzzleHttp\Exception\GuzzleException;use GuzzleHttp\Exception\RequestException;use Illuminate\Support\Facades\Log;use JsonException;-use function Safe\json_encode;/**diff --git a/app/Support/Binder/CLIToken.php b/app/Support/Binder/CLIToken.phpindex b57ae19261..6dc825c585 100644--- a/app/Support/Binder/CLIToken.php+++ b/app/Support/Binder/CLIToken.php@@ -24,7 +24,6 @@ declare(strict_types=1);namespace FireflyIII\Support\Binder;-use FireflyIII\Exceptions\FireflyException;use FireflyIII\Repositories\User\UserRepositoryInterface;use Illuminate\Routing\Route;use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;diff --git a/app/Support/CacheProperties.php b/app/Support/CacheProperties.phpindex e22808ea06..258bea8495 100644--- a/app/Support/CacheProperties.php+++ b/app/Support/CacheProperties.php@@ -27,7 +27,6 @@ use Carbon\Carbon;use Illuminate\Support\Collection;use Illuminate\Support\Facades\Cache;use JsonException;-use function Safe\json_encode;/**diff --git a/app/Support/Http/Controllers/CreateStuff.php b/app/Support/Http/Controllers/CreateStuff.phpindex a69c44ac54..32e0c2c1a4 100644--- a/app/Support/Http/Controllers/CreateStuff.php+++ b/app/Support/Http/Controllers/CreateStuff.php@@ -32,7 +32,6 @@ use FireflyIII\User;use Illuminate\Support\Facades\Log;use Laravel\Passport\Passport;use phpseclib3\Crypt\RSA;-use function Safe\file_put_contents;/**diff --git a/app/Support/Http/Controllers/RequestInformation.php b/app/Support/Http/Controllers/RequestInformation.phpindex 39a6df3aff..4f9702bb29 100644--- a/app/Support/Http/Controllers/RequestInformation.php+++ b/app/Support/Http/Controllers/RequestInformation.php@@ -35,7 +35,6 @@ use Illuminate\Routing\Route;use Illuminate\Support\Facades\Hash;use Illuminate\Support\Facades\Route as RouteFacade;use Illuminate\Support\Facades\Validator;-use function Safe\parse_url;/**diff --git a/app/Support/JsonApi/Enrichments/RecurringEnrichment.php b/app/Support/JsonApi/Enrichments/RecurringEnrichment.phpindex 1ea71f1dc4..25bb788c73 100644--- a/app/Support/JsonApi/Enrichments/RecurringEnrichment.php+++ b/app/Support/JsonApi/Enrichments/RecurringEnrichment.php@@ -51,7 +51,6 @@ use Illuminate\Database\Eloquent\Model;use Illuminate\Support\Arr;use Illuminate\Support\Collection;use Illuminate\Support\Facades\Log;-use function Safe\json_decode;class RecurringEnrichment implements EnrichmentInterfacediff --git a/app/Support/ParseDateString.php b/app/Support/ParseDateString.phpindex 45404e1952..883e76be41 100644--- a/app/Support/ParseDateString.php+++ b/app/Support/ParseDateString.php@@ -29,7 +29,6 @@ use Carbon\CarbonInterface;use Carbon\Exceptions\InvalidFormatException;use FireflyIII\Exceptions\FireflyException;use Illuminate\Support\Facades\Log;-use Safe\Exceptions\PcreException;use function Safe\preg_match;diff --git a/app/Support/Report/Budget/BudgetReportGenerator.php b/app/Support/Report/Budget/BudgetReportGenerator.phpindex 1bf9c81b3e..ecdc897160 100644--- a/app/Support/Report/Budget/BudgetReportGenerator.php+++ b/app/Support/Report/Budget/BudgetReportGenerator.php@@ -24,7 +24,6 @@ declare(strict_types=1);namespace FireflyIII\Support\Report\Budget;use Carbon\Carbon;-use FireflyIII\Exceptions\FireflyException;use FireflyIII\Models\Account;use FireflyIII\Models\Budget;use FireflyIII\Models\BudgetLimit;diff --git a/app/Support/Request/ConvertsDataTypes.php b/app/Support/Request/ConvertsDataTypes.phpindex 5293a6f804..c978f2785c 100644--- a/app/Support/Request/ConvertsDataTypes.php+++ b/app/Support/Request/ConvertsDataTypes.php@@ -31,7 +31,6 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface;use FireflyIII\Support\Facades\Steam;use Illuminate\Support\Collection;use Illuminate\Support\Facades\Log;-use function Safe\preg_replace;/**diff --git a/app/Support/Search/AccountSearch.php b/app/Support/Search/AccountSearch.phpindex 44bb34e893..9e54a772d4 100644--- a/app/Support/Search/AccountSearch.php+++ b/app/Support/Search/AccountSearch.php@@ -28,7 +28,6 @@ use FireflyIII\User;use Illuminate\Contracts\Auth\Authenticatable;use Illuminate\Database\Eloquent\Builder;use Illuminate\Support\Collection;-use function Safe\json_encode;/**diff --git a/app/Support/Search/QueryParser/GdbotsQueryParser.php b/app/Support/Search/QueryParser/GdbotsQueryParser.phpindex 127dc475b5..cc51218eaa 100644--- a/app/Support/Search/QueryParser/GdbotsQueryParser.php+++ b/app/Support/Search/QueryParser/GdbotsQueryParser.php@@ -33,7 +33,6 @@ use Illuminate\Support\Facades\Log;use LogicException;use Safe\Exceptions\FilesystemException;use TypeError;-use function Safe\fwrite;class GdbotsQueryParser implements QueryParserInterfacediff --git a/app/Support/Steam.php b/app/Support/Steam.phpindex 9488fe36fb..f88839823d 100644--- a/app/Support/Steam.php+++ b/app/Support/Steam.php@@ -40,7 +40,6 @@ use Illuminate\Support\Str;use Psr\Container\ContainerExceptionInterface;use Psr\Container\NotFoundExceptionInterface;use ValueError;-use function Safe\parse_url;use function Safe\preg_replace;diff --git a/app/Support/System/OAuthKeys.php b/app/Support/System/OAuthKeys.phpindex e4878d01cf..e39ed5c5de 100644--- a/app/Support/System/OAuthKeys.php+++ b/app/Support/System/OAuthKeys.php@@ -31,7 +31,6 @@ use Illuminate\Support\Facades\Crypt;use Laravel\Passport\Console\KeysCommand;use Psr\Container\ContainerExceptionInterface;use Psr\Container\NotFoundExceptionInterface;-use Safe\Exceptions\FilesystemException;use function Safe\file_get_contents;use function Safe\file_put_contents;diff --git a/app/Support/Twig/General.php b/app/Support/Twig/General.phpindex 485dfe1bd9..a3b0a3e128 100644--- a/app/Support/Twig/General.php+++ b/app/Support/Twig/General.php@@ -37,7 +37,6 @@ use Override;use Twig\Extension\AbstractExtension;use Twig\TwigFilter;use Twig\TwigFunction;-use function Safe\parse_url;/**diff --git a/app/Support/Twig/TransactionGroupTwig.php b/app/Support/Twig/TransactionGroupTwig.phpindex 3033a84872..30b539f08a 100644--- a/app/Support/Twig/TransactionGroupTwig.php+++ b/app/Support/Twig/TransactionGroupTwig.php@@ -34,7 +34,6 @@ use Illuminate\Support\Facades\DB;use Override;use Twig\Extension\AbstractExtension;use Twig\TwigFunction;-use function Safe\json_decode;/**diff --git a/app/Transformers/PiggyBankTransformer.php b/app/Transformers/PiggyBankTransformer.phpindex ccc7e70b00..a418b93d37 100644--- a/app/Transformers/PiggyBankTransformer.php+++ b/app/Transformers/PiggyBankTransformer.php@@ -24,7 +24,6 @@ declare(strict_types=1);namespace FireflyIII\Transformers;-use FireflyIII\Exceptions\FireflyException;use FireflyIII\Models\PiggyBank;use FireflyIII\Models\TransactionCurrency;use FireflyIII\Support\Facades\Amount;diff --git a/app/Transformers/RecurrenceTransformer.php b/app/Transformers/RecurrenceTransformer.phpindex 00c388fdcb..823c4cecda 100644--- a/app/Transformers/RecurrenceTransformer.php+++ b/app/Transformers/RecurrenceTransformer.php@@ -24,7 +24,6 @@ declare(strict_types=1);namespace FireflyIII\Transformers;-use FireflyIII\Exceptions\FireflyException;use FireflyIII\Models\Recurrence;use Illuminate\Support\Facades\Log;diff --git a/app/Transformers/UserTransformer.php b/app/Transformers/UserTransformer.phpindex cff73173c2..0dff6bd273 100644--- a/app/Transformers/UserTransformer.php+++ b/app/Transformers/UserTransformer.php@@ -24,7 +24,6 @@ declare(strict_types=1);namespace FireflyIII\Transformers;-use FireflyIII\Exceptions\FireflyException;use FireflyIII\Repositories\User\UserRepositoryInterface;use FireflyIII\User;diff --git a/app/Transformers/WebhookMessageTransformer.php b/app/Transformers/WebhookMessageTransformer.phpindex 24bc25d4c2..8057d53a54 100644--- a/app/Transformers/WebhookMessageTransformer.php+++ b/app/Transformers/WebhookMessageTransformer.php@@ -27,7 +27,6 @@ namespace FireflyIII\Transformers;use FireflyIII\Models\WebhookMessage;use Illuminate\Support\Facades\Log;use JsonException;-use function Safe\json_encode;/**diff --git a/app/User.php b/app/User.phpindex cc9e4b7d07..445ef22f77 100644--- a/app/User.php+++ b/app/User.php@@ -25,6 +25,7 @@ declare(strict_types=1);namespace FireflyIII;use Deprecated;+use Exception;use FireflyIII\Enums\UserRoleEnum;use FireflyIII\Events\RequestedNewPassword;use FireflyIII\Exceptions\FireflyException;@@ -67,7 +68,6 @@ use Illuminate\Support\Str;use Laravel\Passport\HasApiTokens;use NotificationChannels\Pushover\PushoverReceiver;use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;-use Exception;class User extends Authenticatable{diff --git a/app/Validation/Api/Data/Bulk/ValidatesBulkTransactionQuery.php b/app/Validation/Api/Data/Bulk/ValidatesBulkTransactionQuery.phpindex a218f323ee..2ec2ee2fc9 100644--- a/app/Validation/Api/Data/Bulk/ValidatesBulkTransactionQuery.php+++ b/app/Validation/Api/Data/Bulk/ValidatesBulkTransactionQuery.php@@ -24,9 +24,8 @@ declare(strict_types=1);namespace FireflyIII\Validation\Api\Data\Bulk;-use Illuminate\Validation\Validator;use FireflyIII\Repositories\Account\AccountRepositoryInterface;-+use Illuminate\Validation\Validator;use function Safe\json_decode;trait ValidatesBulkTransactionQuerydiff --git a/app/Validation/CurrencyValidation.php b/app/Validation/CurrencyValidation.phpindex 2bdc1357d1..52bad8ff61 100644--- a/app/Validation/CurrencyValidation.php+++ b/app/Validation/CurrencyValidation.php@@ -24,8 +24,8 @@ declare(strict_types=1);namespace FireflyIII\Validation;-use Illuminate\Validation\Validator;use Illuminate\Support\Facades\Log;+use Illuminate\Validation\Validator;/*** Trait CurrencyValidationdiff --git a/app/Validation/FireflyValidator.php b/app/Validation/FireflyValidator.phpindex e3d25b33f8..e13c866efc 100644--- a/app/Validation/FireflyValidator.php+++ b/app/Validation/FireflyValidator.php@@ -23,6 +23,7 @@ declare(strict_types=1);namespace FireflyIII\Validation;+use Config;use FireflyIII\Enums\AccountTypeEnum;use FireflyIII\Exceptions\FireflyException;use FireflyIII\Models\Account;@@ -45,15 +46,13 @@ use PragmaRX\Google2FA\Exceptions\IncompatibleWithGoogleAuthenticatorException;use PragmaRX\Google2FA\Exceptions\InvalidCharactersException;use PragmaRX\Google2FA\Exceptions\SecretKeyTooShortException;use PragmaRX\Google2FALaravel\Facade;-use Config;use Psr\Container\ContainerExceptionInterface;use Psr\Container\NotFoundExceptionInterface;use Safe\Exceptions\JsonException;use ValueError;--use function Safe\preg_match;use function Safe\iconv;use function Safe\json_encode;+use function Safe\preg_match;/*** Class FireflyValidator.diff --git a/app/Validation/GroupValidation.php b/app/Validation/GroupValidation.phpindex bf4801856f..84c32cfc90 100644--- a/app/Validation/GroupValidation.php+++ b/app/Validation/GroupValidation.php@@ -24,10 +24,10 @@ declare(strict_types=1);namespace FireflyIII\Validation;-use Illuminate\Validation\Validator;use FireflyIII\Exceptions\FireflyException;use FireflyIII\Models\Transaction;use FireflyIII\Models\TransactionGroup;+use Illuminate\Validation\Validator;/*** Trait GroupValidation.diff --git a/app/Validation/RecurrenceValidation.php b/app/Validation/RecurrenceValidation.phpindex 2ba6e58a95..52b829203e 100644--- a/app/Validation/RecurrenceValidation.php+++ b/app/Validation/RecurrenceValidation.php@@ -24,10 +24,10 @@ declare(strict_types=1);namespace FireflyIII\Validation;-use Illuminate\Validation\Validator;use Carbon\Carbon;use FireflyIII\Models\Recurrence;use FireflyIII\Models\RecurrenceTransaction;+use Illuminate\Validation\Validator;use InvalidArgumentException;/**diff --git a/app/Validation/TransactionValidation.php b/app/Validation/TransactionValidation.phpindex 944b9372d2..b44333bd90 100644--- a/app/Validation/TransactionValidation.php+++ b/app/Validation/TransactionValidation.php@@ -24,7 +24,6 @@ declare(strict_types=1);namespace FireflyIII\Validation;-use Illuminate\Validation\Validator;use FireflyIII\Enums\AccountTypeEnum;use FireflyIII\Enums\TransactionTypeEnum;use FireflyIII\Exceptions\FireflyException;@@ -37,6 +36,7 @@ use FireflyIII\Repositories\Account\AccountRepository;use FireflyIII\Repositories\Account\AccountRepositoryInterface;use FireflyIII\User;use Illuminate\Support\Facades\Log;+use Illuminate\Validation\Validator;/*** Trait TransactionValidation