Merge pull request #11901 from firefly-iii/release-1772861474

🤖 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,48 +1,49 @@
 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
     - ../routes
     - ../config
     - ../bootstrap/app.php
+    - ../bootstrap/providers.php
   universalObjectCratesClasses:
     - 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
@@ -54,7 +55,15 @@ parameters:
     - 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: 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#"
@@ -64,7 +73,7 @@ parameters:
         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

@@ -174,22 +174,24 @@ jobs:
         uses: nhedger/setup-mago@v1
       - name: Run CI
         run: |
+          cp .env.example .env
           # install all packages etc.
           rm -rf vendor composer.lock
-          composer update --no-scripts --no-plugins -q
+          composer update --no-scripts -q
 
           # format code.
           echo "Will now run Mago Format"
-          mago format || true
+          mago format
           sudo chown -R runner:docker resources/lang
           echo "Will now run PHPCS"
-          .ci/phpcs.sh || true
+          .ci/phpcs.sh
 
           # lint and check
           echo "Will now run Mago Lint"
-          mago lint || true
+          mago lint
           echo "Will now run PHPstan"
-          .ci/phpstan.sh || true
+          .ci/phpstan.sh
+          rm .env
       - name: Calculate variables
         run: |
 

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';
 
@@ -222,11 +224,7 @@ 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()
-            ) {
+            if (null === $value && 'limit' === $integer && auth()->check()) {
                 // set default for user:
                 /** @var User $user */
                 $user     = auth()->user();

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/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

@@ -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

@@ -34,7 +34,9 @@ abstract class AggregateFormRequest extends ApiRequest
     /**
      * @var ApiRequest[]
      */
-    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');

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

@@ -39,6 +39,8 @@ 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')];

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.
      */

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             = [

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

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

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;

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

@@ -40,7 +40,7 @@ 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;
             }
 

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.
      */

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,6 +36,8 @@ class StoreRequest extends FormRequest
     use ChecksLogin;
     use ConvertsDataTypes;
 
+    protected array $acceptedRoles = [];
+
     /**
      * Get all data from the request.
      */

app/Api/V1/Requests/Models/Category/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/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,6 +37,8 @@ class StoreByDateRequest extends FormRequest
     use ChecksLogin;
     use ConvertsDataTypes;
 
+    protected array $acceptedRoles = [];
+
     /**
      * @return array<string, mixed>
      */

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.
      */

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,6 +37,8 @@ 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()];

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

@@ -37,6 +37,8 @@ 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()];

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,6 +37,8 @@ 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()];

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

@@ -37,6 +37,8 @@ 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()];

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,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/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,6 +36,8 @@ class StoreRequest extends FormRequest
     use ChecksLogin;
     use ConvertsDataTypes;
 
+    protected array $acceptedRoles = [];
+
     /**
      * Get all data from the request.
      */

app/Api/V1/Requests/Models/TransactionLinkType/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/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,6 +43,8 @@ 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']];
@@ -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,6 +43,8 @@ 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']];
@@ -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/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')];

app/Console/Commands/Correction/ConvertsDatesToUTC.php

@@ -83,10 +83,10 @@ class ConvertsDatesToUTC extends Command
         }
         $this->friendlyInfo(sprintf('Converting field "%s" of model "%s" to UTC.', $field, $shortModel));
         $items->each(static function ($item) use ($field, $timezoneField): void {
-            $date                   = Carbon::parse($item->{$field}, $item->{$timezoneField}); // @phpstan-ignore-line
+            $date                   = Carbon::parse($item->{$field}, $item->{$timezoneField});
             $date->setTimezone('UTC');
-            $item->{$field}         = $date->format('Y-m-d H:i:s'); // @phpstan-ignore-line
-            $item->{$timezoneField} = 'UTC'; // @phpstan-ignore-line
+            $item->{$field}         = $date->format('Y-m-d H:i:s');
+            $item->{$timezoneField} = 'UTC';
             $item->save();
         });
     }

