Merge pull request #11938 from firefly-iii/release-1773370546

🤖 Automatically merge the PR into the develop branch.

.ci/php-cs-fixer/composer.lock

@@ -1264,16 +1264,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v8.0.6",
+            "version": "v8.0.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "488285876e807a4777f074041d8bb508623419fa"
+                "reference": "15ed9008a4ebe2d6a78e4937f74e0c13ef2e618a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/488285876e807a4777f074041d8bb508623419fa",
-                "reference": "488285876e807a4777f074041d8bb508623419fa",
+                "url": "https://api.github.com/repos/symfony/console/zipball/15ed9008a4ebe2d6a78e4937f74e0c13ef2e618a",
+                "reference": "15ed9008a4ebe2d6a78e4937f74e0c13ef2e618a",
                 "shasum": ""
             },
             "require": {
@@ -1330,7 +1330,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v8.0.6"
+                "source": "https://github.com/symfony/console/tree/v8.0.7"
             },
             "funding": [
                 {
@@ -1350,7 +1350,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-02-25T16:59:43+00:00"
+            "time": "2026-03-06T14:06:22+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",

.ci/phpstan.neon

@@ -1,4 +1,27 @@
 parameters:
+  ergebnis:
+    noExtends:
+      enabled: false
+    final:
+      enabled: false
+    noParameterWithNullDefaultValue:
+      enabled: false
+    noParameterWithNullableTypeDeclaration:
+      enabled: false
+    noCompact:
+      enabled: false
+    noSwitch:
+      enabled: false
+    noNullableReturnTypeDeclaration:
+      enabled: false
+    finalInAbstractClass:
+      enabled: false
+    noConstructorParameterWithDefaultValue:
+      enabled: false
+    noNamedArgument:
+      enabled: false
+    noParameterWithContainerTypeDeclaration:
+      enabled: false
   paths:
     - ../app
     - ../database
@@ -10,62 +33,29 @@ parameters:
     - Illuminate\Database\Eloquent\Model
   reportUnmatchedIgnoredErrors: true
   ignoreErrors:
-    # these are actually interesting but not right now:
-    - identifier: notIdentical.alwaysTrue
-    - identifier: method.notFound
-    - identifier: nullsafe.neverNull
-    - identifier: identical.alwaysFalse
-    - identifier: if.condNotBoolean
-    # - identifier: booleanNot.exprNotBoolean
-    - identifier: method.nonObject
-    - identifier: function.impossibleType
-    - identifier: booleanNot.exprNotBoolean
-    - identifier: ternary.condNotBoolean
-    - identifier: booleanNot.alwaysFalse
-    - identifier: booleanAnd.alwaysFalse
-    - identifier: greater.alwaysTrue
-    - identifier: function.alreadyNarrowedType
-    - identifier: booleanNot.alwaysTrue
-    - identifier: property.phpDocType
-    - identifier: nullCoalesce.offset
-    - identifier: nullCoalesce.variable
-    - identifier: larastan.noUnnecessaryCollectionCall
-    - identifier: varTag.differentVariable
-    - identifier: identical.alwaysTrue
-    - identifier: clone.nonObject
-    - identifier: assign.propertyReadOnly
-    - identifier: property.nonObject
-    - identifier: varTag.nativeType
-    - identifier: booleanAnd.leftAlwaysFalse
-    - identifier: property.onlyWritten
-    - identifier: parameter.phpDocType
-    - identifier: property.dynamicName
-    - identifier: property.unusedType
-    - identifier: staticMethod.deprecated
-    - identifier: greater.invalid
-    - identifier: instanceof.alwaysTrue
     # ignore everything but things that BREAK
     - identifier: property.deprecated
     - identifier: method.deprecated
     - identifier: cast.useless
-    - identifier: parameter.deprecatedClass
-    - identifier: method.deprecatedClass
     - identifier: argument.type
-    - identifier: return.type
-    - identifier: assign.propertyType
-    - identifier: return.unusedType
-    - identifier: return.phpDocType
-    # all errors below I will never fix.
+    # all errors below I will (probably) never fix.
+    - identifier: property.unusedType # one false positive
+    - identifier: varTag.nativeType # dont even know what im supposed to fix.
+    - identifier: method.notFound # way too many false positives
+    - identifier: catch.neverThrown # plenty of errors that are thrown undocumented
+    - identifier: staticMethod.dynamicName # dont care
+    - identifier: arguments.count # one false positive
+    - identifier: property.notFound # false positives
+    - identifier: method.dynamicName # i dont care
+    - identifier: staticMethod.dynamicCall # many false positives.
+    - identifier: argument.templateType # no clue how to fix single occurrence.
     # - '#expects view-string\|null, string given#'
     # - '#expects view-string, string given#'
     # - "#Parameter \\#[1-2] \\$num[1-2] of function bc[a-z]+ expects numeric-string, [a-z\\-|&]+ given#"
     - identifier: missingType.generics # not interesting enough to fix.
-    -
-        identifier: larastan.noEnvCallsOutsideOfConfig
-        path: ../app/Console/Commands/System/CreatesDatabase.php
     - identifier: missingType.iterableValue # not interesting enough to fix.
     - identifier: varTag.type # needs a custom extension for every repository, not gonna happen.
-    - '#Dynamic call to static method Illuminate#'
+    # - '#Dynamic call to static method Illuminate#'
     # - '#Call to an undefined method Illuminate\\Database\\Eloquent\\Relations\\HasMany::before#' # is custom scope
     # - '#Call to an undefined method Illuminate\\Database\\Eloquent\\Relations\\HasMany::after#' # is custom scope
     # - '#Call to an undefined method Illuminate\\Database\\Eloquent\\Relations\\HasMany::withTrashed#' # is to allow soft delete

.github/workflows/release.yml

@@ -33,7 +33,7 @@ jobs:
         with:
           fetch-depth: 0
       - name: Import GPG key
-        uses: crazy-max/ghaction-import-gpg@v6
+        uses: crazy-max/ghaction-import-gpg@v7
         with:
           gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
           passphrase: ${{ secrets.PASSPHRASE }}

app/Api/V1/Controllers/Autocomplete/AccountController.php

@@ -80,16 +80,16 @@ final class AccountController extends Controller
     public function accounts(AutocompleteApiRequest $request): JsonResponse
     {
         // Log::debug('Before All.');
-        ['types' => $types, 'query' => $query, 'date'  => $date, 'limit' => $limit] = $request->attributes->all();
+        ['types' => $types, 'query' => $query, 'date' => $date, 'limit' => $limit] = $request->attributes->all();
 
         $date ??= today(config('app.timezone'));
 
         // set date to end-of-day for account balance. so it is at $date 23:59:59
         $date->endOfDay();
 
-        $return                                                                     = [];
-        $result                                                                     = $this->repository->searchAccount((string) $query, $types, $limit);
-        $allBalances                                                                = Steam::accountsBalancesOptimized($result, $date, $this->primaryCurrency, $this->convertToPrimary);
+        $return                                                                    = [];
+        $result                                                                    = $this->repository->searchAccount((string) $query, $types, $limit);
+        $allBalances                                                               = Steam::accountsBalancesOptimized($result, $date, $this->primaryCurrency, $this->convertToPrimary);
 
         /** @var Account $account */
         foreach ($result as $account) {

app/Api/V1/Controllers/Autocomplete/BillController.php

@@ -63,7 +63,7 @@ final class BillController extends Controller
     public 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());
     }

app/Api/V1/Controllers/Autocomplete/BudgetController.php

@@ -63,7 +63,7 @@ final class BudgetController extends Controller
     public 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());
     }

app/Api/V1/Controllers/Autocomplete/CategoryController.php

@@ -63,7 +63,7 @@ final class CategoryController extends Controller
     public 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());
     }

app/Api/V1/Controllers/Autocomplete/ObjectGroupController.php

@@ -67,7 +67,7 @@ final 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);

app/Api/V1/Controllers/Autocomplete/TagController.php

@@ -63,7 +63,7 @@ final 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);

app/Api/V1/Controllers/Autocomplete/TransactionTypeController.php

@@ -62,7 +62,7 @@ final 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);

app/Api/V1/Controllers/Chart/BudgetController.php

@@ -220,7 +220,7 @@ final 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'],

app/Api/V1/Controllers/Chart/CategoryController.php

@@ -153,8 +153,8 @@ final 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

app/Api/V1/Controllers/Controller.php

@@ -63,6 +63,8 @@ abstract class Controller extends BaseController
     use ValidatesRequests;
     use ValidatesUserGroupTrait;
 
+    protected array $acceptedRoles           = [];
+
     protected const string CONTENT_TYPE      = 'application/vnd.api+json';
     protected const string JSON_CONTENT_TYPE = 'application/json';
 
@@ -169,6 +171,9 @@ abstract class Controller extends BaseController
         return $manager->createData($resource)->toArray();
     }
 
+    /**
+     * @deprecated
+     */
     #[Deprecated(message: <<<'TXT'
         use Request classes
          Method to grab all parameters from the URL
@@ -222,11 +227,8 @@ abstract class Controller extends BaseController
                 $value = min(max(1, $value), 2 ** 16);
                 $bag->set($integer, $value);
             }
