Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
Code clean up and restoration using Mago.
James Cole23d49a419471
diff --git a/.ci/php-cs-fixer/.php-cs-fixer.php b/.ci/php-cs-fixer/.php-cs-fixer.phpindex eb14b845a9..c083bf0f9d 100644--- a/.ci/php-cs-fixer/.php-cs-fixer.php+++ b/.ci/php-cs-fixer/.php-cs-fixer.php@@ -40,7 +40,8 @@ return $config->setRules([// rule sets- '@PHP83Migration' => true,+ '@PHP8x3Migration' => true,+ '@PHP8x4Migration' => true,'@PhpCsFixer' => true,'@PhpCsFixer:risky' => true,'@PSR12' => true,diff --git a/app/Api/V1/Controllers/Autocomplete/BillController.php b/app/Api/V1/Controllers/Autocomplete/BillController.phpindex edc428d319..b43e56e1f2 100644--- a/app/Api/V1/Controllers/Autocomplete/BillController.php+++ b/app/Api/V1/Controllers/Autocomplete/BillController.php@@ -24,13 +24,13 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Controllers\Autocomplete;-use Illuminate\Http\Request;use FireflyIII\Api\V1\Controllers\Controller;use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteApiRequest;use FireflyIII\Enums\UserRoleEnum;use FireflyIII\Models\Bill;use FireflyIII\Repositories\Bill\BillRepositoryInterface;use Illuminate\Http\JsonResponse;+use Illuminate\Http\Request;/*** Class BillController@@ -46,16 +46,14 @@ class BillController extends Controllerpublic function __construct(){parent::__construct();- $this->middleware(- function (Request $request, $next) {- $this->validateUserGroup($request);- $this->repository = app(BillRepositoryInterface::class);- $this->repository->setUser($this->user);- $this->repository->setUserGroup($this->userGroup);+ $this->middleware(function (Request $request, $next) {+ $this->validateUserGroup($request);+ $this->repository = app(BillRepositoryInterface::class);+ $this->repository->setUser($this->user);+ $this->repository->setUserGroup($this->userGroup);- return $next($request);- }- );+ return $next($request);+ });}/**@@ -65,13 +63,7 @@ class BillController extends Controllerpublic function bills(AutocompleteApiRequest $request): JsonResponse{$result = $this->repository->searchBill($request->attributes->get('query'), $request->attributes->get('limit'));- $filtered = $result->map(- static fn (Bill $item): array => [- 'id' => (string) $item->id,- 'name' => $item->name,- 'active' => $item->active,- ]- );+ $filtered = $result->map(static fn (Bill $item): array => ['id' => (string) $item->id, 'name' => $item->name, 'active' => $item->active]);return response()->api($filtered->toArray());}diff --git a/app/Api/V1/Controllers/Autocomplete/BudgetController.php b/app/Api/V1/Controllers/Autocomplete/BudgetController.phpindex c38b268494..40d42d5c18 100644--- a/app/Api/V1/Controllers/Autocomplete/BudgetController.php+++ b/app/Api/V1/Controllers/Autocomplete/BudgetController.php@@ -24,13 +24,13 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Controllers\Autocomplete;-use Illuminate\Http\Request;use FireflyIII\Api\V1\Controllers\Controller;use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteApiRequest;use FireflyIII\Enums\UserRoleEnum;use FireflyIII\Models\Budget;use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;use Illuminate\Http\JsonResponse;+use Illuminate\Http\Request;/*** Class BudgetController@@ -46,16 +46,14 @@ class BudgetController extends Controllerpublic function __construct(){parent::__construct();- $this->middleware(- function (Request $request, $next) {- $this->validateUserGroup($request);- $this->repository = app(BudgetRepositoryInterface::class);- $this->repository->setUser($this->user);- $this->repository->setUserGroup($this->userGroup);+ $this->middleware(function (Request $request, $next) {+ $this->validateUserGroup($request);+ $this->repository = app(BudgetRepositoryInterface::class);+ $this->repository->setUser($this->user);+ $this->repository->setUserGroup($this->userGroup);- return $next($request);- }- );+ return $next($request);+ });}/**@@ -65,13 +63,7 @@ class BudgetController extends Controllerpublic function budgets(AutocompleteApiRequest $request): JsonResponse{$result = $this->repository->searchBudget($request->attributes->get('query'), $request->attributes->get('limit'));- $filtered = $result->map(- static fn (Budget $item): array => [- 'id' => (string) $item->id,- 'name' => $item->name,- 'active' => $item->active,- ]- );+ $filtered = $result->map(static fn (Budget $item): array => ['id' => (string) $item->id, 'name' => $item->name, 'active' => $item->active]);return response()->api($filtered->toArray());}diff --git a/app/Api/V1/Controllers/Autocomplete/CategoryController.php b/app/Api/V1/Controllers/Autocomplete/CategoryController.phpindex 09ef038b21..27fa145d52 100644--- a/app/Api/V1/Controllers/Autocomplete/CategoryController.php+++ b/app/Api/V1/Controllers/Autocomplete/CategoryController.php@@ -24,13 +24,13 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Controllers\Autocomplete;-use Illuminate\Http\Request;use FireflyIII\Api\V1\Controllers\Controller;use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteApiRequest;use FireflyIII\Enums\UserRoleEnum;use FireflyIII\Models\Category;use FireflyIII\Repositories\Category\CategoryRepositoryInterface;use Illuminate\Http\JsonResponse;+use Illuminate\Http\Request;/*** Class CategoryController@@ -46,16 +46,14 @@ class CategoryController extends Controllerpublic function __construct(){parent::__construct();- $this->middleware(- function (Request $request, $next) {- $this->validateUserGroup($request);- $this->repository = app(CategoryRepositoryInterface::class);- $this->repository->setUser($this->user);- $this->repository->setUserGroup($this->userGroup);+ $this->middleware(function (Request $request, $next) {+ $this->validateUserGroup($request);+ $this->repository = app(CategoryRepositoryInterface::class);+ $this->repository->setUser($this->user);+ $this->repository->setUserGroup($this->userGroup);- return $next($request);- }- );+ return $next($request);+ });}/**@@ -65,12 +63,7 @@ class CategoryController extends Controllerpublic function categories(AutocompleteApiRequest $request): JsonResponse{$result = $this->repository->searchCategory($request->attributes->get('query'), $request->attributes->get('limit'));- $filtered = $result->map(- static fn (Category $item): array => [- 'id' => (string) $item->id,- 'name' => $item->name,- ]- );+ $filtered = $result->map(static fn (Category $item): array => ['id' => (string) $item->id, 'name' => $item->name]);return response()->api($filtered->toArray());}diff --git a/app/Api/V1/Controllers/Autocomplete/CurrencyController.php b/app/Api/V1/Controllers/Autocomplete/CurrencyController.phpindex 3259306e79..656c96b493 100644--- a/app/Api/V1/Controllers/Autocomplete/CurrencyController.php+++ b/app/Api/V1/Controllers/Autocomplete/CurrencyController.php@@ -24,7 +24,6 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Controllers\Autocomplete;-use Illuminate\Http\Request;use Deprecated;use FireflyIII\Api\V1\Controllers\Controller;use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteApiRequest;@@ -33,6 +32,7 @@ use FireflyIII\Enums\UserRoleEnum;use FireflyIII\Models\TransactionCurrency;use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;use Illuminate\Http\JsonResponse;+use Illuminate\Http\Request;/*** Class CurrencyController@@ -48,16 +48,14 @@ class CurrencyController extends Controllerpublic function __construct(){parent::__construct();- $this->middleware(- function (Request $request, $next) {- $this->validateUserGroup($request);- $this->repository = app(CurrencyRepositoryInterface::class);- $this->repository->setUser($this->user);- $this->repository->setUserGroup($this->userGroup);+ $this->middleware(function (Request $request, $next) {+ $this->validateUserGroup($request);+ $this->repository = app(CurrencyRepositoryInterface::class);+ $this->repository->setUser($this->user);+ $this->repository->setUserGroup($this->userGroup);- return $next($request);- }- );+ return $next($request);+ });}/**diff --git a/app/Api/V1/Controllers/Autocomplete/ObjectGroupController.php b/app/Api/V1/Controllers/Autocomplete/ObjectGroupController.phpindex c9de397ed8..38b931377c 100644--- a/app/Api/V1/Controllers/Autocomplete/ObjectGroupController.php+++ b/app/Api/V1/Controllers/Autocomplete/ObjectGroupController.php@@ -24,13 +24,13 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Controllers\Autocomplete;-use Illuminate\Http\Request;use FireflyIII\Api\V1\Controllers\Controller;use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteApiRequest;use FireflyIII\Enums\UserRoleEnum;use FireflyIII\Models\ObjectGroup;use FireflyIII\Repositories\ObjectGroup\ObjectGroupRepositoryInterface;use Illuminate\Http\JsonResponse;+use Illuminate\Http\Request;/*** Class ObjectGroupController@@ -46,16 +46,14 @@ class ObjectGroupController extends Controllerpublic function __construct(){parent::__construct();- $this->middleware(- function (Request $request, $next) {- $this->validateUserGroup($request);- $this->repository = app(ObjectGroupRepositoryInterface::class);- $this->repository->setUser($this->user);- $this->repository->setUserGroup($this->userGroup);+ $this->middleware(function (Request $request, $next) {+ $this->validateUserGroup($request);+ $this->repository = app(ObjectGroupRepositoryInterface::class);+ $this->repository->setUser($this->user);+ $this->repository->setUserGroup($this->userGroup);- return $next($request);- }- );+ return $next($request);+ });}/**@@ -69,11 +67,7 @@ class ObjectGroupController extends Controller/** @var ObjectGroup $objectGroup */foreach ($result as $objectGroup) {- $return[] = [- 'id' => (string) $objectGroup->id,- 'name' => $objectGroup->title,- 'title' => $objectGroup->title,- ];+ $return[] = ['id' => (string) $objectGroup->id, 'name' => $objectGroup->title, 'title' => $objectGroup->title];}return response()->api($return);diff --git a/app/Api/V1/Controllers/Autocomplete/PiggyBankController.php b/app/Api/V1/Controllers/Autocomplete/PiggyBankController.phpindex 327c92c8ae..89f5333b1e 100644--- a/app/Api/V1/Controllers/Autocomplete/PiggyBankController.php+++ b/app/Api/V1/Controllers/Autocomplete/PiggyBankController.php@@ -24,7 +24,6 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Controllers\Autocomplete;-use Illuminate\Http\Request;use FireflyIII\Api\V1\Controllers\Controller;use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteApiRequest;use FireflyIII\Enums\UserRoleEnum;@@ -34,13 +33,14 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface;use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;use FireflyIII\Support\Facades\Amount;use Illuminate\Http\JsonResponse;+use Illuminate\Http\Request;/*** Class PiggyBankController*/class PiggyBankController extends Controller{- private AccountRepositoryInterface $accountRepository;+ private AccountRepositoryInterface $accountRepository;private PiggyBankRepositoryInterface $piggyRepository;protected array $acceptedRoles = [UserRoleEnum::READ_PIGGY_BANKS];@@ -50,19 +50,17 @@ class PiggyBankController extends Controllerpublic function __construct(){parent::__construct();- $this->middleware(- function (Request $request, $next) {- $this->validateUserGroup($request);- $this->piggyRepository = app(PiggyBankRepositoryInterface::class);- $this->accountRepository = app(AccountRepositoryInterface::class);- $this->piggyRepository->setUser($this->user);- $this->piggyRepository->setUserGroup($this->userGroup);- $this->accountRepository->setUser($this->user);- $this->accountRepository->setUserGroup($this->userGroup);+ $this->middleware(function (Request $request, $next) {+ $this->validateUserGroup($request);+ $this->piggyRepository = app(PiggyBankRepositoryInterface::class);+ $this->accountRepository = app(AccountRepositoryInterface::class);+ $this->piggyRepository->setUser($this->user);+ $this->piggyRepository->setUserGroup($this->userGroup);+ $this->accountRepository->setUser($this->user);+ $this->accountRepository->setUserGroup($this->userGroup);- return $next($request);- }- );+ return $next($request);+ });}public function piggyBanks(AutocompleteApiRequest $request): JsonResponse@@ -108,7 +106,7 @@ class PiggyBankController extends Controller'%s (%s / %s)',$piggy->name,Amount::formatAnything($currency, $currentAmount, false),- Amount::formatAnything($currency, $piggy->target_amount, false),+ Amount::formatAnything($currency, $piggy->target_amount, false)),'currency_id' => (string) $currency->id,'currency_name' => $currency->name,diff --git a/app/Api/V1/Controllers/Autocomplete/RecurrenceController.php b/app/Api/V1/Controllers/Autocomplete/RecurrenceController.phpindex 2882b51a1f..2d243b4d2b 100644--- a/app/Api/V1/Controllers/Autocomplete/RecurrenceController.php+++ b/app/Api/V1/Controllers/Autocomplete/RecurrenceController.php@@ -24,13 +24,13 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Controllers\Autocomplete;-use Illuminate\Http\Request;use FireflyIII\Api\V1\Controllers\Controller;use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteApiRequest;use FireflyIII\Enums\UserRoleEnum;use FireflyIII\Models\Recurrence;use FireflyIII\Repositories\Recurring\RecurringRepositoryInterface;use Illuminate\Http\JsonResponse;+use Illuminate\Http\Request;/*** Class RecurrenceController@@ -46,16 +46,14 @@ class RecurrenceController extends Controllerpublic function __construct(){parent::__construct();- $this->middleware(- function (Request $request, $next) {- $this->validateUserGroup($request);- $this->repository = app(RecurringRepositoryInterface::class);- $this->repository->setUser($this->user);- $this->repository->setUserGroup($this->userGroup);+ $this->middleware(function (Request $request, $next) {+ $this->validateUserGroup($request);+ $this->repository = app(RecurringRepositoryInterface::class);+ $this->repository->setUser($this->user);+ $this->repository->setUserGroup($this->userGroup);- return $next($request);- }- );+ return $next($request);+ });}public function recurring(AutocompleteApiRequest $request): JsonResponsediff --git a/app/Api/V1/Controllers/Autocomplete/RuleController.php b/app/Api/V1/Controllers/Autocomplete/RuleController.phpindex 79514e9a80..d0a509156a 100644--- a/app/Api/V1/Controllers/Autocomplete/RuleController.php+++ b/app/Api/V1/Controllers/Autocomplete/RuleController.php@@ -24,13 +24,13 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Controllers\Autocomplete;-use Illuminate\Http\Request;use FireflyIII\Api\V1\Controllers\Controller;use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteApiRequest;use FireflyIII\Enums\UserRoleEnum;use FireflyIII\Models\Rule;use FireflyIII\Repositories\Rule\RuleRepositoryInterface;use Illuminate\Http\JsonResponse;+use Illuminate\Http\Request;/*** Class RuleController@@ -38,7 +38,7 @@ use Illuminate\Http\JsonResponse;class RuleController extends Controller{private RuleRepositoryInterface $repository;- protected array $acceptedRoles = [UserRoleEnum::READ_RULES];+ protected array $acceptedRoles = [UserRoleEnum::READ_RULES];/*** RuleController constructor.@@ -46,16 +46,14 @@ class RuleController extends Controllerpublic function __construct(){parent::__construct();- $this->middleware(- function (Request $request, $next) {- $this->validateUserGroup($request);- $this->repository = app(RuleRepositoryInterface::class);- $this->repository->setUser($this->user);- $this->repository->setUserGroup($this->userGroup);+ $this->middleware(function (Request $request, $next) {+ $this->validateUserGroup($request);+ $this->repository = app(RuleRepositoryInterface::class);+ $this->repository->setUser($this->user);+ $this->repository->setUserGroup($this->userGroup);- return $next($request);- }- );+ return $next($request);+ });}public function rules(AutocompleteApiRequest $request): JsonResponse@@ -66,7 +64,7 @@ class RuleController extends Controller/** @var Rule $rule */foreach ($rules as $rule) {$response[] = [- 'id' => (string)$rule->id,+ 'id' => (string) $rule->id,'name' => $rule->title,'description' => $rule->description,'active' => $rule->active,diff --git a/app/Api/V1/Controllers/Autocomplete/RuleGroupController.php b/app/Api/V1/Controllers/Autocomplete/RuleGroupController.phpindex b2cee766c9..51acc4a3c2 100644--- a/app/Api/V1/Controllers/Autocomplete/RuleGroupController.php+++ b/app/Api/V1/Controllers/Autocomplete/RuleGroupController.php@@ -24,13 +24,13 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Controllers\Autocomplete;-use Illuminate\Http\Request;use FireflyIII\Api\V1\Controllers\Controller;use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteApiRequest;use FireflyIII\Enums\UserRoleEnum;use FireflyIII\Models\RuleGroup;use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface;use Illuminate\Http\JsonResponse;+use Illuminate\Http\Request;/*** Class RuleGroupController@@ -46,16 +46,14 @@ class RuleGroupController extends Controllerpublic function __construct(){parent::__construct();- $this->middleware(- function (Request $request, $next) {- $this->validateUserGroup($request);- $this->repository = app(RuleGroupRepositoryInterface::class);- $this->repository->setUser($this->user);- $this->repository->setUserGroup($this->userGroup);+ $this->middleware(function (Request $request, $next) {+ $this->validateUserGroup($request);+ $this->repository = app(RuleGroupRepositoryInterface::class);+ $this->repository->setUser($this->user);+ $this->repository->setUserGroup($this->userGroup);- return $next($request);- }- );+ return $next($request);+ });}public function ruleGroups(AutocompleteApiRequest $request): JsonResponsediff --git a/app/Api/V1/Controllers/Autocomplete/TagController.php b/app/Api/V1/Controllers/Autocomplete/TagController.phpindex 83305b5e32..092549d02b 100644--- a/app/Api/V1/Controllers/Autocomplete/TagController.php+++ b/app/Api/V1/Controllers/Autocomplete/TagController.php@@ -24,13 +24,13 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Controllers\Autocomplete;-use Illuminate\Http\Request;use FireflyIII\Api\V1\Controllers\Controller;use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteApiRequest;use FireflyIII\Enums\UserRoleEnum;use FireflyIII\Models\Tag;use FireflyIII\Repositories\Tag\TagRepositoryInterface;use Illuminate\Http\JsonResponse;+use Illuminate\Http\Request;/*** Class TagController@@ -46,16 +46,14 @@ class TagController extends Controllerpublic function __construct(){parent::__construct();- $this->middleware(- function (Request $request, $next) {- $this->validateUserGroup($request);- $this->repository = app(TagRepositoryInterface::class);- $this->repository->setUser($this->user);- $this->repository->setUserGroup($this->userGroup);+ $this->middleware(function (Request $request, $next) {+ $this->validateUserGroup($request);+ $this->repository = app(TagRepositoryInterface::class);+ $this->repository->setUser($this->user);+ $this->repository->setUserGroup($this->userGroup);- return $next($request);- }- );+ return $next($request);+ });}public function tags(AutocompleteApiRequest $request): JsonResponse@@ -65,11 +63,7 @@ class TagController extends Controller/** @var Tag $tag */foreach ($result as $tag) {- $array[] = [- 'id' => (string) $tag->id,- 'name' => $tag->tag,- 'tag' => $tag->tag,- ];+ $array[] = ['id' => (string) $tag->id, 'name' => $tag->tag, 'tag' => $tag->tag];}return response()->api($array);diff --git a/app/Api/V1/Controllers/Autocomplete/TransactionController.php b/app/Api/V1/Controllers/Autocomplete/TransactionController.phpindex 91d6956cc7..6f17845992 100644--- a/app/Api/V1/Controllers/Autocomplete/TransactionController.php+++ b/app/Api/V1/Controllers/Autocomplete/TransactionController.php@@ -24,7 +24,6 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Controllers\Autocomplete;-use Illuminate\Http\Request;use FireflyIII\Api\V1\Controllers\Controller;use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteApiRequest;use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteTransactionApiRequest;@@ -34,6 +33,7 @@ use FireflyIII\Models\TransactionJournal;use FireflyIII\Repositories\Journal\JournalRepositoryInterface;use FireflyIII\Repositories\TransactionGroup\TransactionGroupRepositoryInterface;use Illuminate\Http\JsonResponse;+use Illuminate\Http\Request;use Illuminate\Support\Collection;/**@@ -43,7 +43,7 @@ class TransactionController extends Controller{protected array $acceptedRoles = [UserRoleEnum::READ_ONLY];private TransactionGroupRepositoryInterface $groupRepository;- private JournalRepositoryInterface $repository;+ private JournalRepositoryInterface $repository;/*** TransactionController constructor.@@ -51,19 +51,17 @@ class TransactionController extends Controllerpublic function __construct(){parent::__construct();- $this->middleware(- function (Request $request, $next) {- $this->validateUserGroup($request);- $this->repository = app(JournalRepositoryInterface::class);- $this->groupRepository = app(TransactionGroupRepositoryInterface::class);- $this->repository->setUser($this->user);- $this->repository->setUserGroup($this->userGroup);- $this->groupRepository->setUser($this->user);- $this->groupRepository->setUserGroup($this->userGroup);+ $this->middleware(function (Request $request, $next) {+ $this->validateUserGroup($request);+ $this->repository = app(JournalRepositoryInterface::class);+ $this->groupRepository = app(TransactionGroupRepositoryInterface::class);+ $this->repository->setUser($this->user);+ $this->repository->setUserGroup($this->userGroup);+ $this->groupRepository->setUser($this->user);+ $this->groupRepository->setUserGroup($this->userGroup);- return $next($request);- }- );+ return $next($request);+ });}public function transactions(AutocompleteTransactionApiRequest $request): JsonResponsediff --git a/app/Api/V1/Controllers/Autocomplete/TransactionTypeController.php b/app/Api/V1/Controllers/Autocomplete/TransactionTypeController.phpindex 535d094b4d..98d635b2d8 100644--- a/app/Api/V1/Controllers/Autocomplete/TransactionTypeController.php+++ b/app/Api/V1/Controllers/Autocomplete/TransactionTypeController.php@@ -24,13 +24,13 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Controllers\Autocomplete;-use Illuminate\Http\Request;use FireflyIII\Api\V1\Controllers\Controller;use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteApiRequest;use FireflyIII\Enums\UserRoleEnum;use FireflyIII\Models\TransactionType;use FireflyIII\Repositories\TransactionType\TransactionTypeRepositoryInterface;use Illuminate\Http\JsonResponse;+use Illuminate\Http\Request;/*** Class TransactionTypeController@@ -46,14 +46,12 @@ class TransactionTypeController extends Controllerpublic function __construct(){parent::__construct();- $this->middleware(- function (Request $request, $next) {- $this->validateUserGroup($request);- $this->repository = app(TransactionTypeRepositoryInterface::class);+ $this->middleware(function (Request $request, $next) {+ $this->validateUserGroup($request);+ $this->repository = app(TransactionTypeRepositoryInterface::class);- return $next($request);- }- );+ return $next($request);+ });}public function transactionTypes(AutocompleteApiRequest $request): JsonResponse@@ -64,11 +62,7 @@ class TransactionTypeController extends Controller/** @var TransactionType $type */foreach ($types as $type) {// different key for consistency.- $array[] = [- 'id' => (string) $type->id,- 'name' => $type->type,- 'type' => $type->type,- ];+ $array[] = ['id' => (string) $type->id, 'name' => $type->type, 'type' => $type->type];}return response()->api($array);diff --git a/app/Api/V1/Controllers/Chart/AccountController.php b/app/Api/V1/Controllers/Chart/AccountController.phpindex 5d1436ada2..36effec09a 100644--- a/app/Api/V1/Controllers/Chart/AccountController.php+++ b/app/Api/V1/Controllers/Chart/AccountController.php@@ -49,9 +49,9 @@ class AccountController extends Controlleruse CleansChartData;use CollectsAccountsFromFilter;- protected array $acceptedRoles = [UserRoleEnum::READ_ONLY];+ protected array $acceptedRoles = [UserRoleEnum::READ_ONLY];- private array $chartData = [];+ private array $chartData = [];private AccountRepositoryInterface $repository;/**@@ -60,16 +60,14 @@ class AccountController extends Controllerpublic function __construct(){parent::__construct();- $this->middleware(- function (Request $request, $next) {- $this->repository = app(AccountRepositoryInterface::class);- $this->validateUserGroup($request);- $this->repository->setUserGroup($this->userGroup);- $this->repository->setUser($this->user);-- return $next($request);- }- );+ $this->middleware(function (Request $request, $next) {+ $this->repository = app(AccountRepositoryInterface::class);+ $this->validateUserGroup($request);+ $this->repository->setUserGroup($this->userGroup);+ $this->repository->setUser($this->user);++ return $next($request);+ });}/**@@ -115,14 +113,14 @@ class AccountController extends Controller'label' => $account->name,// the currency that belongs to the account.- 'currency_id' => (string)$currency->id,+ 'currency_id' => (string) $currency->id,'currency_name' => $currency->name,'currency_code' => $currency->code,'currency_symbol' => $currency->symbol,'currency_decimal_places' => $currency->decimal_places,// the primary currency- 'primary_currency_id' => (string)$this->primaryCurrency->id,+ 'primary_currency_id' => (string) $this->primaryCurrency->id,// the default currency of the user (could be the same!)'date' => $params['start']->toAtomString(),@@ -136,7 +134,7 @@ class AccountController extends Controller];if ($this->convertToPrimary) {$currentSet['pc_entries'] = [];- $currentSet['primary_currency_id'] = (string)$this->primaryCurrency->id;+ $currentSet['primary_currency_id'] = (string) $this->primaryCurrency->id;$currentSet['primary_currency_code'] = $this->primaryCurrency->code;$currentSet['primary_currency_symbol'] = $this->primaryCurrency->symbol;$currentSet['primary_currency_decimal_places'] = $this->primaryCurrency->decimal_places;@@ -151,7 +149,6 @@ class AccountController extends Controller$previous = $balance;$currentSet['entries'][$label] = $balance;-// do the same for the primary currency balance, if relevant:$pcBalance = null;if ($this->convertToPrimary) {@@ -160,6 +157,7 @@ class AccountController extends Controller$currentSet['pc_entries'][$label] = $pcBalance;}$currentStart = Navigation::addPeriod($currentStart, $period);+// $currentStart->addDay();}$this->chartData[] = $currentSet;diff --git a/app/Api/V1/Controllers/Chart/BalanceController.php b/app/Api/V1/Controllers/Chart/BalanceController.phpindex 1014c15cd2..e65a3af8ad 100644--- a/app/Api/V1/Controllers/Chart/BalanceController.php+++ b/app/Api/V1/Controllers/Chart/BalanceController.php@@ -1,6 +1,5 @@<?php-/** BalanceController.php* Copyright (c) 2025 [email protected]@@ -25,7 +24,6 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Controllers\Chart;-use Illuminate\Http\Request;use FireflyIII\Api\V1\Controllers\Controller;use FireflyIII\Api\V1\Requests\Chart\ChartRequest;use FireflyIII\Enums\TransactionTypeEnum;@@ -37,6 +35,7 @@ use FireflyIII\Support\Http\Api\AccountBalanceGrouped;use FireflyIII\Support\Http\Api\CleansChartData;use FireflyIII\Support\Http\Api\CollectsAccountsFromFilter;use Illuminate\Http\JsonResponse;+use Illuminate\Http\Request;/*** Class BalanceController@@ -45,10 +44,11 @@ class BalanceController extends Controller{use CleansChartData;use CollectsAccountsFromFilter;- protected array $acceptedRoles = [UserRoleEnum::READ_ONLY];- private array $chartData = [];- private GroupCollectorInterface $collector;+ protected array $acceptedRoles = [UserRoleEnum::READ_ONLY];++ private array $chartData = [];+ private GroupCollectorInterface $collector;private AccountRepositoryInterface $repository;// private TransactionCurrency $default;@@ -56,19 +56,17 @@ class BalanceController extends Controllerpublic function __construct(){parent::__construct();- $this->middleware(- function (Request $request, $next) {- $this->validateUserGroup($request);- $this->repository = app(AccountRepositoryInterface::class);- $this->collector = app(GroupCollectorInterface::class);- $this->repository->setUserGroup($this->userGroup);- $this->collector->setUserGroup($this->userGroup);- $this->repository->setUser($this->user);- $this->collector->setUser($this->user);+ $this->middleware(function (Request $request, $next) {+ $this->validateUserGroup($request);+ $this->repository = app(AccountRepositoryInterface::class);+ $this->collector = app(GroupCollectorInterface::class);+ $this->repository->setUserGroup($this->userGroup);+ $this->collector->setUserGroup($this->userGroup);+ $this->repository->setUser($this->user);+ $this->collector->setUser($this->user);- return $next($request);- }- );+ return $next($request);+ });}/**@@ -89,10 +87,16 @@ class BalanceController extends Controller// get journals for entire period:- $this->collector->setRange($queryParameters['start'], $queryParameters['end'])+ $this->collector+ ->setRange($queryParameters['start'], $queryParameters['end'])->withAccountInformation()->setXorAccounts($accounts)- ->setTypes([TransactionTypeEnum::WITHDRAWAL->value, TransactionTypeEnum::DEPOSIT->value, TransactionTypeEnum::RECONCILIATION->value, TransactionTypeEnum::TRANSFER->value])+ ->setTypes([+ TransactionTypeEnum::WITHDRAWAL->value,+ TransactionTypeEnum::DEPOSIT->value,+ TransactionTypeEnum::RECONCILIATION->value,+ TransactionTypeEnum::TRANSFER->value,+ ]);$journals = $this->collector->getExtractedJournals();diff --git a/app/Api/V1/Controllers/Chart/BudgetController.php b/app/Api/V1/Controllers/Chart/BudgetController.phpindex 2d62f23d8c..07fd41b6b5 100644--- a/app/Api/V1/Controllers/Chart/BudgetController.php+++ b/app/Api/V1/Controllers/Chart/BudgetController.php@@ -24,7 +24,6 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Controllers\Chart;-use Illuminate\Http\Request;use Carbon\Carbon;use FireflyIII\Api\V1\Controllers\Controller;use FireflyIII\Api\V1\Requests\DateRangeRequest;@@ -36,13 +35,14 @@ use FireflyIII\Repositories\Budget\BudgetLimitRepositoryInterface;use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;use FireflyIII\Repositories\Budget\OperationsRepositoryInterface;use FireflyIII\Support\Facades\Amount;+use FireflyIII\Support\Facades\Steam;use FireflyIII\Support\Http\Api\CleansChartData;use FireflyIII\Support\Http\Api\ExchangeRateConverter;use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait;use Illuminate\Http\JsonResponse;+use Illuminate\Http\Request;use Illuminate\Support\Collection;use Illuminate\Support\Facades\Log;-use FireflyIII\Support\Facades\Steam;/*** Class BudgetController@@ -52,32 +52,30 @@ class BudgetController extends Controlleruse CleansChartData;use ValidatesUserGroupTrait;- protected array $acceptedRoles = [UserRoleEnum::READ_ONLY];+ protected array $acceptedRoles = [UserRoleEnum::READ_ONLY];protected OperationsRepositoryInterface $opsRepository;- private BudgetLimitRepositoryInterface $blRepository;- private array $currencies = [];- private BudgetRepositoryInterface $repository;+ private BudgetLimitRepositoryInterface $blRepository;+ private array $currencies = [];+ private BudgetRepositoryInterface $repository;public function __construct(){parent::__construct();- $this->middleware(- function (Request $request, $next) {- $this->validateUserGroup($request);- $this->repository = app(BudgetRepositoryInterface::class);- $this->blRepository = app(BudgetLimitRepositoryInterface::class);- $this->opsRepository = app(OperationsRepositoryInterface::class);- $this->repository->setUserGroup($this->userGroup);- $this->opsRepository->setUserGroup($this->userGroup);- $this->blRepository->setUserGroup($this->userGroup);- $this->repository->setUser($this->user);- $this->opsRepository->setUser($this->user);- $this->blRepository->setUser($this->user);-- return $next($request);- }- );+ $this->middleware(function (Request $request, $next) {+ $this->validateUserGroup($request);+ $this->repository = app(BudgetRepositoryInterface::class);+ $this->blRepository = app(BudgetLimitRepositoryInterface::class);+ $this->opsRepository = app(OperationsRepositoryInterface::class);+ $this->repository->setUserGroup($this->userGroup);+ $this->opsRepository->setUserGroup($this->userGroup);+ $this->blRepository->setUserGroup($this->userGroup);+ $this->repository->setUser($this->user);+ $this->opsRepository->setUser($this->user);+ $this->blRepository->setUser($this->user);++ return $next($request);+ });}/**@@ -158,18 +156,17 @@ class BudgetController extends Controller$rows[] = $row;}-// is always an array$return = [];foreach ($rows as $row) {$current = ['label' => $budget->name,- 'currency_id' => (string)$row['currency_id'],+ 'currency_id' => (string) $row['currency_id'],'currency_name' => $row['currency_name'],'currency_code' => $row['currency_code'],'currency_decimal_places' => $row['currency_decimal_places'],- 'primary_currency_id' => (string)$this->primaryCurrency->id,+ 'primary_currency_id' => (string) $this->primaryCurrency->id,'primary_currency_name' => $this->primaryCurrency->name,'primary_currency_code' => $this->primaryCurrency->code,'primary_currency_symbol' => $this->primaryCurrency->symbol,@@ -181,12 +178,7 @@ class BudgetController extends Controller'end_date' => $row['end'],'yAxisID' => 0,'type' => 'bar',- 'entries' => [- 'budgeted' => $row['budgeted'],- 'spent' => $row['spent'],- 'left' => $row['left'],- 'overspent' => $row['overspent'],- ],+ 'entries' => ['budgeted' => $row['budgeted'], 'spent' => $row['spent'], 'left' => $row['left'], 'overspent' => $row['overspent']],'pc_entries' => ['budgeted' => $row['pc_budgeted'],'spent' => $row['pc_spent'],@@ -233,11 +225,11 @@ class BudgetController extends Controllerforeach ($spent as $currencyId => $block) {$this->currencies[$currencyId] ??= Amount::getTransactionCurrencyById($currencyId);$return[$currencyId] ??= [- 'currency_id' => (string)$currencyId,+ 'currency_id' => (string) $currencyId,'currency_code' => $block['currency_code'],'currency_name' => $block['currency_name'],'currency_symbol' => $block['currency_symbol'],- 'currency_decimal_places' => (int)$block['currency_decimal_places'],+ 'currency_decimal_places' => (int) $block['currency_decimal_places'],'start' => $start->toAtomString(),'end' => $end->toAtomString(),'budgeted' => '0',@@ -251,7 +243,7 @@ class BudgetController extends Controller/** @var array $journal */foreach ($currentBudgetArray['transaction_journals'] as $journal) {/** @var numeric-string $amount */- $amount = (string)$journal['amount'];+ $amount = (string) $journal['amount'];$return[$currencyId]['spent'] = bcadd($return[$currencyId]['spent'], $amount);}}@@ -270,14 +262,21 @@ class BudgetController extends Controllerif ($this->convertToPrimary) {if ($current->transaction_currency_id === $this->primaryCurrency->id) {// simply add it.- $amount = bcadd($amount, (string)$current->amount);+ $amount = bcadd($amount, (string) $current->amount);Log::debug(sprintf('Set amount in limit to %s', $amount));}if ($current->transaction_currency_id !== $this->primaryCurrency->id) {// convert and then add it.$converted = $converter->convert($current->transactionCurrency, $this->primaryCurrency, $current->start_date, $current->amount);$amount = bcadd($amount, $converted);- Log::debug(sprintf('Budgeted in limit #%d: %s %s, converted to %s %s', $current->id, $current->transactionCurrency->code, $current->amount, $this->primaryCurrency->code, $converted));+ Log::debug(sprintf(+ 'Budgeted in limit #%d: %s %s, converted to %s %s',+ $current->id,+ $current->transactionCurrency->code,+ $current->amount,+ $this->primaryCurrency->code,+ $converted+ ));Log::debug(sprintf('Set amount in limit to %s', $amount));}}diff --git a/app/Api/V1/Controllers/Chart/CategoryController.php b/app/Api/V1/Controllers/Chart/CategoryController.phpindex 31df558fc6..679dab4e5c 100644--- a/app/Api/V1/Controllers/Chart/CategoryController.php+++ b/app/Api/V1/Controllers/Chart/CategoryController.php@@ -24,7 +24,6 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Controllers\Chart;-use Illuminate\Http\Request;use Carbon\Carbon;use FireflyIII\Api\V1\Controllers\Controller;use FireflyIII\Api\V1\Requests\DateRangeRequest;@@ -40,6 +39,7 @@ use FireflyIII\Support\Http\Api\CleansChartData;use FireflyIII\Support\Http\Api\ExchangeRateConverter;use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait;use Illuminate\Http\JsonResponse;+use Illuminate\Http\Request;use Illuminate\Support\Facades\Log;/**@@ -52,25 +52,23 @@ class CategoryController extends Controllerprotected array $acceptedRoles = [UserRoleEnum::READ_ONLY];- private AccountRepositoryInterface $accountRepos;+ private AccountRepositoryInterface $accountRepos;private CurrencyRepositoryInterface $currencyRepos;public function __construct(){parent::__construct();- $this->middleware(- function (Request $request, $next) {- $this->validateUserGroup($request);- $this->accountRepos = app(AccountRepositoryInterface::class);- $this->currencyRepos = app(CurrencyRepositoryInterface::class);- $this->accountRepos->setUserGroup($this->userGroup);- $this->currencyRepos->setUserGroup($this->userGroup);- $this->accountRepos->setUser($this->user);- $this->currencyRepos->setUser($this->user);-- return $next($request);- }- );+ $this->middleware(function (Request $request, $next) {+ $this->validateUserGroup($request);+ $this->accountRepos = app(AccountRepositoryInterface::class);+ $this->currencyRepos = app(CurrencyRepositoryInterface::class);+ $this->accountRepos->setUserGroup($this->userGroup);+ $this->currencyRepos->setUserGroup($this->userGroup);+ $this->accountRepos->setUser($this->user);+ $this->currencyRepos->setUser($this->user);++ return $next($request);+ });}/**@@ -88,7 +86,12 @@ class CategoryController extends Controller/** @var Carbon $end */$end = $request->attributes->get('end');- $accounts = $this->accountRepos->getAccountsByType([AccountTypeEnum::DEBT->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::MORTGAGE->value, AccountTypeEnum::ASSET->value]);+ $accounts = $this->accountRepos->getAccountsByType([+ AccountTypeEnum::DEBT->value,+ AccountTypeEnum::LOAN->value,+ AccountTypeEnum::MORTGAGE->value,+ AccountTypeEnum::ASSET->value,+ ]);$currencies = [];$return = [];$converter = new ExchangeRateConverter();@@ -104,7 +107,7 @@ class CategoryController extends Controller/** @var array $journal */foreach ($journals as $journal) {// find journal:- $journalCurrencyId = (int)$journal['currency_id'];+ $journalCurrencyId = (int) $journal['currency_id'];$type = $journal['transaction_type_type'];$currency = $currencies[$journalCurrencyId] ?? $this->currencyRepos->find($journalCurrencyId);$currencies[$journalCurrencyId] = $currency;@@ -113,7 +116,7 @@ class CategoryController extends Controller$currencyCode = $currency->code;$currencySymbol = $currency->symbol;$currencyDecimalPlaces = $currency->decimal_places;- $amount = Steam::positive((string)$journal['amount']);+ $amount = Steam::positive((string) $journal['amount']);$pcAmount = null;// overrule if necessary:@@ -130,18 +133,17 @@ class CategoryController extends ControllerLog::debug(sprintf('Converted %s %s to %s %s', $journal['currency_code'], $amount, $this->primaryCurrency->code, $pcAmount));}-- $categoryName = $journal['category_name'] ?? (string)trans('firefly.no_category');+ $categoryName = $journal['category_name'] ?? (string) trans('firefly.no_category');$key = sprintf('%s-%s', $categoryName, $currencyCode);// create arrays$return[$key] ??= ['label' => $categoryName,- 'currency_id' => (string)$currencyId,+ 'currency_id' => (string) $currencyId,'currency_name' => $currencyName,'currency_code' => $currencyCode,'currency_symbol' => $currencySymbol,'currency_decimal_places' => $currencyDecimalPlaces,- 'primary_currency_id' => (string)$this->primaryCurrency->id,+ 'primary_currency_id' => (string) $this->primaryCurrency->id,'primary_currency_name' => $this->primaryCurrency->name,'primary_currency_code' => $this->primaryCurrency->code,'primary_currency_symbol' => $this->primaryCurrency->symbol,@@ -151,14 +153,8 @@ class CategoryController extends Controller'end_date' => $end->toAtomString(),'yAxisID' => 0,'type' => 'bar',- 'entries' => [- 'spent' => '0',- 'earned' => '0',- ],- 'pc_entries' => [- 'spent' => '0',- 'earned' => '0',- ],+ 'entries' => ['spent' => '0', 'earned' => '0'],+ 'pc_entries' => ['spent' => '0', 'earned' => '0'],];// add monies@@ -182,7 +178,10 @@ class CategoryController extends Controller$return = array_values($return);// order by amount- usort($return, static fn (array $a, array $b): int => ((float)$a['entries']['spent'] + (float)$a['entries']['earned']) < ((float)$b['entries']['spent'] + (float)$b['entries']['earned']) ? 1 : -1);+ usort($return, static fn (array $a, array $b): int => ((float) $a['entries']['spent'] + (float) $a['entries']['earned'])+ < ((float) $b['entries']['spent'] + (float) $b['entries']['earned'])+ ? 1+ : -1);return response()->json($this->clean($return));}diff --git a/app/Api/V1/Controllers/Data/DestroyController.php b/app/Api/V1/Controllers/Data/DestroyController.phpindex 85ac99ae94..ab519becbe 100644--- a/app/Api/V1/Controllers/Data/DestroyController.php+++ b/app/Api/V1/Controllers/Data/DestroyController.php@@ -24,7 +24,6 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Controllers\Data;-use Illuminate\Http\Request;use FireflyIII\Api\V1\Controllers\Controller;use FireflyIII\Api\V1\Requests\Data\DestroyRequest;use FireflyIII\Enums\AccountTypeEnum;@@ -49,6 +48,7 @@ use FireflyIII\Services\Internal\Destroy\AccountDestroyService;use FireflyIII\Services\Internal\Destroy\JournalDestroyService;use FireflyIII\Support\Facades\Preferences;use Illuminate\Http\JsonResponse;+use Illuminate\Http\Request;use Illuminate\Support\Facades\Log;/**@@ -63,13 +63,11 @@ class DestroyController extends Controllerpublic function __construct(){parent::__construct();- $this->middleware(- function (Request $request, $next) {- $this->validateUserGroup($request);+ $this->middleware(function (Request $request, $next) {+ $this->validateUserGroup($request);- return $next($request);- }- );+ return $next($request);+ });}public function destroy(DestroyRequest $request): JsonResponse@@ -77,10 +75,40 @@ class DestroyController extends Controller$objects = $request->getObjects();$this->unused = $request->boolean('unused');- $allExceptAssets = [AccountTypeEnum::BENEFICIARY->value, AccountTypeEnum::CASH->value, AccountTypeEnum::CREDITCARD->value, AccountTypeEnum::DEFAULT->value, AccountTypeEnum::EXPENSE->value, AccountTypeEnum::IMPORT->value, AccountTypeEnum::INITIAL_BALANCE->value, AccountTypeEnum::LIABILITY_CREDIT->value, AccountTypeEnum::RECONCILIATION->value, AccountTypeEnum::REVENUE->value];- $all = [AccountTypeEnum::ASSET->value, AccountTypeEnum::BENEFICIARY->value, AccountTypeEnum::CASH->value, AccountTypeEnum::CREDITCARD->value, AccountTypeEnum::DEBT->value, AccountTypeEnum::DEFAULT->value, AccountTypeEnum::EXPENSE->value, AccountTypeEnum::IMPORT->value, AccountTypeEnum::INITIAL_BALANCE->value, AccountTypeEnum::LIABILITY_CREDIT->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::MORTGAGE->value, AccountTypeEnum::RECONCILIATION->value];+ $allExceptAssets = [+ AccountTypeEnum::BENEFICIARY->value,+ AccountTypeEnum::CASH->value,+ AccountTypeEnum::CREDITCARD->value,+ AccountTypeEnum::DEFAULT->value,+ AccountTypeEnum::EXPENSE->value,+ AccountTypeEnum::IMPORT->value,+ AccountTypeEnum::INITIAL_BALANCE->value,+ AccountTypeEnum::LIABILITY_CREDIT->value,+ AccountTypeEnum::RECONCILIATION->value,+ AccountTypeEnum::REVENUE->value,+ ];+ $all = [+ AccountTypeEnum::ASSET->value,+ AccountTypeEnum::BENEFICIARY->value,+ AccountTypeEnum::CASH->value,+ AccountTypeEnum::CREDITCARD->value,+ AccountTypeEnum::DEBT->value,+ AccountTypeEnum::DEFAULT->value,+ AccountTypeEnum::EXPENSE->value,+ AccountTypeEnum::IMPORT->value,+ AccountTypeEnum::INITIAL_BALANCE->value,+ AccountTypeEnum::LIABILITY_CREDIT->value,+ AccountTypeEnum::LOAN->value,+ AccountTypeEnum::MORTGAGE->value,+ AccountTypeEnum::RECONCILIATION->value,+ ];$liabilities = [AccountTypeEnum::DEBT->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::MORTGAGE->value, AccountTypeEnum::CREDITCARD->value];- $transactions = [TransactionTypeEnum::WITHDRAWAL->value, TransactionTypeEnum::DEPOSIT->value, TransactionTypeEnum::TRANSFER->value, TransactionTypeEnum::RECONCILIATION->value];+ $transactions = [+ TransactionTypeEnum::WITHDRAWAL->value,+ TransactionTypeEnum::DEPOSIT->value,+ TransactionTypeEnum::TRANSFER->value,+ TransactionTypeEnum::RECONCILIATION->value,+ ];match ($objects) {'budgets' => $this->destroyBudgets(),@@ -101,7 +129,7 @@ class DestroyController extends Controller'withdrawals' => $this->destroyTransactions([TransactionTypeEnum::WITHDRAWAL->value]),'deposits' => $this->destroyTransactions([TransactionTypeEnum::DEPOSIT->value]),'transfers' => $this->destroyTransactions([TransactionTypeEnum::TRANSFER->value]),- default => throw new FireflyException(sprintf('200033: This endpoint can\'t handle object "%s"', $objects)),+ default => throw new FireflyException(sprintf('200033: This endpoint can\'t handle object "%s"', $objects))};Preferences::mark();diff --git a/app/Api/V1/Controllers/Data/PurgeController.php b/app/Api/V1/Controllers/Data/PurgeController.phpindex 700b0da352..2af2cd8bab 100644--- a/app/Api/V1/Controllers/Data/PurgeController.php+++ b/app/Api/V1/Controllers/Data/PurgeController.php@@ -24,7 +24,6 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Controllers\Data;-use Illuminate\Http\Request;use FireflyIII\Api\V1\Controllers\Controller;use FireflyIII\Enums\UserRoleEnum;use FireflyIII\Models\Account;@@ -40,6 +39,7 @@ use FireflyIII\Models\TransactionJournal;use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;use FireflyIII\User;use Illuminate\Http\JsonResponse;+use Illuminate\Http\Request;/*** Class PurgeController@@ -51,13 +51,11 @@ class PurgeController extends Controllerpublic function __construct(){parent::__construct();- $this->middleware(- function (Request $request, $next) {- $this->validateUserGroup($request);+ $this->middleware(function (Request $request, $next) {+ $this->validateUserGroup($request);- return $next($request);- }- );+ return $next($request);+ });}/**diff --git a/app/User.php b/app/User.phpindex 7aaab8e9ee..f029aecff1 100644--- a/app/User.php+++ b/app/User.php@@ -70,8 +70,8 @@ use Illuminate\Support\Facades\Request;use Illuminate\Support\Str;use Laravel\Passport\HasApiTokens;use NotificationChannels\Pushover\PushoverReceiver;-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;use SensitiveParameter;+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;class User extends Authenticatable{