app/Console/Commands/Correction/CorrectsIbans.php

@@ -57,24 +57,28 @@ class CorrectsIbans extends Command
 
         /** @var Account $account */
         foreach ($accounts as $account) {
-            $userId = $account->user_id;
+            $userId                = $account->user_id;
             $set[$userId] ??= [];
-            $iban   = (string) $account->iban;
+            $iban                  = (string) $account->iban;
             if ('' === $iban) {
                 continue;
             }
-            $type   = $account->accountType->type;
+            $type                  = $account->accountType->type;
             if (in_array($type, [AccountTypeEnum::LOAN->value, AccountTypeEnum::DEBT->value, AccountTypeEnum::MORTGAGE->value], true)) {
                 $type = 'liabilities';
             }
-            // iban already in use! two exceptions exist:
-            if (
-                array_key_exists($iban, $set[$userId]) && (
-                    !AccountTypeEnum::EXPENSE->value === $set[$userId][$iban]
-                    && AccountTypeEnum::REVENUE->value === $type
-                    && !(AccountTypeEnum::REVENUE->value === $set[$userId][$iban] && AccountTypeEnum::EXPENSE->value === $type)
-                )
-            ) {
+            $showWarningAndCorrect = false;
+            if (array_key_exists($iban, $set[$userId])) {
+                // the type is a revenue account, and the existing IBAN is NOT an expense account.
+                if (AccountTypeEnum::REVENUE->value === $type && AccountTypeEnum::EXPENSE->value !== $set[$userId][$iban]) {
+                    $showWarningAndCorrect = true;
+                }
+                // the type is an expense account, and the existing IBAN is NOT a revenue account
+                if (AccountTypeEnum::EXPENSE->value === $type && AccountTypeEnum::REVENUE->value !== $set[$userId][$iban]) {
+                    $showWarningAndCorrect = true;
+                }
+            }
+            if ($showWarningAndCorrect) {
                 $this->friendlyWarning(sprintf(
                     'IBAN "%s" is used more than once and will be removed from %s #%d ("%s")',
                     $iban,

app/Console/Commands/Correction/CorrectsInvertedBudgetLimits.php

@@ -69,10 +69,6 @@ class CorrectsInvertedBudgetLimits extends Command
             $budgetLimit->saveQuietly();
         }
 
-        if ($set->count() > 0) {
-            // FIXME here be a available budget event.
-        }
-
         if (1 === $set->count()) {
             $this->friendlyInfo('Corrected one budget limit to have the right start/end dates.');
 

app/Console/Commands/Correction/CorrectsUnevenAmount.php

@@ -322,12 +322,7 @@ class CorrectsUnevenAmount extends Command
         foreach ($journals as $entry) {
             $sum = (string) $entry->the_sum;
             $sum = Steam::floatalize($sum);
-            if (
-                !is_numeric($sum)
-                || '' === $sum // @phpstan-ignore-line
-                || str_contains($sum, 'e')
-                || str_contains($sum, ',')
-            ) {
+            if (!is_numeric($sum) || str_contains($sum, 'e') || str_contains($sum, ',')) {
                 $message = sprintf('Journal #%d has an invalid sum ("%s"). No sure what to do.', $entry->transaction_journal_id, $entry->the_sum);
                 $this->friendlyWarning($message);
                 Log::warning($message);

app/Console/Commands/System/VerifySecurityAlerts.php

@@ -57,7 +57,7 @@ class VerifySecurityAlerts extends Command
         $version = config('firefly.version');
         $disk    = Storage::disk('resources');
         // Next line is ignored because it's a Laravel Facade.
-        if (!$disk->has('alerts.json')) { // @phpstan-ignore-line
+        if (!$disk->has('alerts.json')) {
             Log::debug('No alerts.json file present.');
 
             return 0;

app/Console/Commands/Tools/Cron.php

@@ -70,7 +70,7 @@ class Cron extends Command
         } catch (InvalidArgumentException $e) {
             $this->friendlyError(sprintf('"%s" is not a valid date', $this->option('date')));
         }
-        $force = (bool) $this->option('force'); // @phpstan-ignore-line
+        $force = (bool) $this->option('force');
 
         // Fire exchange rates cron job.
         if (true === FireflyConfig::get('enable_external_rates', config('cer.download_enabled'))->data && ($doAll || $this->option('download-cer'))) {

app/Console/Commands/Upgrade/RemovesDatabaseDecryption.php

@@ -68,7 +68,7 @@ class RemovesDatabaseDecryption extends Command
          * @var string $table
          * @var array  $fields
          */
-        foreach ($tables as $table => $fields) { // @phpstan-ignore-line
+        foreach ($tables as $table => $fields) {
             $this->decryptTable($table, $fields);
         }
 
@@ -127,7 +127,7 @@ class RemovesDatabaseDecryption extends Command
         }
 
         // A separate routine for preferences table:
-        if ('preferences' === $table && is_string($value)) {
+        if ('preferences' === $table) {
             $this->decryptPreferencesRow($id, $value);
 
             return;

app/Console/Commands/Upgrade/UpgradesLiabilitiesEight.php

@@ -101,8 +101,13 @@ class UpgradesLiabilitiesEight extends Command
 
     private function hasBadOpening(Account $account): bool
     {
+        /** @var TransactionType $openingBalanceType */
         $openingBalanceType = TransactionType::whereType(TransactionTypeEnum::OPENING_BALANCE->value)->first();
+
+        /** @var TransactionType $liabilityType */
         $liabilityType      = TransactionType::whereType(TransactionTypeEnum::LIABILITY_CREDIT->value)->first();
+
+        /** @var null|TransactionJournal $openingJournal */
         $openingJournal     = TransactionJournal::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
             ->where('transactions.account_id', $account->id)
             ->where('transaction_journals.transaction_type_id', $openingBalanceType->id)
@@ -111,6 +116,8 @@ class UpgradesLiabilitiesEight extends Command
         if (null === $openingJournal) {
             return false;
         }
+
+        /** @var null|TransactionJournal $liabilityJournal */
         $liabilityJournal   = TransactionJournal::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
             ->where('transactions.account_id', $account->id)
             ->where('transaction_journals.transaction_type_id', $liabilityType->id)
@@ -120,7 +127,7 @@ class UpgradesLiabilitiesEight extends Command
             return false;
         }
 
-        return (bool) $openingJournal->date->isSameDay($liabilityJournal->date);
+        return $openingJournal->date->isSameDay($liabilityJournal->date);
     }
 
     private function isExecuted(): bool

app/Events/Model/BudgetLimit/CreatedBudgetLimit.php

@@ -27,6 +27,7 @@ namespace FireflyIII\Events\Model\BudgetLimit;
 use FireflyIII\Events\Event;
 use FireflyIII\Models\BudgetLimit;
 use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\Log;
 
 class CreatedBudgetLimit extends Event
 {
@@ -35,5 +36,7 @@ class CreatedBudgetLimit extends Event
     public function __construct(
         public BudgetLimit $budgetLimit,
         public bool $createWebhookMessages
-    ) {}
+    ) {
+        Log::debug(sprintf('CreatedNewBudgetLimit(#%d) Event', $budgetLimit->id));
+    }
 }

app/Events/Model/BudgetLimit/DestroyedBudgetLimit.php

@@ -29,6 +29,7 @@ use FireflyIII\Events\Event;
 use FireflyIII\Models\Budget;
 use FireflyIII\User;
 use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\Log;
 
 class DestroyedBudgetLimit extends Event
 {
@@ -40,5 +41,7 @@ class DestroyedBudgetLimit extends Event
         public Carbon $start,
         public Carbon $end,
         public bool $createWebhookMessages
-    ) {}
+    ) {
+        Log::debug(sprintf('DestroyedBudgetLimit(#%d) Event', $budget->id));
+    }
 }

app/Events/Model/BudgetLimit/UpdatedBudgetLimit.php

@@ -27,6 +27,7 @@ namespace FireflyIII\Events\Model\BudgetLimit;
 use FireflyIII\Events\Event;
 use FireflyIII\Models\BudgetLimit;
 use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\Log;
 
 class UpdatedBudgetLimit extends Event
 {
@@ -35,5 +36,7 @@ class UpdatedBudgetLimit extends Event
     public function __construct(
         public BudgetLimit $budgetLimit,
         public bool $createWebhookMessages
-    ) {}
+    ) {
+        Log::debug(sprintf('UpdatedBudgetLimit(#%d) Event', $budgetLimit->id));
+    }
 }

app/Exceptions/IntervalException.php

@@ -36,7 +36,7 @@ final class IntervalException extends Exception
     public array       $availableIntervals = [];
     public Periodicity $periodicity        = Periodicity::Monthly;
 
-    /** @var mixed */
+    /** @var string */
     protected $message                     = 'The periodicity %s is unknown. Choose one of available periodicity: %s';
 
     public function __construct(string $message = '', int $code = 0, ?Throwable $previous = null)

app/Factory/PiggyBankFactory.php

@@ -158,9 +158,9 @@ class PiggyBankFactory
                     // event(new ChangedAmount($piggyBank, $diff, null, null));
                 }
 
-                // no amount set, use previous amount or go to ZERO.
-                $toBeLinked[$account->id] = ['current_amount' => $toBeLinked[$account->id]['current_amount'] ?? '0'];
-                Log::debug(sprintf('[b] Will link account #%d with amount %s', $account->id, $toBeLinked[$account->id]['current_amount'] ?? '0'));
+                // no amount set, use previous amount
+                $toBeLinked[$account->id] = ['current_amount' => $toBeLinked[$account->id]['current_amount']];
+                Log::debug(sprintf('[b] Will link account #%d with amount %s', $account->id, $toBeLinked[$account->id]['current_amount']));
 
                 // create event:
                 Log::debug('linkToAccountIds: Trigger change for positive amount [b].');

app/Factory/TransactionJournalFactory.php

@@ -338,7 +338,7 @@ class TransactionJournalFactory
             'date_tz'                 => $carbon->format('e'),
             'order'                   => $order,
             'tag_count'               => 0,
-            'completed'               => !$row['batch_submission'],
+            'completed'               => is_bool($row['batch_submission']) && !$row['batch_submission'],
         ]);
         Log::debug(sprintf('Created new journal #%d: "%s"', $journal->id, $journal->description));
 
@@ -574,16 +574,11 @@ class TransactionJournalFactory
             return [$sourceAccount, $account];
         }
 
-        if (!$sourceAccount instanceof Account) { // @phpstan-ignore-line
-            Log::debug('Source account is NULL, destination account is not.');
-            $account = $this->accountRepository->getReconciliation($destinationAccount);
-            Log::debug(sprintf('Will return account #%d ("%s") of type "%s"', $account->id, $account->name, $account->accountType->type));
+        Log::debug('Source account is NULL, destination account is not.');
+        $account = $this->accountRepository->getReconciliation($destinationAccount);
+        Log::debug(sprintf('Will return account #%d ("%s") of type "%s"', $account->id, $account->name, $account->accountType->type));
 
-            return [$account, $destinationAccount];
-        }
-        Log::debug('Unused fallback'); // @phpstan-ignore-line
-
-        return [$sourceAccount, $destinationAccount];
+        return [$account, $destinationAccount];
     }
 
     private function storeLocation(TransactionJournal $journal, NullArrayObject $data): void

app/Helpers/Collector/Extensions/AccountCollection.php

@@ -178,7 +178,7 @@ trait AccountCollection
     {
         if ($accounts->count() > 0) {
             $accountIds = $accounts->pluck('id')->toArray();
-            $this->query->where(static function (EloquentBuilder $query) use ($accountIds): void { // @phpstan-ignore-line
+            $this->query->where(static function (EloquentBuilder $query) use ($accountIds): void {
                 $query->whereIn('source.account_id', $accountIds);
                 $query->orWhereIn('destination.account_id', $accountIds);
             });
@@ -196,7 +196,7 @@ trait AccountCollection
     {
         if ($accounts->count() > 0) {
             $accountIds = $accounts->pluck('id')->toArray();
-            $this->query->where(static function (EloquentBuilder $query) use ($accountIds): void { // @phpstan-ignore-line
+            $this->query->where(static function (EloquentBuilder $query) use ($accountIds): void {
                 $query->whereIn('source.account_id', $accountIds);
                 $query->whereIn('destination.account_id', $accountIds);
             });
@@ -228,7 +228,7 @@ trait AccountCollection
     {
         if ($accounts->count() > 0) {
             $accountIds = $accounts->pluck('id')->toArray();
-            $this->query->where(static function (EloquentBuilder $query) use ($accountIds): void { // @phpstan-ignore-line
+            $this->query->where(static function (EloquentBuilder $query) use ($accountIds): void {
                 $query->whereNotIn('source.account_id', $accountIds);
                 $query->whereNotIn('destination.account_id', $accountIds);
             });
@@ -261,7 +261,7 @@ trait AccountCollection
     {
         if ($accounts->count() > 0) {
             $accountIds = $accounts->pluck('id')->toArray();
-            $this->query->where(static function (EloquentBuilder $q1) use ($accountIds): void { // @phpstan-ignore-line
+            $this->query->where(static function (EloquentBuilder $q1) use ($accountIds): void {
                 // sourceAccount is in the set, and destination is NOT.
 
                 $q1->where(static function (EloquentBuilder $q2) use ($accountIds): void {

app/Helpers/Collector/Extensions/AmountCollection.php

@@ -38,7 +38,7 @@ trait AmountCollection
      */
     public function amountIs(string $amount): GroupCollectorInterface
     {
-        $this->query->where(static function (EloquentBuilder $q) use ($amount): void { // @phpstan-ignore-line
+        $this->query->where(static function (EloquentBuilder $q) use ($amount): void {
             $q->where('source.amount', Steam::negative($amount));
         });
 
@@ -47,7 +47,7 @@ trait AmountCollection
 
     public function amountIsNot(string $amount): GroupCollectorInterface
     {
-        $this->query->where(static function (EloquentBuilder $q) use ($amount): void { // @phpstan-ignore-line
+        $this->query->where(static function (EloquentBuilder $q) use ($amount): void {
             $q->where('source.amount', '!=', Steam::negative($amount));
         });
 
@@ -59,7 +59,7 @@ trait AmountCollection
      */
     public function amountLess(string $amount): GroupCollectorInterface
     {
-        $this->query->where(static function (EloquentBuilder $q) use ($amount): void { // @phpstan-ignore-line
+        $this->query->where(static function (EloquentBuilder $q) use ($amount): void {
             $q->where('destination.amount', '<=', Steam::positive($amount));
         });
 
@@ -71,7 +71,7 @@ trait AmountCollection
      */
     public function amountMore(string $amount): GroupCollectorInterface
     {
-        $this->query->where(static function (EloquentBuilder $q) use ($amount): void { // @phpstan-ignore-line
+        $this->query->where(static function (EloquentBuilder $q) use ($amount): void {
             $q->where('destination.amount', '>=', Steam::positive($amount));
         });
 
@@ -83,7 +83,7 @@ trait AmountCollection
      */
     public function foreignAmountIs(string $amount): GroupCollectorInterface
     {
-        $this->query->where(static function (EloquentBuilder $q) use ($amount): void { // @phpstan-ignore-line
+        $this->query->where(static function (EloquentBuilder $q) use ($amount): void {
             $q->whereNotNull('source.foreign_amount');
             $q->where('source.foreign_amount', Steam::negative($amount));
         });
@@ -96,7 +96,7 @@ trait AmountCollection
      */
     public function foreignAmountIsNot(string $amount): GroupCollectorInterface
     {
-        $this->query->where(static function (EloquentBuilder $q) use ($amount): void { // @phpstan-ignore-line
+        $this->query->where(static function (EloquentBuilder $q) use ($amount): void {
             $q->whereNull('source.foreign_amount');
             $q->orWhere('source.foreign_amount', '!=', Steam::negative($amount));
         });
@@ -109,7 +109,7 @@ trait AmountCollection
      */
     public function foreignAmountLess(string $amount): GroupCollectorInterface
     {
-        $this->query->where(static function (EloquentBuilder $q) use ($amount): void { // @phpstan-ignore-line
+        $this->query->where(static function (EloquentBuilder $q) use ($amount): void {
             $q->whereNotNull('destination.foreign_amount');
             $q->where('destination.foreign_amount', '<=', Steam::positive($amount));
         });
@@ -122,7 +122,7 @@ trait AmountCollection
      */
     public function foreignAmountMore(string $amount): GroupCollectorInterface
     {
-        $this->query->where(static function (EloquentBuilder $q) use ($amount): void { // @phpstan-ignore-line
+        $this->query->where(static function (EloquentBuilder $q) use ($amount): void {
             $q->whereNotNull('destination.foreign_amount');
             $q->where('destination.foreign_amount', '>=', Steam::positive($amount));
         });

app/Helpers/Collector/Extensions/AttachmentCollection.php

@@ -483,7 +483,7 @@ trait AttachmentCollection
         Log::debug('Add filter on no attachments.');
         $this->joinAttachmentTables();
 
-        $this->query->where(static function (EloquentBuilder $q1): void { // @phpstan-ignore-line
+        $this->query->where(static function (EloquentBuilder $q1): void {
             $q1->whereNull('attachments.attachable_id')->orWhere(static function (EloquentBuilder $q2): void {
                 $q2->whereNotNull('attachments.attachable_id')->whereNotNull('attachments.deleted_at');
 
@@ -517,7 +517,7 @@ trait AttachmentCollection
             $this->hasJoinedAttTables = true;
             $this->query
                 ->leftJoin('attachments', 'attachments.attachable_id', '=', 'transaction_journals.id')
-                ->where(static function (EloquentBuilder $q1): void { // @phpstan-ignore-line
+                ->where(static function (EloquentBuilder $q1): void {
                     $q1->where('attachments.attachable_type', TransactionJournal::class);
                     // $q1->where('attachments.uploaded', true);
                     // $q1->whereNull('attachments.deleted_at');

app/Helpers/Collector/Extensions/MetaCollection.php

@@ -46,7 +46,7 @@ trait MetaCollection
     public function excludeBills(Collection $bills): GroupCollectorInterface
     {
         $this->withBillInformation();
-        $this->query->where(static function (EloquentBuilder $q1) use ($bills): void { // @phpstan-ignore-line
+        $this->query->where(static function (EloquentBuilder $q1) use ($bills): void {
             $q1->whereNotIn('transaction_journals.bill_id', $bills->pluck('id')->toArray());
             $q1->orWhereNull('transaction_journals.bill_id');
         });
@@ -61,7 +61,7 @@ trait MetaCollection
     {
         $this->withBudgetInformation();
 
-        $this->query->where(static function (EloquentBuilder $q2) use ($budget): void { // @phpstan-ignore-line
+        $this->query->where(static function (EloquentBuilder $q2) use ($budget): void {
             $q2->where('budgets.id', '!=', $budget->id);
             $q2->orWhereNull('budgets.id');
         });
@@ -73,7 +73,7 @@ trait MetaCollection
     {
         if ($budgets->count() > 0) {
             $this->withBudgetInformation();
-            $this->query->where(static function (EloquentBuilder $q1) use ($budgets): void { // @phpstan-ignore-line
+            $this->query->where(static function (EloquentBuilder $q1) use ($budgets): void {
                 $q1->whereNotIn('budgets.id', $budgets->pluck('id')->toArray());
                 $q1->orWhereNull('budgets.id');
             });
@@ -86,7 +86,7 @@ trait MetaCollection
     {
         if ($categories->count() > 0) {
             $this->withCategoryInformation();
-            $this->query->where(static function (EloquentBuilder $q1) use ($categories): void { // @phpstan-ignore-line
+            $this->query->where(static function (EloquentBuilder $q1) use ($categories): void {
                 $q1->whereNotIn('categories.id', $categories->pluck('id')->toArray());
                 $q1->orWhereNull('categories.id');
             });
@@ -102,7 +102,7 @@ trait MetaCollection
     {
         $this->withCategoryInformation();
 
-        $this->query->where(static function (EloquentBuilder $q2) use ($category): void { // @phpstan-ignore-line
+        $this->query->where(static function (EloquentBuilder $q2) use ($category): void {
             $q2->where('categories.id', '!=', $category->id);
             $q2->orWhereNull('categories.id');
         });
@@ -394,7 +394,7 @@ trait MetaCollection
     public function notesDoNotContain(string $value): GroupCollectorInterface
     {
         $this->withNotes();
-        $this->query->where(static function (EloquentBuilder $q) use ($value): void { // @phpstan-ignore-line
+        $this->query->where(static function (EloquentBuilder $q) use ($value): void {
             $q->whereNull('notes.text');
             $q->orWhereNotLike('notes.text', sprintf('%%%s%%', $value));
         });
@@ -405,7 +405,7 @@ trait MetaCollection
     public function notesDontEndWith(string $value): GroupCollectorInterface
     {
         $this->withNotes();
-        $this->query->where(static function (EloquentBuilder $q) use ($value): void { // @phpstan-ignore-line
+        $this->query->where(static function (EloquentBuilder $q) use ($value): void {
             $q->whereNull('notes.text');
             $q->orWhereNotLike('notes.text', sprintf('%%%s', $value));
         });
@@ -416,7 +416,7 @@ trait MetaCollection
     public function notesDontStartWith(string $value): GroupCollectorInterface
     {
         $this->withNotes();
-        $this->query->where(static function (EloquentBuilder $q) use ($value): void { // @phpstan-ignore-line
+        $this->query->where(static function (EloquentBuilder $q) use ($value): void {
             $q->whereNull('notes.text');
             $q->orWhereNotLike('notes.text', sprintf('%s%%', $value));
         });
@@ -443,7 +443,7 @@ trait MetaCollection
     public function notesExactlyNot(string $value): GroupCollectorInterface
     {
         $this->withNotes();
-        $this->query->where(static function (EloquentBuilder $q) use ($value): void { // @phpstan-ignore-line
+        $this->query->where(static function (EloquentBuilder $q) use ($value): void {
             $q->whereNull('notes.text');
             $q->orWhere('notes.text', '!=', $value);
         });
@@ -889,7 +889,7 @@ trait MetaCollection
     {
         $this->joinMetaDataTables();
         // TODO not sure if this will work properly.
-        $this->query->where(static function (EloquentBuilder $q1): void { // @phpstan-ignore-line
+        $this->query->where(static function (EloquentBuilder $q1): void {
             $q1->where(static function (EloquentBuilder $q2): void {
                 $q2->where('journal_meta.name', '=', 'external_id');
                 $q2->whereNull('journal_meta.data');
@@ -910,7 +910,7 @@ trait MetaCollection
     {
         $this->joinMetaDataTables();
         // TODO not sure if this will work properly.
-        $this->query->where(static function (EloquentBuilder $q1): void { // @phpstan-ignore-line
+        $this->query->where(static function (EloquentBuilder $q1): void {
             $q1->where(static function (EloquentBuilder $q2): void {
                 $q2->where('journal_meta.name', '=', 'external_url');
                 $q2->whereNull('journal_meta.data');
@@ -930,7 +930,7 @@ trait MetaCollection
     public function withoutNotes(): GroupCollectorInterface
     {
         $this->withNotes();
-        $this->query->where(static function (EloquentBuilder $q): void { // @phpstan-ignore-line
+        $this->query->where(static function (EloquentBuilder $q): void {
             $q->whereNull('notes.text');
             $q->orWhere('notes.text', '');
         });

app/Helpers/Collector/GroupCollector.php

@@ -314,7 +314,7 @@ class GroupCollector implements GroupCollectorInterface
 
     public function excludeForeignCurrency(TransactionCurrency $currency): GroupCollectorInterface
     {
-        $this->query->where(static function (EloquentBuilder $q2) use ($currency): void { // @phpstan-ignore-line
+        $this->query->where(static function (EloquentBuilder $q2) use ($currency): void {
             $q2->where('source.foreign_currency_id', '!=', $currency->id);
             $q2->orWhereNull('source.foreign_currency_id');
         });
@@ -698,7 +698,7 @@ class GroupCollector implements GroupCollectorInterface
          */
         foreach ($this->sorting as $field => $direction) {
             $func       = 'ASC' === $direction ? 'sortBy' : 'sortByDesc';
-            $collection = $collection->{$func}(static function (array $product, int $key) use ($field) { // @phpstan-ignore-line
+            $collection = $collection->{$func}(static function (array $product, int $key) use ($field) {
                 // depends on $field:
                 if ('description' === $field) {
                     if (1 === count($product['transactions'])) {

app/Http/Controllers/Auth/LoginController.php

@@ -275,7 +275,7 @@ final class LoginController extends Controller
         $request->session()->regenerate();
         $this->clearLoginAttempts($request);
         $response = $this->authenticated($request, $this->guard()->user());
-        if ($response) {
+        if (null !== $response) {
             return $response;
         }
         $path     = Steam::getSafeUrl(session()->pull('url.intended', route('index')), route('index'));

app/Http/Controllers/Auth/RegisterController.php

@@ -176,7 +176,7 @@ final class RegisterController extends Controller
     /**
      * @throws FireflyException
      */
-    protected function allowedToRegister(): bool
+    private function allowedToRegister(): bool
     {
         // is allowed to register?
         $allowRegistration = true;

app/Http/Controllers/Chart/ExpenseReportController.php

@@ -135,7 +135,7 @@ final class ExpenseReportController extends Controller
 
         while ($currentStart < $end) {
             $currentEnd   = clone $currentStart;
-            $currentEnd   = $currentEnd->{$function}(); // @phpstan-ignore-line
+            $currentEnd   = $currentEnd->{$function}();
 
             // get expenses grouped by opposing name:
             $expenses     = $this->groupByName($this->getExpensesForOpposing($accounts, $all, $currentStart, $currentEnd));

app/Http/Controllers/Controller.php

@@ -102,7 +102,7 @@ abstract class Controller extends BaseController
         if ('true' === request()->get('force_default_layout') && 'v2' === config('view.layout')) {
             // config('view.layout','v1');
             Config::set('view.layout', 'v1');
-            View::getFinder()->setPaths([realpath(base_path('resources/views'))]); // @phpstan-ignore-line
+            View::getFinder()->setPaths([realpath(base_path('resources/views'))]);
         }
 
         View::share('authGuard', $authGuard);