-            if (
-                null === $value
-                && 'limit' === $integer // @phpstan-ignore-line
-                && auth()->check()
-            ) {
+            // && 'limit' === $integer
+            if (null === $value && auth()->check()) {
                 // set default for user:
                 /** @var User $user */
                 $user     = auth()->user();

app/Api/V1/Controllers/Models/Account/ListController.php

@@ -70,21 +70,21 @@ final class ListController extends Controller
 
     public function attachments(PaginationRequest $request, Account $account): JsonResponse
     {
-        $manager                                                     = $this->getManager();
-        ['limit'  => $limit, 'offset' => $offset, 'page'   => $page] = $request->attributes->all();
-        $collection                                                  = $this->repository->getAttachments($account);
+        $manager                                                  = $this->getManager();
+        ['limit' => $limit, 'offset' => $offset, 'page' => $page] = $request->attributes->all();
+        $collection                                               = $this->repository->getAttachments($account);
 
-        $count                                                       = $collection->count();
-        $attachments                                                 = $collection->slice($offset, $limit);
+        $count                                                    = $collection->count();
+        $attachments                                              = $collection->slice($offset, $limit);
 
         // make paginator:
-        $paginator                                                   = new LengthAwarePaginator($attachments, $count, $limit, $page);
+        $paginator                                                = new LengthAwarePaginator($attachments, $count, $limit, $page);
         $paginator->setPath(route('api.v1.accounts.attachments', [$account->id]).$this->buildParams());
 
         /** @var AttachmentTransformer $transformer */
-        $transformer                                                 = app(AttachmentTransformer::class);
+        $transformer                                              = app(AttachmentTransformer::class);
 
-        $resource                                                    = new FractalCollection($attachments, $transformer, 'attachments');
+        $resource                                                 = new FractalCollection($attachments, $transformer, 'attachments');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
@@ -93,31 +93,31 @@ final class ListController extends Controller
     public function piggyBanks(PaginationRequest $request, Account $account): JsonResponse
     {
         // create some objects:
-        $manager                                                     = $this->getManager();
+        $manager                                                  = $this->getManager();
 
-        ['limit'  => $limit, 'offset' => $offset, 'page'   => $page] = $request->attributes->all();
+        ['limit' => $limit, 'offset' => $offset, 'page' => $page] = $request->attributes->all();
 
         // get list of piggy banks. Count it and split it.
-        $collection                                                  = $this->repository->getPiggyBanks($account);
-        $count                                                       = $collection->count();
-        $piggyBanks                                                  = $collection->slice($offset, $limit);
+        $collection                                               = $this->repository->getPiggyBanks($account);
+        $count                                                    = $collection->count();
+        $piggyBanks                                               = $collection->slice($offset, $limit);
 
         // enrich
         /** @var User $admin */
-        $admin                                                       = auth()->user();
-        $enrichment                                                  = new PiggyBankEnrichment();
+        $admin                                                    = auth()->user();
+        $enrichment                                               = new PiggyBankEnrichment();
         $enrichment->setUser($admin);
-        $piggyBanks                                                  = $enrichment->enrich($piggyBanks);
+        $piggyBanks                                               = $enrichment->enrich($piggyBanks);
 
         // make paginator:
-        $paginator                                                   = new LengthAwarePaginator($piggyBanks, $count, $limit, $page);
+        $paginator                                                = new LengthAwarePaginator($piggyBanks, $count, $limit, $page);
         $paginator->setPath(route('api.v1.accounts.piggy-banks', [$account->id]).$this->buildParams());
 
         /** @var PiggyBankTransformer $transformer */
-        $transformer                                                 = app(PiggyBankTransformer::class);
+        $transformer                                              = app(PiggyBankTransformer::class);
         // $transformer->setParameters($this->parameters);
 
-        $resource                                                    = new FractalCollection($piggyBanks, $transformer, 'piggy-banks');
+        $resource                                                 = new FractalCollection($piggyBanks, $transformer, 'piggy-banks');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
@@ -128,16 +128,16 @@ final class ListController extends Controller
      */
     public function transactions(PaginationDateRangeRequest $request, Account $account): JsonResponse
     {
-        ['limit' => $limit, 'page'  => $page, 'start' => $start, 'end'   => $end, 'type'  => $type] = $request->attributes->all();
-        $types                                                                                      = $this->mapTransactionTypes($type ?? 'default');
-        $manager                                                                                    = $this->getManager();
+        ['limit' => $limit, 'page' => $page, 'start' => $start, 'end' => $end, 'type' => $type] = $request->attributes->all();
+        $types                                                                                  = $this->mapTransactionTypes($type ?? 'default');
+        $manager                                                                                = $this->getManager();
 
         /** @var User $admin */
-        $admin                                                                                      = auth()->user();
+        $admin                                                                                  = auth()->user();
 
         // use new group collector:
         /** @var GroupCollectorInterface $collector */
-        $collector                                                                                  = app(GroupCollectorInterface::class);
+        $collector                                                                              = app(GroupCollectorInterface::class);
         $collector->setUser($admin)->setAccounts(new Collection()->push($account))->withAPIInformation()->setLimit($limit)->setPage($page)->setTypes($types);
         if (null !== $start) {
             $collector->setStart($start);
@@ -146,18 +146,18 @@ final class ListController extends Controller
             $collector->setEnd($end);
         }
 
-        $paginator                                                                                  = $collector->getPaginatedGroups();
+        $paginator                                                                              = $collector->getPaginatedGroups();
         $paginator->setPath(route('api.v1.accounts.transactions', [$account->id]).$this->buildParams());
 
         // enrich
-        $enrichment                                                                                 = new TransactionGroupEnrichment();
+        $enrichment                                                                             = new TransactionGroupEnrichment();
         $enrichment->setUser($admin);
-        $transactions                                                                               = $enrichment->enrich($paginator->getCollection());
+        $transactions                                                                           = $enrichment->enrich($paginator->getCollection());
 
         /** @var TransactionGroupTransformer $transformer */
-        $transformer                                                                                = app(TransactionGroupTransformer::class);
+        $transformer                                                                            = app(TransactionGroupTransformer::class);
 
-        $resource                                                                                   = new FractalCollection($transactions, $transformer, 'transactions');
+        $resource                                                                               = new FractalCollection($transactions, $transformer, 'transactions');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);

app/Api/V1/Controllers/Models/Account/ShowController.php

@@ -124,22 +124,22 @@ final class ShowController extends Controller
         // get list of accounts. Count it and split it.
         $this->repository->resetAccountOrder();
         $account->refresh();
-        $manager                                               = $this->getManager();
-        ['start' => $start, 'end'   => $end, 'date'  => $date] = $request->attributes->all();
+        $manager                                            = $this->getManager();
+        ['start' => $start, 'end' => $end, 'date' => $date] = $request->attributes->all();
 
         // enrich
         /** @var User $admin */
-        $admin                                                 = auth()->user();
-        $enrichment                                            = new AccountEnrichment();
+        $admin                                              = auth()->user();
+        $enrichment                                         = new AccountEnrichment();
         $enrichment->setDate($date);
         $enrichment->setStart($start);
         $enrichment->setEnd($end);
         $enrichment->setUser($admin);
-        $account                                               = $enrichment->enrichSingle($account);
+        $account                                            = $enrichment->enrichSingle($account);
 
         /** @var AccountTransformer $transformer */
-        $transformer                                           = app(AccountTransformer::class);
-        $resource                                              = new Item($account, $transformer, self::RESOURCE_KEY);
+        $transformer                                        = app(AccountTransformer::class);
+        $resource                                           = new Item($account, $transformer, self::RESOURCE_KEY);
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }

app/Api/V1/Controllers/Models/Attachment/ShowController.php

@@ -121,7 +121,7 @@ final class ShowController extends Controller
      */
     public function index(PaginationRequest $request): JsonResponse
     {
-        ['limit'  => $limit, 'offset' => $offset, 'page'   => $page] = $request->attributes->all();
+        ['limit' => $limit, 'offset' => $offset, 'page' => $page] = $request->attributes->all();
 
         if (true === auth()->user()->hasRole('demo')) {
             Log::channel('audit')->warning(sprintf('Demo user tries to access attachment API in %s', __METHOD__));
@@ -129,21 +129,21 @@ final class ShowController extends Controller
             throw new NotFoundHttpException();
         }
 
-        $manager                                                     = $this->getManager();
+        $manager                                                  = $this->getManager();
 
         // get list of attachments. Count it and split it.
-        $collection                                                  = $this->repository->get();
-        $count                                                       = $collection->count();
-        $attachments                                                 = $collection->slice($offset, $limit);
+        $collection                                               = $this->repository->get();
+        $count                                                    = $collection->count();
+        $attachments                                              = $collection->slice($offset, $limit);
 
         // make paginator:
-        $paginator                                                   = new LengthAwarePaginator($attachments, $count, $limit, $page);
+        $paginator                                                = new LengthAwarePaginator($attachments, $count, $limit, $page);
         $paginator->setPath(route('api.v1.attachments.index').$this->buildParams());
 
         /** @var AttachmentTransformer $transformer */
-        $transformer                                                 = app(AttachmentTransformer::class);
+        $transformer                                              = app(AttachmentTransformer::class);
 
-        $resource                                                    = new FractalCollection($attachments, $transformer, 'attachments');
+        $resource                                                 = new FractalCollection($attachments, $transformer, 'attachments');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);

app/Api/V1/Controllers/Models/AvailableBudget/ShowController.php

@@ -68,29 +68,29 @@ final class ShowController extends Controller
      */
     public function index(PaginationDateRangeRequest $request): JsonResponse
     {
-        $manager                                                                                           = $this->getManager();
-        ['limit'  => $limit, 'offset' => $offset, 'page'   => $page, 'start'  => $start, 'end'    => $end] = $request->attributes->all();
+        $manager                                                                                    = $this->getManager();
+        ['limit' => $limit, 'offset' => $offset, 'page' => $page, 'start' => $start, 'end' => $end] = $request->attributes->all();
 
         // get list of available budgets. Count it and split it.
-        $collection                                                                                        = $this->abRepository->getAvailableBudgetsByDate($start, $end);
-        $count                                                                                             = $collection->count();
-        $availableBudgets                                                                                  = $collection->slice($offset, $limit);
+        $collection                                                                                 = $this->abRepository->getAvailableBudgetsByDate($start, $end);
+        $count                                                                                      = $collection->count();
+        $availableBudgets                                                                           = $collection->slice($offset, $limit);
 
         // enrich
         /** @var User $admin */
-        $admin                                                                                             = auth()->user();
-        $enrichment                                                                                        = new AvailableBudgetEnrichment();
+        $admin                                                                                      = auth()->user();
+        $enrichment                                                                                 = new AvailableBudgetEnrichment();
         $enrichment->setUser($admin);
-        $availableBudgets                                                                                  = $enrichment->enrich($availableBudgets);
+        $availableBudgets                                                                           = $enrichment->enrich($availableBudgets);
 
         // make paginator:
-        $paginator                                                                                         = new LengthAwarePaginator($availableBudgets, $count, $limit, $page);
+        $paginator                                                                                  = new LengthAwarePaginator($availableBudgets, $count, $limit, $page);
         $paginator->setPath(route('api.v1.available-budgets.index').$this->buildParams());
 
         /** @var AvailableBudgetTransformer $transformer */
-        $transformer                                                                                       = app(AvailableBudgetTransformer::class);
+        $transformer                                                                                = app(AvailableBudgetTransformer::class);
 
-        $resource                                                                                          = new FractalCollection($availableBudgets, $transformer, 'available_budgets');
+        $resource                                                                                   = new FractalCollection($availableBudgets, $transformer, 'available_budgets');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);

app/Api/V1/Controllers/Models/Bill/ListController.php

@@ -72,21 +72,21 @@ final class ListController extends Controller
      */
     public function attachments(PaginationRequest $request, Bill $bill): JsonResponse
     {
-        ['limit'  => $limit, 'offset' => $offset, 'page'   => $page] = $request->attributes->all();
-        $manager                                                     = $this->getManager();
-        $collection                                                  = $this->repository->getAttachments($bill);
+        ['limit' => $limit, 'offset' => $offset, 'page' => $page] = $request->attributes->all();
+        $manager                                                  = $this->getManager();
+        $collection                                               = $this->repository->getAttachments($bill);
 
-        $count                                                       = $collection->count();
-        $attachments                                                 = $collection->slice($offset, $limit);
+        $count                                                    = $collection->count();
+        $attachments                                              = $collection->slice($offset, $limit);
 
         // make paginator:
-        $paginator                                                   = new LengthAwarePaginator($attachments, $count, $limit, $page);
+        $paginator                                                = new LengthAwarePaginator($attachments, $count, $limit, $page);
         $paginator->setPath(route('api.v1.bills.attachments', [$bill->id]).$this->buildParams());
 
         /** @var AttachmentTransformer $transformer */
-        $transformer                                                 = app(AttachmentTransformer::class);
+        $transformer                                              = app(AttachmentTransformer::class);
 
-        $resource                                                    = new FractalCollection($attachments, $transformer, 'attachments');
+        $resource                                                 = new FractalCollection($attachments, $transformer, 'attachments');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
@@ -100,20 +100,20 @@ final class ListController extends Controller
      */
     public function rules(PaginationRequest $request, Bill $bill): JsonResponse
     {
-        ['limit'  => $limit, 'offset' => $offset, 'page'   => $page] = $request->attributes->all();
+        ['limit' => $limit, 'offset' => $offset, 'page' => $page] = $request->attributes->all();
 
-        $manager                                                     = $this->getManager();
-        $collection                                                  = $this->repository->getRulesForBill($bill);
-        $count                                                       = $collection->count();
-        $rules                                                       = $collection->slice($offset, $limit);
+        $manager                                                  = $this->getManager();
+        $collection                                               = $this->repository->getRulesForBill($bill);
+        $count                                                    = $collection->count();
+        $rules                                                    = $collection->slice($offset, $limit);
 
         // make paginator:
-        $paginator                                                   = new LengthAwarePaginator($rules, $count, $limit, $page);
+        $paginator                                                = new LengthAwarePaginator($rules, $count, $limit, $page);
         $paginator->setPath(route('api.v1.bills.rules', [$bill->id]).$this->buildParams());
 
         /** @var RuleTransformer $transformer */
-        $transformer                                                 = app(RuleTransformer::class);
-        $resource                                                    = new FractalCollection($rules, $transformer, 'rules');
+        $transformer                                              = app(RuleTransformer::class);
+        $resource                                                 = new FractalCollection($rules, $transformer, 'rules');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
@@ -127,16 +127,16 @@ final class ListController extends Controller
      */
     public function transactions(PaginationDateRangeRequest $request, Bill $bill): JsonResponse
     {
-        ['limit' => $limit, 'page'  => $page, 'types' => $types, 'start' => $start, 'end'   => $end] = $request->attributes->all();
+        ['limit' => $limit, 'page' => $page, 'types' => $types, 'start' => $start, 'end' => $end] = $request->attributes->all();
 
-        $manager                                                                                     = $this->getManager();
+        $manager                                                                                  = $this->getManager();
 
         /** @var User $admin */
-        $admin                                                                                       = auth()->user();
+        $admin                                                                                    = auth()->user();
 
         // use new group collector:
         /** @var GroupCollectorInterface $collector */
-        $collector                                                                                   = app(GroupCollectorInterface::class);
+        $collector                                                                                = app(GroupCollectorInterface::class);
         $collector
             ->setUser($admin)
             // include source + destination account name and type.
@@ -159,18 +159,18 @@ final class ListController extends Controller
         }
 
         // get paginator.
-        $paginator                                                                                   = $collector->getPaginatedGroups();
+        $paginator                                                                                = $collector->getPaginatedGroups();
         $paginator->setPath(route('api.v1.bills.transactions', [$bill->id]).$this->buildParams());
 
         // enrich
-        $enrichment                                                                                  = new TransactionGroupEnrichment();
+        $enrichment                                                                               = new TransactionGroupEnrichment();
         $enrichment->setUser($admin);
-        $transactions                                                                                = $enrichment->enrich($paginator->getCollection());
+        $transactions                                                                             = $enrichment->enrich($paginator->getCollection());
 
         /** @var TransactionGroupTransformer $transformer */
-        $transformer                                                                                 = app(TransactionGroupTransformer::class);
+        $transformer                                                                              = app(TransactionGroupTransformer::class);
 
-        $resource                                                                                    = new FractalCollection($transactions, $transformer, 'transactions');
+        $resource                                                                                 = new FractalCollection($transactions, $transformer, 'transactions');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);

app/Api/V1/Controllers/Models/Bill/ShowController.php

@@ -67,28 +67,28 @@ final class ShowController extends Controller
      */
     public function index(PaginationDateRangeRequest $request): JsonResponse
     {
-        ['limit'  => $limit, 'offset' => $offset, 'start'  => $start, 'end'    => $end, 'page'   => $page] = $request->attributes->all();
+        ['limit' => $limit, 'offset' => $offset, 'start' => $start, 'end' => $end, 'page' => $page] = $request->attributes->all();
 
         $this->repository->correctOrder();
-        $bills                                                                                             = $this->repository->getBills();
-        $manager                                                                                           = $this->getManager();
-        $count                                                                                             = $bills->count();
-        $bills                                                                                             = $bills->slice($offset, $limit);
-        $paginator                                                                                         = new LengthAwarePaginator($bills, $count, $limit, $page);
+        $bills                                                                                      = $this->repository->getBills();
+        $manager                                                                                    = $this->getManager();
+        $count                                                                                      = $bills->count();
+        $bills                                                                                      = $bills->slice($offset, $limit);
+        $paginator                                                                                  = new LengthAwarePaginator($bills, $count, $limit, $page);
 
         // enrich
         /** @var User $admin */
-        $admin                                                                                             = auth()->user();
-        $enrichment                                                                                        = new SubscriptionEnrichment();
+        $admin                                                                                      = auth()->user();
+        $enrichment                                                                                 = new SubscriptionEnrichment();
         $enrichment->setUser($admin);
         $enrichment->setStart($start);
         $enrichment->setEnd($end);
-        $bills                                                                                             = $enrichment->enrich($bills);
+        $bills                                                                                      = $enrichment->enrich($bills);
 
         /** @var BillTransformer $transformer */
-        $transformer                                                                                       = app(BillTransformer::class);
+        $transformer                                                                                = app(BillTransformer::class);
 
-        $resource                                                                                          = new FractalCollection($bills, $transformer, 'bills');
+        $resource                                                                                   = new FractalCollection($bills, $transformer, 'bills');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
@@ -102,23 +102,23 @@ final class ShowController extends Controller
      */
     public function show(DateRangeRequest $request, Bill $bill): JsonResponse
     {
-        ['start' => $start, 'end'   => $end] = $request->attributes->all();
+        ['start' => $start, 'end' => $end] = $request->attributes->all();
 
-        $manager                             = $this->getManager();
+        $manager                           = $this->getManager();
 
         // enrich
         /** @var User $admin */
-        $admin                               = auth()->user();
-        $enrichment                          = new SubscriptionEnrichment();
+        $admin                             = auth()->user();
+        $enrichment                        = new SubscriptionEnrichment();
         $enrichment->setUser($admin);
         $enrichment->setStart($start);
         $enrichment->setEnd($end);
-        $bill                                = $enrichment->enrichSingle($bill);
+        $bill                              = $enrichment->enrichSingle($bill);
 
         /** @var BillTransformer $transformer */
-        $transformer                         = app(BillTransformer::class);
+        $transformer                       = app(BillTransformer::class);
 
-        $resource                            = new Item($bill, $transformer, 'bills');
+        $resource                          = new Item($bill, $transformer, 'bills');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }

app/Api/V1/Controllers/Models/Bill/StoreController.php

@@ -83,7 +83,6 @@ final class StoreController extends Controller
 
         /** @var BillTransformer $transformer */
         $transformer = app(BillTransformer::class);
-        $transformer->setParameters($this->parameters);
 
         $resource    = new Item($bill, $transformer, 'bills');
 

app/Api/V1/Controllers/Models/BudgetLimit/ShowController.php

@@ -25,7 +25,7 @@ declare(strict_types=1);
 namespace FireflyIII\Api\V1\Controllers\Models\BudgetLimit;
 
 use FireflyIII\Api\V1\Controllers\Controller;
-use FireflyIII\Api\V1\Requests\Data\SameDateRequest;
+use FireflyIII\Api\V1\Requests\DateRangeRequest;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Budget;
 use FireflyIII\Models\BudgetLimit;
@@ -118,12 +118,12 @@ final class ShowController extends Controller
      *
      * @SuppressWarnings("PHPMD.UnusedFormalParameter")
      */
-    public function indexAll(SameDateRequest $request): JsonResponse
+    public function indexAll(DateRangeRequest $request): JsonResponse
     {
         $manager      = $this->getManager();
         $manager->parseIncludes('budget');
         $pageSize     = $this->parameters->get('limit');
-        $collection   = $this->blRepository->getAllBudgetLimits($this->parameters->get('start'), $this->parameters->get('end'));
+        $collection   = $this->blRepository->getAllBudgetLimits($request->attributes->get('start'), $request->attributes->get('end'));
         $count        = $collection->count();
         $budgetLimits = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
         $paginator    = new LengthAwarePaginator($budgetLimits, $count, $pageSize, $this->parameters->get('page'));

app/Api/V1/Controllers/Models/Recurrence/TriggerController.php

@@ -25,7 +25,7 @@ declare(strict_types=1);
 namespace FireflyIII\Api\V1\Controllers\Models\Recurrence;
 
 use FireflyIII\Api\V1\Controllers\Controller;
-use FireflyIII\Api\V1\Requests\Generic\SingleDateRequest;
+use FireflyIII\Api\V1\Requests\DateRequest;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Jobs\CreateRecurringTransactions;
 use FireflyIII\Models\Recurrence;
@@ -59,12 +59,12 @@ final class TriggerController extends Controller
         });
     }
 
-    public function trigger(SingleDateRequest $request, Recurrence $recurrence): JsonResponse
+    public function trigger(DateRequest $request, Recurrence $recurrence): JsonResponse
     {
         // find recurrence occurrence for this date and trigger it.
         // grab the date from the last time the recurrence fired:
         $backupDate   = $recurrence->latest_date;
-        $date         = $request->getDate();
+        $date         = $request->attributes->get('date');
 
         // fire the recurring cron job on the given date, then post-date the created transaction.
         Log::info(sprintf('Trigger: will now fire recurring cron job task for date "%s".', $date->format('Y-m-d H:i:s')));

app/Api/V1/Controllers/Models/Rule/TriggerController.php

@@ -78,15 +78,15 @@ final class TriggerController extends Controller
         // overrule the rule(s) if necessary.
         if (array_key_exists('start', $parameters) && null !== $parameters['start']) {
             // add a range:
-            $ruleEngine->addOperator(['type'  => 'date_after', 'value' => $parameters['start']->format('Y-m-d')]);
+            $ruleEngine->addOperator(['type' => 'date_after', 'value' => $parameters['start']->format('Y-m-d')]);
         }
 
         if (array_key_exists('end', $parameters) && null !== $parameters['end']) {
             // add a range:
-            $ruleEngine->addOperator(['type'  => 'date_before', 'value' => $parameters['end']->format('Y-m-d')]);
+            $ruleEngine->addOperator(['type' => 'date_before', 'value' => $parameters['end']->format('Y-m-d')]);
         }
         if (array_key_exists('accounts', $parameters) && '' !== $parameters['accounts']) {
-            $ruleEngine->addOperator(['type'  => 'account_id', 'value' => implode(',', $parameters['accounts'])]);
+            $ruleEngine->addOperator(['type' => 'account_id', 'value' => implode(',', $parameters['accounts'])]);
         }
 
         // file the rule(s)
@@ -132,15 +132,15 @@ final class TriggerController extends Controller
         // overrule the rule(s) if necessary.
         if (array_key_exists('start', $parameters) && null !== $parameters['start']) {
             // add a range:
-            $ruleEngine->addOperator(['type'  => 'date_after', 'value' => $parameters['start']->format('Y-m-d')]);
+            $ruleEngine->addOperator(['type' => 'date_after', 'value' => $parameters['start']->format('Y-m-d')]);
         }
 
         if (array_key_exists('end', $parameters) && null !== $parameters['end']) {
             // add a range:
-            $ruleEngine->addOperator(['type'  => 'date_before', 'value' => $parameters['end']->format('Y-m-d')]);
+            $ruleEngine->addOperator(['type' => 'date_before', 'value' => $parameters['end']->format('Y-m-d')]);
         }
         if (array_key_exists('accounts', $parameters) && is_array($parameters['accounts']) && count($parameters['accounts']) > 0) {
-            $ruleEngine->addOperator(['type'  => 'account_id', 'value' => implode(',', $parameters['accounts'])]);
+            $ruleEngine->addOperator(['type' => 'account_id', 'value' => implode(',', $parameters['accounts'])]);
         }
 
         // fire the rule(s)

app/Api/V1/Controllers/Models/RuleGroup/TriggerController.php

@@ -85,15 +85,15 @@ final class TriggerController extends Controller
         // overrule the rule(s) if necessary.
         if (array_key_exists('start', $parameters) && null !== $parameters['start']) {
             // add a range:
-            $ruleEngine->addOperator(['type'  => 'date_after', 'value' => $parameters['start']->format('Y-m-d')]);
+            $ruleEngine->addOperator(['type' => 'date_after', 'value' => $parameters['start']->format('Y-m-d')]);
         }
 
         if (array_key_exists('end', $parameters) && null !== $parameters['end']) {
             // add a range:
-            $ruleEngine->addOperator(['type'  => 'date_before', 'value' => $parameters['end']->format('Y-m-d')]);
+            $ruleEngine->addOperator(['type' => 'date_before', 'value' => $parameters['end']->format('Y-m-d')]);
         }
         if (array_key_exists('accounts', $parameters) && '' !== $parameters['accounts']) {
-            $ruleEngine->addOperator(['type'  => 'account_id', 'value' => implode(',', $parameters['accounts'])]);
+            $ruleEngine->addOperator(['type' => 'account_id', 'value' => implode(',', $parameters['accounts'])]);
         }
 
         // file the rule(s)
@@ -146,15 +146,15 @@ final class TriggerController extends Controller
         // overrule the rule(s) if necessary.
         if (array_key_exists('start', $parameters) && null !== $parameters['start']) {
             // add a range:
-            $ruleEngine->addOperator(['type'  => 'date_after', 'value' => $parameters['start']->format('Y-m-d')]);
+            $ruleEngine->addOperator(['type' => 'date_after', 'value' => $parameters['start']->format('Y-m-d')]);
         }
 
         if (array_key_exists('end', $parameters) && null !== $parameters['end']) {
             // add a range:
-            $ruleEngine->addOperator(['type'  => 'date_before', 'value' => $parameters['end']->format('Y-m-d')]);
+            $ruleEngine->addOperator(['type' => 'date_before', 'value' => $parameters['end']->format('Y-m-d')]);
         }
         if (array_key_exists('accounts', $parameters) && is_array($parameters['accounts']) && count($parameters['accounts']) > 0) {
-            $ruleEngine->addOperator(['type'  => 'account_id', 'value' => implode(',', $parameters['accounts'])]);
+            $ruleEngine->addOperator(['type' => 'account_id', 'value' => implode(',', $parameters['accounts'])]);
         }
 
         // file the rule(s)

app/Api/V1/Controllers/Models/Transaction/UpdateController.php

@@ -48,6 +48,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 final class UpdateController extends Controller
 {
     private TransactionGroupRepositoryInterface $groupRepository;
+    protected array $acceptedRoles = [];
 
     /**
      * TransactionController constructor.

app/Api/V1/Controllers/Models/TransactionCurrency/ListController.php

@@ -256,7 +256,7 @@ final class ListController extends Controller
         $unfiltered     = $recurringRepos->get();
 
         // filter selection
-        $collection     = $unfiltered->filter(static function (Recurrence $recurrence) use ($currency): null|Recurrence { // @phpstan-ignore-line
+        $collection     = $unfiltered->filter(static function (Recurrence $recurrence) use ($currency): null|Recurrence {
             if (array_any(
                 $recurrence->recurrenceTransactions,
                 static fn ($transaction): bool => $transaction->transaction_currency_id === $currency->id || $transaction->foreign_currency_id === $currency->id
@@ -306,7 +306,7 @@ final class ListController extends Controller
         $ruleRepos   = app(RuleRepositoryInterface::class);
         $unfiltered  = $ruleRepos->getAll();
 
-        $collection  = $unfiltered->filter(static function (Rule $rule) use ($currency): null|Rule { // @phpstan-ignore-line
+        $collection  = $unfiltered->filter(static function (Rule $rule) use ($currency): null|Rule {
             if (array_any(
                 $rule->ruleTriggers,
                 static fn ($trigger): bool => 'currency_is' === $trigger->trigger_type && $currency->name === $trigger->trigger_value

app/Api/V1/Controllers/Models/UserGroup/IndexController.php

@@ -52,12 +52,12 @@ final class IndexController extends Controller
 
     public function index(PaginationRequest $request): JsonResponse
     {
-        $administrations                                             = $this->repository->get();
-        ['page'   => $page, 'limit'  => $limit, 'offset' => $offset] = $request->attributes->all();
-        $count                                                       = $administrations->count();
-        $administrations                                             = $administrations->slice($offset, $limit);
-        $paginator                                                   = new LengthAwarePaginator($administrations, $count, $limit, $page);
-        $transformer                                                 = new UserGroupTransformer();
+        $administrations                                          = $this->repository->get();
+        ['page' => $page, 'limit' => $limit, 'offset' => $offset] = $request->attributes->all();
+        $count                                                    = $administrations->count();
+        $administrations                                          = $administrations->slice($offset, $limit);
+        $paginator                                                = new LengthAwarePaginator($administrations, $count, $limit, $page);
+        $transformer                                              = new UserGroupTransformer();
 
         return response()->json($this->jsonApiList(self::RESOURCE_KEY, $paginator, $transformer))->header('Content-Type', self::CONTENT_TYPE);
     }

app/Api/V1/Controllers/Search/TransactionController.php

@@ -68,7 +68,7 @@ final class TransactionController extends Controller
         $description    = (string) $request->attributes->get('description');
         Log::debug(sprintf('Include deleted? %s', var_export($includeDeleted, true)));
         if ('' !== $externalId) {
-            $count += $this->repository->countByMeta('external_identifier', $externalId, $includeDeleted);
+            $count += $this->repository->countByMeta('external_id', $externalId, $includeDeleted);
             Log::debug(sprintf('Search for transactions with external_identifier "%s", count is now %d', $externalId, $count));
         }
         if ('' !== $internalRef) {

app/Api/V1/Controllers/Summary/BasicController.php

@@ -89,20 +89,20 @@ final class BasicController extends Controller
     public function basic(BasicRequest $request): JsonResponse
     {
         // parameters for boxes:
-        ['start' => $start, 'end'   => $end, 'code'  => $code] = $request->attributes->all();
+        ['start' => $start, 'end' => $end, 'code' => $code] = $request->attributes->all();
         // balance information:
-        $balanceData                                           = $this->getBalanceInformation($start, $end);
-        $billData                                              = $this->getSubscriptionInformation($start, $end);
-        $spentData                                             = $this->getLeftToSpendInfo($start, $end);
-        $netWorthData                                          = $this->getNetWorthInfo($end);
+        $balanceData                                        = $this->getBalanceInformation($start, $end);
+        $billData                                           = $this->getSubscriptionInformation($start, $end);
+        $spentData                                          = $this->getLeftToSpendInfo($start, $end);
+        $netWorthData                                       = $this->getNetWorthInfo($end);
         //                        $balanceData  = [];
         //                        $billData     = [];
         //                $spentData    = [];
         //                        $netWorthData = [];
-        $total                                                 = array_merge($balanceData, $billData, $spentData, $netWorthData);
+        $total                                              = array_merge($balanceData, $billData, $spentData, $netWorthData);
 
         // give new keys
-        $return                                                = [];
+        $return                                             = [];
         foreach ($total as $entry) {
             if ('' === $code || $code === $entry['currency_code']) {
                 $return[$entry['key']] = $entry;
@@ -112,19 +112,6 @@ final class BasicController extends Controller
         return response()->json($return);
     }
 
-    /**
-     * Check if date is outside session range.
-     */
-    protected function notInDateRange(Carbon $date, Carbon $start, Carbon $end): bool
-    { // Validate a preference
-        if ($start->greaterThanOrEqualTo($date) && $end->greaterThanOrEqualTo($date)) {
-            return true;
-        }
-
-        // start and end in the past? use $end
-        return $start->lessThanOrEqualTo($date) && $end->lessThanOrEqualTo($date);
-    }
-
     private function getBalanceInformation(Carbon $start, Carbon $end): array
     {
         Log::debug('getBalanceInformation');

app/Api/V1/Controllers/System/BatchController.php

@@ -62,7 +62,7 @@ final class BatchController extends Controller
         }
         Log::debug(sprintf('Counted %d journals.', count($journals)));
 
-        /** @var TransactionJournal $first */
+        /** @var null|TransactionJournal $first */
         $first             = $journals->first();
         $group             = $first?->transactionGroup;
         if (null === $group) {

app/Api/V1/Requests/AggregateFormRequest.php

@@ -32,9 +32,11 @@ use RuntimeException;
 abstract class AggregateFormRequest extends ApiRequest
 {
     /**
-     * @var ApiRequest[]
+     * @var Request[]
      */
-    protected array $requests = [];
+    protected array $requests      = [];
+
+    protected array $acceptedRoles = [];
 
     #[Override]
     public function initialize(

app/Api/V1/Requests/ApiRequest.php

@@ -32,7 +32,9 @@ class ApiRequest extends FormRequest
     use ChecksLogin;
     use ConvertsDataTypes;
 
-    protected string $required = '';
+    protected array $acceptedRoles = [];
+
+    protected string $required     = '';
 
     public function handleConfig(array $config): void
     {

app/Api/V1/Requests/Autocomplete/AutocompleteRequest.php

@@ -39,6 +39,8 @@ class AutocompleteRequest extends FormRequest
     use ChecksLogin;
     use ConvertsDataTypes;
 
+    protected array $acceptedRoles = [];
+
     public function getData(): array
     {
         $types = $this->convertString('types');
@@ -52,7 +54,7 @@ class AutocompleteRequest extends FormRequest
 
         $date  = $this->getCarbonDate('date') ?? today(config('app.timezone'));
 
-        return ['types' => $array, 'query' => $this->convertString('query'), 'date'  => $date->endOfDay()];
+        return ['types' => $array, 'query' => $this->convertString('query'), 'date' => $date->endOfDay()];
     }
 
     public function rules(): array

app/Api/V1/Requests/Data/Bulk/MoveTransactionsRequest.php

@@ -39,9 +39,11 @@ class MoveTransactionsRequest extends FormRequest
     use ChecksLogin;
     use ConvertsDataTypes;
 
+    protected array $acceptedRoles = [];
+
     public function getAll(): array
     {
-        return ['original_account'    => $this->convertInteger('original_account'), 'destination_account' => $this->convertInteger('destination_account')];
+        return ['original_account' => $this->convertInteger('original_account'), 'destination_account' => $this->convertInteger('destination_account')];
     }
 
     /**

app/Api/V1/Requests/Data/Bulk/TransactionRequest.php

@@ -45,6 +45,8 @@ class TransactionRequest extends FormRequest
     use ConvertsDataTypes;
     use ValidatesBulkTransactionQuery;
 
+    protected array $acceptedRoles = [];
+
     public function getAll(): array
     {
         $data = [];

app/Api/V1/Requests/Data/DestroyRequest.php

@@ -36,6 +36,8 @@ class DestroyRequest extends FormRequest
     use ChecksLogin;
     use ConvertsDataTypes;
 
+    protected array $acceptedRoles = [];
+
     /**
      * Get all data from the request.
      */
@@ -54,6 +56,6 @@ class DestroyRequest extends FormRequest
             .',accounts,asset_accounts,expense_accounts,revenue_accounts,liabilities,transactions,withdrawals,deposits,transfers'
             .',not_assets_liabilities';
 
-        return ['objects' => sprintf('required|max:255|min:1|string|in:%s', $valid), 'unused'  => 'in:true,false'];
+        return ['objects' => sprintf('required|max:255|min:1|string|in:%s', $valid), 'unused' => 'in:true,false'];
     }
 }

app/Api/V1/Requests/Data/Export/ExportRequest.php

@@ -39,6 +39,8 @@ class ExportRequest extends FormRequest
     use ChecksLogin;
     use ConvertsDataTypes;
 
+    protected array $acceptedRoles = [];
+
     public function getAll(): array
     {
         $result             = [
@@ -70,6 +72,6 @@ class ExportRequest extends FormRequest
      */
     public function rules(): array
     {
-        return ['type'     => 'in:csv', 'accounts' => 'min:1|max:32768', 'start'    => 'date|before:end', 'end'      => 'date|after:start'];
+        return ['type' => 'in:csv', 'accounts' => 'min:1|max:32768', 'start' => 'date|before:end', 'end' => 'date|after:start'];
     }
 }

app/Api/V1/Requests/Data/SameDateRequest.php

@@ -40,12 +40,14 @@ class SameDateRequest extends FormRequest
     use ChecksLogin;
     use ConvertsDataTypes;
 
+    protected array $acceptedRoles = [];
+
     /**
      * Get all data from the request.
      */
     public function getAll(): array
     {
-        return ['start' => $this->getCarbonDate('start'), 'end'   => $this->getCarbonDate('end')];
+        return ['start' => $this->getCarbonDate('start'), 'end' => $this->getCarbonDate('end')];
     }
 
     /**
@@ -53,6 +55,6 @@ class SameDateRequest extends FormRequest
      */
     public function rules(): array
     {
-        return ['start' => 'required|date', 'end'   => 'required|date|after_or_equal:start'];
+        return ['start' => 'required|date', 'end' => 'required|date|after_or_equal:start'];
     }
 }

app/Api/V1/Requests/DateRangeRequest.php

@@ -38,7 +38,7 @@ class DateRangeRequest extends ApiRequest
     public function withValidator(Validator $validator): void
     {
         $validator->after(function (Validator $validator): void {
-            if ($validator->failed()) {
+            if (count($validator->failed()) > 0) {
                 return;
             }
             $start = $this->getCarbonDate('start')?->startOfDay();

app/Api/V1/Requests/DateRequest.php

@@ -36,7 +36,7 @@ class DateRequest extends ApiRequest
     public function withValidator(Validator $validator): void
     {
         $validator->after(function (Validator $validator): void {
-            if ($validator->failed()) {
+            if (count($validator->failed()) > 0) {
                 return;
             }
             $date  = $this->getCarbonDate('date')?->endOfDay();

app/Api/V1/Requests/Generic/ObjectTypeApiRequest.php

@@ -50,7 +50,7 @@ class ObjectTypeApiRequest extends ApiRequest
 
         $this->objectType = $config['object_type'] ?? null;
 
-        if (!$this->objectType) {
+        if (null === $this->objectType) {
             throw new RuntimeException('ObjectTypeApiRequest requires a object_type config');
         }
     }
@@ -75,7 +75,7 @@ class ObjectTypeApiRequest extends ApiRequest
     public function withValidator(Validator $validator): void
     {
         $validator->after(function (Validator $validator): void {
-            if ($validator->failed()) {
+            if (count($validator->failed()) > 0) {
                 return;
             }
             $type = $this->convertString('types', 'all');

app/Api/V1/Requests/Generic/QueryRequest.php

@@ -42,7 +42,7 @@ class QueryRequest extends ApiRequest
     public function withValidator(Validator $validator): void
     {
         $validator->after(function (Validator $validator): void {
-            if ($validator->failed()) {
+            if (count($validator->failed()) > 0) {
                 return;
             }
             $query = $this->convertString('query');

app/Api/V1/Requests/Generic/SingleDateRequest.php

@@ -41,6 +41,8 @@ class SingleDateRequest extends FormRequest
     use ChecksLogin;
     use ConvertsDataTypes;
 
+    protected array $acceptedRoles = [];
+
     /**
      * Get all data from the request.
      */

app/Api/V1/Requests/Insight/GenericRequest.php

@@ -45,6 +45,8 @@ class GenericRequest extends FormRequest
     use ChecksLogin;
     use ConvertsDataTypes;
 
+    protected array $acceptedRoles = [];
+
     private Collection $accounts;
     private Collection $bills;
     private Collection $budgets;
@@ -56,7 +58,7 @@ class GenericRequest extends FormRequest
      */
     public function getAll(): array
     {
-        return ['start' => $this->getCarbonDate('start'), 'end'   => $this->getCarbonDate('end')];
+        return ['start' => $this->getCarbonDate('start'), 'end' => $this->getCarbonDate('end')];
     }
 
     public function getAssetAccounts(): Collection
@@ -167,7 +169,7 @@ class GenericRequest extends FormRequest
         $this->bills      = new Collection();
         $this->tags       = new Collection();
 
-        return ['start' => 'required|date', 'end'   => 'required|date|after_or_equal:start'];
+        return ['start' => 'required|date', 'end' => 'required|date|after_or_equal:start'];
     }
 
     private function parseAccounts(): void

app/Api/V1/Requests/Models/Account/AccountTypeApiRequest.php

@@ -40,12 +40,12 @@ class AccountTypeApiRequest extends ApiRequest
     public function withValidator(Validator $validator): void
     {
         $validator->after(function (Validator $validator): void {
-            if ($validator->failed()) {
+            if (count($validator->failed()) > 0) {
                 return;
             }
 
             $type = $this->convertString('type', 'all');
-            $this->attributes->add(['type'  => $type, 'types' => $this->mapAccountTypes($type)]);
+            $this->attributes->add(['type' => $type, 'types' => $this->mapAccountTypes($type)]);
         });
     }
 }

app/Api/V1/Requests/Models/Account/AccountTypesApiRequest.php

@@ -42,7 +42,7 @@ class AccountTypesApiRequest extends ApiRequest
     public function withValidator(Validator $validator): void
     {
         $validator->after(function (Validator $validator): void {
-            if ($validator->failed()) {
+            if (count($validator->failed()) > 0) {
                 return;
             }
             $types  = explode(',', $this->convertString('types', 'all'));

app/Api/V1/Requests/Models/Account/StoreRequest.php

@@ -43,6 +43,8 @@ class StoreRequest extends FormRequest
     use ChecksLogin;
     use ConvertsDataTypes;
 
+    protected array $acceptedRoles = [];
+
     public function getAllAccountData(): array
     {
         $active          = true;

app/Api/V1/Requests/Models/Account/UpdateRequest.php

@@ -46,6 +46,8 @@ class UpdateRequest extends FormRequest
     use ChecksLogin;
     use ConvertsDataTypes;
 
+    protected array $acceptedRoles = [];
+
     public function getUpdateData(): array
     {
         $fields = [

app/Api/V1/Requests/Models/Attachment/StoreRequest.php

@@ -37,6 +37,8 @@ class StoreRequest extends FormRequest
     use ChecksLogin;
     use ConvertsDataTypes;
 
+    protected array $acceptedRoles = [];
+
     /**
      * Get all data from the request.
      */

app/Api/V1/Requests/Models/Attachment/UpdateRequest.php

@@ -37,6 +37,8 @@ class UpdateRequest extends FormRequest
     use ChecksLogin;
     use ConvertsDataTypes;
 
+    protected array $acceptedRoles = [];
+
     /**
      * Get all data from the request.
      */

app/Api/V1/Requests/Models/AvailableBudget/Request.php

@@ -40,6 +40,8 @@ class Request extends FormRequest
     use ChecksLogin;
     use ConvertsDataTypes;
 
+    protected array $acceptedRoles = [];
+
     /**
      * Get all data from the request.
      */

app/Api/V1/Requests/Models/Bill/StoreRequest.php

@@ -42,6 +42,8 @@ class StoreRequest extends FormRequest
     use ChecksLogin;
     use ConvertsDataTypes;
 
+    protected array $acceptedRoles = [];
+
     /**
      * Get all data from the request.
      */

app/Api/V1/Requests/Models/Bill/UpdateRequest.php

@@ -41,6 +41,8 @@ class UpdateRequest extends FormRequest
     use ChecksLogin;
     use ConvertsDataTypes;
 
+    protected array $acceptedRoles = [];
+
     /**
      * Get all data from the request.
      */

app/Api/V1/Requests/Models/Budget/StoreRequest.php

@@ -42,6 +42,8 @@ class StoreRequest extends FormRequest
     use ConvertsDataTypes;
     use ValidatesAutoBudgetRequest;
 
+    protected array $acceptedRoles = [];
+
     /**
      * Get all data from the request.
      */

app/Api/V1/Requests/Models/Budget/UpdateRequest.php

@@ -43,6 +43,8 @@ class UpdateRequest extends FormRequest
     use ConvertsDataTypes;
     use ValidatesAutoBudgetRequest;
 
+    protected array $acceptedRoles = [];
+
     /**
      * Get all data from the request.
      */
@@ -65,7 +67,7 @@ class UpdateRequest extends FormRequest
         ];
         $allData = $this->getAllData($fields);
         if (array_key_exists('auto_budget_type', $allData)) {
-            $types                       = ['none'     => 0, 'reset'    => 1, 'rollover' => 2, 'adjusted' => 3];
+            $types                       = ['none' => 0, 'reset' => 1, 'rollover' => 2, 'adjusted' => 3];
             $allData['auto_budget_type'] = $types[$allData['auto_budget_type']] ?? 0;
         }
 

app/Api/V1/Requests/Models/BudgetLimit/StoreRequest.php

@@ -26,6 +26,7 @@ namespace FireflyIII\Api\V1\Requests\Models\BudgetLimit;
 
 use Carbon\Carbon;
 use FireflyIII\Factory\TransactionCurrencyFactory;
+use FireflyIII\Models\Budget;
 use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 use FireflyIII\Rules\IsBoolean;
 use FireflyIII\Rules\IsValidPositiveAmount;
@@ -44,6 +45,8 @@ class StoreRequest extends FormRequest
     use ChecksLogin;
     use ConvertsDataTypes;
 
+    protected array $acceptedRoles = [];
+
     /**
      * Get all data from the request.
      */
@@ -85,6 +88,7 @@ class StoreRequest extends FormRequest
      */
     public function withValidator(Validator $validator): void
     {
+        /** @var Budget $budget */
         $budget = $this->route()->parameter('budget');
         $validator->after(static function (Validator $validator) use ($budget): void {
             if (0 !== count($validator->failed())) {

app/Api/V1/Requests/Models/BudgetLimit/UpdateRequest.php

@@ -41,6 +41,8 @@ class UpdateRequest extends FormRequest
     use ChecksLogin;
     use ConvertsDataTypes;
 
+    protected array $acceptedRoles = [];
+
     /**
      * Get all data from the request.
      */

app/Api/V1/Requests/Models/Category/StoreRequest.php

@@ -36,12 +36,14 @@ class StoreRequest extends FormRequest
     use ChecksLogin;
     use ConvertsDataTypes;
 
+    protected array $acceptedRoles = [];
+
     /**
      * Get all data from the request.
      */
     public function getAll(): array
     {
-        return ['name'  => $this->convertString('name'), 'notes' => $this->stringWithNewlines('notes')];
+        return ['name' => $this->convertString('name'), 'notes' => $this->stringWithNewlines('notes')];
     }
 
     /**

app/Api/V1/Requests/Models/Category/UpdateRequest.php

@@ -37,12 +37,14 @@ class UpdateRequest extends FormRequest
     use ChecksLogin;
     use ConvertsDataTypes;
 
+    protected array $acceptedRoles = [];
+
     /**
      * Get all data from the request.
      */
     public function getAll(): array
     {
-        $fields = ['name'  => ['name', 'convertString'], 'notes' => ['notes', 'stringWithNewlines']];
+        $fields = ['name' => ['name', 'convertString'], 'notes' => ['notes', 'stringWithNewlines']];
 
         return $this->getAllData($fields);
     }

app/Api/V1/Requests/Models/CurrencyExchangeRate/DestroyRequest.php

@@ -34,6 +34,8 @@ class DestroyRequest extends FormRequest
     use ChecksLogin;
     use ConvertsDataTypes;
 
+    protected array $acceptedRoles = [];
+
     public function getDate(): ?Carbon
     {
         return $this->getCarbonDate('date');

app/Api/V1/Requests/Models/CurrencyExchangeRate/StoreByCurrenciesRequest.php

@@ -36,6 +36,8 @@ class StoreByCurrenciesRequest extends FormRequest
     use ChecksLogin;
     use ConvertsDataTypes;
 
+    protected array $acceptedRoles = [];
+
     public function getAll(): array
     {
         return $this->all();

app/Api/V1/Requests/Models/CurrencyExchangeRate/StoreByDateRequest.php

@@ -37,12 +37,14 @@ class StoreByDateRequest extends FormRequest
     use ChecksLogin;
     use ConvertsDataTypes;
 
+    protected array $acceptedRoles = [];
+
     /**
      * @return array<string, mixed>
      */
     public function getAll(): array
     {
-        return ['from'  => $this->get('from'), 'rates' => $this->get('rates', [])];
+        return ['from' => $this->get('from'), 'rates' => $this->get('rates', [])];
     }
 
     public function getFromCurrency(): TransactionCurrency
@@ -57,7 +59,7 @@ class StoreByDateRequest extends FormRequest
      */
     public function rules(): array
     {
-        return ['from'    => 'required|exists:transaction_currencies,code', 'rates'   => 'required|array', 'rates.*' => 'required|numeric|min:0.0000000001'];
+        return ['from' => 'required|exists:transaction_currencies,code', 'rates' => 'required|array', 'rates.*' => 'required|numeric|min:0.0000000001'];
     }
 
     public function withValidator(Validator $validator): void

app/Api/V1/Requests/Models/CurrencyExchangeRate/StoreRequest.php

@@ -36,6 +36,8 @@ class StoreRequest extends FormRequest
     use ChecksLogin;
     use ConvertsDataTypes;
 
+    protected array $acceptedRoles = [];
+
     public function getDate(): ?Carbon
     {
         return $this->getCarbonDate('date');

app/Api/V1/Requests/Models/CurrencyExchangeRate/UpdateRequest.php

@@ -34,6 +34,8 @@ class UpdateRequest extends FormRequest
     use ChecksLogin;
     use ConvertsDataTypes;
 
+    protected array $acceptedRoles = [];
+
     public function getDate(): ?Carbon
     {
         return $this->getCarbonDate('date');

app/Api/V1/Requests/Models/ObjectGroup/UpdateRequest.php

@@ -37,6 +37,8 @@ class UpdateRequest extends FormRequest
     use ChecksLogin;
     use ConvertsDataTypes;
 
+    protected array $acceptedRoles = [];
+
     public function getUpdateData(): array
     {
         $fields = ['title' => ['title', 'convertString'], 'order' => ['order', 'convertInteger']];

app/Api/V1/Requests/Models/PiggyBank/StoreRequest.php

@@ -42,6 +42,8 @@ class StoreRequest extends FormRequest
     use ChecksLogin;
     use ConvertsDataTypes;
 
+    protected array $acceptedRoles = [];
+
     /**
      * Get all data from the request.
      */

app/Api/V1/Requests/Models/PiggyBank/UpdateRequest.php

@@ -40,6 +40,8 @@ class UpdateRequest extends FormRequest
     use ChecksLogin;
     use ConvertsDataTypes;
 
+    protected array $acceptedRoles = [];
+
     /**
      * Get all data from the request.
      */

app/Api/V1/Requests/Models/Recurrence/StoreRequest.php

@@ -49,6 +49,8 @@ class StoreRequest extends FormRequest
     use RecurrenceValidation;
     use TransactionValidation;
 
+    protected array $acceptedRoles = [];
+
     /**
      * Get all data from the request.
      */
@@ -67,7 +69,7 @@ class StoreRequest extends FormRequest
         ];
         $recurrence = $this->getAllData($fields);
 
-        return ['recurrence'   => $recurrence, 'transactions' => $this->getTransactionData(), 'repetitions'  => $this->getRepetitionData()];
+        return ['recurrence' => $recurrence, 'transactions' => $this->getTransactionData(), 'repetitions' => $this->getRepetitionData()];
     }
 
     /**

app/Api/V1/Requests/Models/Recurrence/UpdateRequest.php

@@ -50,6 +50,8 @@ class UpdateRequest extends FormRequest
     use RecurrenceValidation;
     use TransactionValidation;
 
+    protected array $acceptedRoles = [];
+
     /**
      * Get all data from the request.
      */

app/Api/V1/Requests/Models/Rule/StoreRequest.php

@@ -42,6 +42,8 @@ class StoreRequest extends FormRequest
     use ConvertsDataTypes;
     use GetRuleConfiguration;
 
+    protected array $acceptedRoles = [];
+
     /**
      * Get all data from the request.
      */

app/Api/V1/Requests/Models/Rule/TestRequest.php

@@ -37,9 +37,11 @@ class TestRequest extends FormRequest
     use ChecksLogin;
     use ConvertsDataTypes;
 
+    protected array $acceptedRoles = [];
+
     public function getTestParameters(): array
     {
-        return ['page'     => $this->getPage(), 'start'    => $this->getDate('start'), 'end'      => $this->getDate('end'), 'accounts' => $this->getAccounts()];
+        return ['page' => $this->getPage(), 'start' => $this->getDate('start'), 'end' => $this->getDate('end'), 'accounts' => $this->getAccounts()];
     }
 
     public function rules(): array

app/Api/V1/Requests/Models/Rule/TriggerRequest.php

@@ -37,9 +37,11 @@ class TriggerRequest extends FormRequest
     use ChecksLogin;
     use ConvertsDataTypes;
 
+    protected array $acceptedRoles = [];
+
     public function getTriggerParameters(): array
     {
-        return ['start'    => $this->getDate('start'), 'end'      => $this->getDate('end'), 'accounts' => $this->getAccounts()];
+        return ['start' => $this->getDate('start'), 'end' => $this->getDate('end'), 'accounts' => $this->getAccounts()];
     }
 
     public function rules(): array

app/Api/V1/Requests/Models/Rule/UpdateRequest.php

@@ -43,6 +43,8 @@ class UpdateRequest extends FormRequest
     use ConvertsDataTypes;
     use GetRuleConfiguration;
 
+    protected array $acceptedRoles = [];
+
     /**
      * Get all data from the request.
      */

app/Api/V1/Requests/Models/Rule/ValidateExpressionRequest.php

@@ -35,6 +35,8 @@ class ValidateExpressionRequest extends FormRequest
 {
     use ChecksLogin;
 
+    protected array $acceptedRoles = [];
+
     public function rules(): array
     {
         return ['expression' => ['required', new IsValidActionExpression()]];

app/Api/V1/Requests/Models/RuleGroup/StoreRequest.php

@@ -37,6 +37,8 @@ class StoreRequest extends FormRequest
     use ChecksLogin;
     use ConvertsDataTypes;
 
+    protected array $acceptedRoles = [];
+
     /**
      * Get all data from the request.
      */

app/Api/V1/Requests/Models/RuleGroup/TestRequest.php

@@ -37,9 +37,11 @@ class TestRequest extends FormRequest
     use ChecksLogin;
     use ConvertsDataTypes;
 
+    protected array $acceptedRoles = [];
+
     public function getTestParameters(): array
     {
-        return ['start'    => $this->getDate('start'), 'end'      => $this->getDate('end'), 'accounts' => $this->getAccounts()];
+        return ['start' => $this->getDate('start'), 'end' => $this->getDate('end'), 'accounts' => $this->getAccounts()];
     }
 
     public function rules(): array

app/Api/V1/Requests/Models/RuleGroup/TriggerRequest.php

@@ -37,14 +37,16 @@ class TriggerRequest extends FormRequest
     use ChecksLogin;
     use ConvertsDataTypes;
 
+    protected array $acceptedRoles = [];
+
     public function getTriggerParameters(): array
     {
-        return ['start'    => $this->getDate('start'), 'end'      => $this->getDate('end'), 'accounts' => $this->getAccounts()];
+        return ['start' => $this->getDate('start'), 'end' => $this->getDate('end'), 'accounts' => $this->getAccounts()];
     }
 
     public function rules(): array
     {
-        return ['start' => 'date|after:1970-01-02|before:2038-01-17', 'end'   => 'date|after_or_equal:start|after:1970-01-02|before:2038-01-17'];
+        return ['start' => 'date|after:1970-01-02|before:2038-01-17', 'end' => 'date|after_or_equal:start|after:1970-01-02|before:2038-01-17'];
     }
 
     private function getAccounts(): array

app/Api/V1/Requests/Models/RuleGroup/UpdateRequest.php

@@ -38,6 +38,8 @@ class UpdateRequest extends FormRequest
     use ChecksLogin;
     use ConvertsDataTypes;
 
+    protected array $acceptedRoles = [];
+
     /**
      * Get all data from the request.
      */

app/Api/V1/Requests/Models/Tag/StoreRequest.php

@@ -39,6 +39,8 @@ class StoreRequest extends FormRequest
     use ChecksLogin;
     use ConvertsDataTypes;
 
+    protected array $acceptedRoles = [];
+
     /**
      * Get all data from the request.
      */

app/Api/V1/Requests/Models/Tag/UpdateRequest.php

@@ -40,13 +40,15 @@ class UpdateRequest extends FormRequest
     use ChecksLogin;
     use ConvertsDataTypes;
 
+    protected array $acceptedRoles = [];
+
     /**
      * Get all data from the request.
      */
     public function getAll(): array
     {
         // This is the way.
-        $fields = ['tag'         => ['tag', 'convertString'], 'date'        => ['date', 'date'], 'description' => ['description', 'convertString']];
+        $fields = ['tag' => ['tag', 'convertString'], 'date' => ['date', 'date'], 'description' => ['description', 'convertString']];
         $data   = $this->getAllData($fields);
 
         return $this->appendLocationData($data, null);

app/Api/V1/Requests/Models/Transaction/StoreRequest.php

@@ -54,6 +54,8 @@ class StoreRequest extends FormRequest
     use GroupValidation;
     use TransactionValidation;
 
+    protected array $acceptedRoles = [];
+
     /**
      * Get all data. Is pretty complex because of all the ??-statements.
      */

app/Api/V1/Requests/Models/Transaction/UpdateRequest.php

@@ -50,6 +50,8 @@ class UpdateRequest extends FormRequest
     use GroupValidation;
     use TransactionValidation;
 
+    protected array $acceptedRoles = [];
+
     private array $arrayFields;
     private array $booleanFields;
     private array $dateFields;

app/Api/V1/Requests/Models/TransactionCurrency/StoreRequest.php

@@ -37,6 +37,8 @@ class StoreRequest extends FormRequest
     use ChecksLogin;
     use ConvertsDataTypes;
 
+    protected array $acceptedRoles = [];
+
     /**
      * Get all data from the request.
      */

app/Api/V1/Requests/Models/TransactionCurrency/UpdateRequest.php

@@ -38,6 +38,8 @@ class UpdateRequest extends FormRequest
     use ChecksLogin;
     use ConvertsDataTypes;
 
+    protected array $acceptedRoles = [];
+
     /**
      * Get all data from the request.
      */
@@ -61,7 +63,7 @@ class UpdateRequest extends FormRequest
      */
     public function rules(): array
     {
-        /** @var TransactionCurrency $currency */
+        /** @var string|TransactionCurrency $currency */
         $currency = $this->route()->parameter('currency_code');
         if (is_string($currency)) {
             $currency = TransactionCurrency::whereCode($currency)->first();

app/Api/V1/Requests/Models/TransactionLink/StoreRequest.php

@@ -41,6 +41,8 @@ class StoreRequest extends FormRequest
     use ChecksLogin;
     use ConvertsDataTypes;
 
+    protected array $acceptedRoles = [];
+
     /**
      * Get all data from the request.
      */

app/Api/V1/Requests/Models/TransactionLink/UpdateRequest.php

@@ -41,6 +41,8 @@ class UpdateRequest extends FormRequest
     use ChecksLogin;
     use ConvertsDataTypes;
 
+    protected array $acceptedRoles = [];
+
     /**
      * Get all data from the request.
      */

app/Api/V1/Requests/Models/TransactionLinkType/StoreRequest.php

@@ -36,12 +36,14 @@ class StoreRequest extends FormRequest
     use ChecksLogin;
     use ConvertsDataTypes;
 
+    protected array $acceptedRoles = [];
+
     /**
      * Get all data from the request.
      */
     public function getAll(): array
     {
-        return ['name'    => $this->convertString('name'), 'outward' => $this->convertString('outward'), 'inward'  => $this->convertString('inward')];
+        return ['name' => $this->convertString('name'), 'outward' => $this->convertString('outward'), 'inward' => $this->convertString('inward')];
     }
 
     /**

app/Api/V1/Requests/Models/TransactionLinkType/UpdateRequest.php

@@ -38,12 +38,14 @@ class UpdateRequest extends FormRequest
     use ChecksLogin;
     use ConvertsDataTypes;
 
+    protected array $acceptedRoles = [];
+
     /**
      * Get all data from the request.
      */
     public function getAll(): array
     {
-        return ['name'    => $this->convertString('name'), 'outward' => $this->convertString('outward'), 'inward'  => $this->convertString('inward')];
+        return ['name' => $this->convertString('name'), 'outward' => $this->convertString('outward'), 'inward' => $this->convertString('inward')];
     }
 
     /**

app/Api/V1/Requests/Models/UserGroup/UpdateRequest.php

@@ -36,6 +36,8 @@ class UpdateRequest extends FormRequest
     use ChecksLogin;
     use ConvertsDataTypes;
 
+    protected array $acceptedRoles = [];
+
     public function getData(): array
     {
         $fields = [

app/Api/V1/Requests/Models/Webhook/CreateRequest.php

@@ -27,6 +27,7 @@ namespace FireflyIII\Api\V1\Requests\Models\Webhook;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Webhook;
 use FireflyIII\Rules\IsBoolean;
+use FireflyIII\Rules\Webhook\IsValidWebhookUrl;
 use FireflyIII\Support\Facades\FireflyConfig;
 use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
@@ -42,9 +43,11 @@ class CreateRequest extends FormRequest
     use ConvertsDataTypes;
     use ValidatesWebhooks;
 
+    protected array $acceptedRoles = [];
+
     public function getData(): array
     {
-        $fields               = ['title'  => ['title', 'convertString'], 'active' => ['active', 'boolean'], 'url'    => ['url', 'convertString']];
+        $fields               = ['title' => ['title', 'convertString'], 'active' => ['active', 'boolean'], 'url' => ['url', 'convertString']];
         $triggers             = $this->get('triggers', []);
         $responses            = $this->get('responses', []);
         $deliveries           = $this->get('deliveries', []);
@@ -83,7 +86,7 @@ class CreateRequest extends FormRequest
             'delivery'     => 'prohibited',
             'deliveries'   => 'required|array|min:1|max:1',
             'deliveries.*' => sprintf('required|in:%s', $deliveries),
-            'url'          => ['required', sprintf('url:%s', $validProtocols)],
+            'url'          => ['required', sprintf('url:%s', $validProtocols), new IsValidWebhookUrl()],
         ];
     }
 }

app/Api/V1/Requests/Models/Webhook/UpdateRequest.php

@@ -27,6 +27,7 @@ namespace FireflyIII\Api\V1\Requests\Models\Webhook;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Webhook;
 use FireflyIII\Rules\IsBoolean;
+use FireflyIII\Rules\Webhook\IsValidWebhookUrl;
 use FireflyIII\Support\Facades\FireflyConfig;
 use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
@@ -42,9 +43,11 @@ class UpdateRequest extends FormRequest
     use ConvertsDataTypes;
     use ValidatesWebhooks;
 
+    protected array $acceptedRoles = [];
+
     public function getData(): array
     {
-        $fields               = ['title'  => ['title', 'convertString'], 'active' => ['active', 'boolean'], 'url'    => ['url', 'convertString']];
+        $fields               = ['title' => ['title', 'convertString'], 'active' => ['active', 'boolean'], 'url' => ['url', 'convertString']];
 
         $triggers             = $this->get('triggers', []);
         $responses            = $this->get('responses', []);
@@ -87,7 +90,7 @@ class UpdateRequest extends FormRequest
             'delivery'     => 'prohibited',
             'deliveries'   => 'required|array|min:1|max:1',
             'deliveries.*' => sprintf('required|in:%s', $deliveries),
-            'url'          => [sprintf('url:%s', $validProtocols), sprintf('uniqueExistingWebhook:%d', $webhook->id)],
+            'url'          => [sprintf('url:%s', $validProtocols), sprintf('uniqueExistingWebhook:%d', $webhook->id), new IsValidWebhookUrl()],
         ];
     }
 }

app/Api/V1/Requests/PaginationRequest.php

@@ -41,7 +41,7 @@ class PaginationRequest extends ApiRequest
 
         $this->sortClass = $config['sort_class'] ?? null;
 
-        if (!$this->sortClass) {
+        if (null === $this->sortClass) {
             throw new RuntimeException('PaginationRequest requires a sort_class config');
         }
     }
@@ -58,7 +58,7 @@ class PaginationRequest extends ApiRequest
     public function withValidator(Validator $validator): void
     {
         $validator->after(function (Validator $validator): void {
-            if ($validator->failed()) {
+            if (count($validator->failed()) > 0) {
                 return;
             }
 
@@ -72,7 +72,7 @@ class PaginationRequest extends ApiRequest
             $page   = $this->convertInteger('page');
             $page   = min(max(1, $page), 2 ** 16);
             $offset = ($page - 1) * $limit;
-            $sort   = $this->sortClass ? $this->convertSortParameters('sort', $this->sortClass) : $this->get('sort');
+            $sort   = null !== $this->sortClass ? $this->convertSortParameters('sort', $this->sortClass) : $this->get('sort');
             $this->attributes->set('limit', $limit);
             $this->attributes->set('sort', $sort);
             $this->attributes->set('page', $page);

app/Api/V1/Requests/Search/CountRequest.php

@@ -45,7 +45,7 @@ class CountRequest extends AggregateFormRequest
     public function withValidator(Validator $validator): void
     {
         $validator->after(function (Validator $validator): void {
-            if ($validator->failed()) {
+            if (count($validator->failed()) > 0) {
                 return;
             }
             $this->attributes->set('include_deleted', $this->convertBoolean($this->input('include_deleted', 'false')));

app/Api/V1/Requests/Search/SearchQueryRequest.php

@@ -37,7 +37,7 @@ class SearchQueryRequest extends ApiRequest
     public function withValidator(Validator $validator): void
     {
         $validator->after(function (Validator $validator): void {
-            if ($validator->failed()) {
+            if (count($validator->failed()) > 0) {
                 return;
             }
             $query = $this->convertString('query');

app/Api/V1/Requests/System/CronRequest.php

@@ -48,7 +48,7 @@ class CronRequest extends FormRequest
      */
     public function getAll(): array
     {
-        $data = ['force' => false, 'date'  => today(config('app.timezone'))];
+        $data = ['force' => false, 'date' => today(config('app.timezone'))];
         if ($this->has('force')) {
             $data['force'] = $this->boolean('force');
         }
@@ -68,6 +68,6 @@ class CronRequest extends FormRequest
      */
     public function rules(): array
     {
-        return ['force' => 'in:true,false', 'date'  => 'nullable|date|after:1970-01-02|before:2038-01-17'];
+        return ['force' => 'in:true,false', 'date' => 'nullable|date|after:1970-01-02|before:2038-01-17'];
     }
 }

app/Api/V1/Requests/System/UpdateRequest.php

@@ -37,7 +37,9 @@ class UpdateRequest extends FormRequest
     use ChecksLogin;
     use ConvertsDataTypes;
 
-    private array $booleans = [
+    protected array $acceptedRoles = [];
+
+    private array $booleans        = [
         'configuration.is_demo_site',
         'configuration.single_user_mode',
         'configuration.enable_exchange_rates',
@@ -46,7 +48,7 @@ class UpdateRequest extends FormRequest
         'configuration.enable_external_rates',
         'configuration.allow_webhooks',
     ];
-    private array $integers = ['configuration.permission_update_check', 'configuration.last_update_check'];
+    private array $integers        = ['configuration.permission_update_check', 'configuration.last_update_check'];
 
     /**
      * Get all data from the request.

app/Api/V1/Requests/System/UserStoreRequest.php

@@ -37,6 +37,8 @@ class UserStoreRequest extends FormRequest
     use ChecksLogin;
     use ConvertsDataTypes;
 
+    protected array $acceptedRoles = [];
+
     /**
      * Logged in + owner
      */

app/Api/V1/Requests/System/UserUpdateRequest.php

@@ -40,6 +40,8 @@ class UserUpdateRequest extends FormRequest
     use ChecksLogin;
     use ConvertsDataTypes;
 
+    protected array $acceptedRoles = [];
+
     /**
      * Logged in + owner
      */

app/Api/V1/Requests/User/PreferenceStoreRequest.php

@@ -36,6 +36,8 @@ class PreferenceStoreRequest extends FormRequest
     use ChecksLogin;
     use ConvertsDataTypes;
 
+    protected array $acceptedRoles = [];
+
     public function getAll(): array
     {
         $array = ['name' => $this->convertString('name'), 'data' => $this->get('data')];

app/Api/V1/Requests/User/PreferenceUpdateRequest.php

@@ -36,6 +36,8 @@ class PreferenceUpdateRequest extends FormRequest
     use ChecksLogin;
     use ConvertsDataTypes;
 
+    protected array $acceptedRoles = [];
+
     public function getAll(): array
     {
         $array = ['name' => $this->convertString('name'), 'data' => $this->get('data')];