Merge pull request #11919 from firefly-iii/release-1773028359

🤖 Automatically merge the PR into the develop branch.

.ci/phpstan.neon

@@ -33,31 +33,16 @@ parameters:
     - Illuminate\Database\Eloquent\Model
   reportUnmatchedIgnoredErrors: true
   ignoreErrors:
-    # these are actually interesting but not right now:
-    - identifier: nullCoalesce.offset
-    - identifier: nullCoalesce.variable
-    - identifier: larastan.noUnnecessaryCollectionCall
-    - identifier: varTag.differentVariable
-    - identifier: identical.alwaysTrue
-    - identifier: assign.propertyReadOnly
-    - identifier: varTag.nativeType
-    - identifier: property.onlyWritten
-    - identifier: parameter.phpDocType
-    - identifier: property.dynamicName
-    - identifier: property.unusedType
-    - identifier: staticMethod.deprecated
     # 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 (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

app/Api/V1/Controllers/Controller.php

@@ -171,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
@@ -224,7 +227,8 @@ abstract class Controller extends BaseController
                 $value = min(max(1, $value), 2 ** 16);
                 $bag->set($integer, $value);
             }
-            if (null === $value && 'limit' === $integer && auth()->check()) {
+            // && 'limit' === $integer
+            if (null === $value && auth()->check()) {
                 // set default for user:
                 /** @var User $user */
                 $user     = auth()->user();

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

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

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

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

@@ -43,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']];

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

@@ -43,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']];

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

@@ -28,6 +28,7 @@ use Carbon\Carbon;
 use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use FireflyIII\Support\Facades\FireflyConfig;
 use Illuminate\Console\Command;
+use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\QueryException;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Log;
@@ -82,7 +83,7 @@ class ConvertsDatesToUTC extends Command
             return;
         }
         $this->friendlyInfo(sprintf('Converting field "%s" of model "%s" to UTC.', $field, $shortModel));
-        $items->each(static function ($item) use ($field, $timezoneField): void {
+        $items->each(static function (Model $item) use ($field, $timezoneField): void {
             $date                   = Carbon::parse($item->{$field}, $item->{$timezoneField});
             $date->setTimezone('UTC');
             $item->{$field}         = $date->format('Y-m-d H:i:s');

app/Console/Commands/Correction/CorrectsAccountTypes.php

@@ -229,12 +229,24 @@ class CorrectsAccountTypes extends Command
 
     private function getDestinationTransaction(TransactionJournal $journal): Transaction
     {
-        return $journal->transactions->firstWhere('amount', '>', 0);
+        /** @var null|Transaction $res */
+        $res = $journal->transactions->firstWhere('amount', '>', 0);
+        if (null === $res) {
+            throw new FireflyException('Could not find transaction.');
+        }
+
+        return $res;
     }
 
     private function getSourceTransaction(TransactionJournal $journal): Transaction
     {
-        return $journal->transactions->firstWhere('amount', '<', 0);
+        /** @var null|Transaction $res */
+        $res = $journal->transactions->firstWhere('amount', '<', 0);
+        if (null === $res) {
+            throw new FireflyException('Could not find transaction.');
+        }
+
+        return $res;
     }
 
     private function giveNewDestinationAccount(TransactionJournal $journal, Account $newDestination): void

app/Console/Commands/Upgrade/RemovesDatabaseDecryption.php

@@ -64,10 +64,6 @@ class RemovesDatabaseDecryption extends Command
             'journal_links'        => ['comment'],
         ];
 
-        /**
-         * @var string $table
-         * @var array  $fields
-         */
         foreach ($tables as $table => $fields) {
             $this->decryptTable($table, $fields);
         }

app/Console/Commands/Upgrade/UpgradesToGroups.php

@@ -94,6 +94,7 @@ class UpgradesToGroups extends Command
             return $amount && $identifier;
         });
 
+        /** @var null|Transaction */
         return $set->first();
     }
 

app/Console/Commands/Upgrade/UpgradesVariousCurrencyInformation.php

@@ -106,17 +106,20 @@ class UpgradesVariousCurrencyInformation extends Command
                 break;
 
             case TransactionTypeEnum::WITHDRAWAL->value:
+                /** @var null|Transaction $lead */
                 $lead = $journal->transactions()->where('amount', '<', 0)->first();
 
                 break;
 
             case TransactionTypeEnum::DEPOSIT->value:
+                /** @var null|Transaction $lead */
                 $lead = $journal->transactions()->where('amount', '>', 0)->first();
 
                 break;
 
             case TransactionTypeEnum::OPENING_BALANCE->value:
                 // whichever isn't an initial balance account:
+                /** @var null|Transaction $lead */
                 $lead = $journal
                     ->transactions()
                     ->leftJoin('accounts', 'transactions.account_id', '=', 'accounts.id')
@@ -129,6 +132,7 @@ class UpgradesVariousCurrencyInformation extends Command
 
             case TransactionTypeEnum::RECONCILIATION->value:
                 // whichever isn't the reconciliation account:
+                /** @var null|Transaction $lead */
                 $lead = $journal
                     ->transactions()
                     ->leftJoin('accounts', 'transactions.account_id', '=', 'accounts.id')

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/Handlers/Observer/DeletedAccountObserver.php

@@ -54,11 +54,10 @@ class DeletedAccountObserver
             ->pluck('transaction_journal_id')
             ->toArray()
         ;
-        $groupIds   = TransactionJournal::whereIn('id', $journalIds)
-            ->get(['transaction_journals.transaction_group_id'])
-            ->pluck('transaction_group_id')
-            ->toArray()
-        ;
+
+        $groupIds   = array_map(function (array $item) {
+            return $item['transaction_group_id'];
+        }, TransactionJournal::whereIn('id', $journalIds)->get(['transaction_journals.transaction_group_id'])->toArray());
 
         if (count($journalIds) > 0) {
             Transaction::whereIn('transaction_journal_id', $journalIds)->delete();

app/Http/Controllers/Admin/UserController.php

@@ -34,7 +34,6 @@ use FireflyIII\Repositories\User\UserRepositoryInterface;
 use FireflyIII\Support\Facades\FireflyConfig;
 use FireflyIII\Support\Facades\Preferences;
 use FireflyIII\User;
-use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\RedirectResponse;
@@ -70,9 +69,6 @@ final class UserController extends Controller
         $this->externalIdentity = 'web' !== config('firefly.authentication_guard');
     }
 
-    /**
-     * @return Application|Factory|Redirector|RedirectResponse|View
-     */
     public function delete(User $user): Factory|\Illuminate\Contracts\View\View|Redirector|RedirectResponse
     {
         if ($this->externalIdentity) {

app/Http/Controllers/Auth/LoginController.php

@@ -27,7 +27,6 @@ use Carbon\Carbon;
 use FireflyIII\Events\Security\System\UnknownUserTriedLogin;
 use FireflyIII\Events\Security\User\UserFailedLoginAttempt;
 use FireflyIII\Events\Security\User\UserSuccessfullyLoggedIn;
-use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Providers\RouteServiceProvider;
 use FireflyIII\Repositories\User\UserRepositoryInterface;
@@ -48,8 +47,6 @@ use Illuminate\Support\Facades\Cookie;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Validation\ValidationException;
-use Psr\Container\ContainerExceptionInterface;
-use Psr\Container\NotFoundExceptionInterface;
 use Symfony\Component\HttpFoundation\Response as ResponseAlias;
 
 /**
@@ -181,12 +178,6 @@ final class LoginController extends Controller
 
     /**
      * Show the application's login form.
-     *
-     * @return Application|Factory|Redirector|RedirectResponse|View
-     *
-     * @throws FireflyException
-     * @throws ContainerExceptionInterface
-     * @throws NotFoundExceptionInterface
      */
     public function showLoginForm(Request $request): Factory|Redirector|RedirectResponse|View
     {

app/Http/Controllers/Auth/RegisterController.php

@@ -38,7 +38,6 @@ use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Redirector;
 use Illuminate\Support\Facades\Log;
-use Illuminate\Validation\ValidationException;
 use Illuminate\View\View;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
@@ -75,14 +74,6 @@ final class RegisterController extends Controller
         }
     }
 
-    /**
-     * Handle a registration request for the application.
-     *
-     * @return Application|Redirector|RedirectResponse
-     *
-     * @throws FireflyException
-     * @throws ValidationException
-     */
     public function register(Request $request): Redirector|RedirectResponse
     {
         $allowRegistration = $this->allowedToRegister();

app/Http/Controllers/Budget/IndexController.php

@@ -224,7 +224,7 @@ final class IndexController extends Controller
         Log::debug(sprintf('(getAllBudgets) Start is "%s", end is "%s"', $start->format('Y-m-d H:i:s'), $end->format('Y-m-d H:i:s')));
 
         // complement budget with budget limits in range, and expenses in currency X in range.
-        /** @var Budget $current */
+        /** @var Budget $budget */
         foreach ($collection as $budget) {
             Log::debug(sprintf('Working on budget #%d ("%s")', $budget->id, $budget->name));
             $array                = $budget->toArray();

app/Http/Controllers/Json/ReconcileController.php

@@ -128,10 +128,10 @@ final class ReconcileController extends Controller
         Log::debug(sprintf('End balance: "%s"', $endBalance));
         Log::debug(sprintf('Cleared amount: "%s"', $clearedAmount));
         Log::debug(sprintf('Amount: "%s"', $amount));
-        $difference      = bcadd(bcadd(bcsub($startBalance ?? '0', $endBalance ?? '0'), $clearedAmount), $amount);
+        $difference      = bcadd(bcadd(bcsub($startBalance, $endBalance), $clearedAmount), $amount);
         $diffCompare     = bccomp($difference, '0');
         $countCleared    = count($clearedJournals);
-        $reconSum        = bcadd(bcadd($startBalance ?? '0', $amount), $clearedAmount);
+        $reconSum        = bcadd(bcadd($startBalance, $amount), $clearedAmount);
 
         try {
             $view = view('accounts.reconcile.overview', [

app/Http/Controllers/ObjectGroup/EditController.php

@@ -29,7 +29,6 @@ use FireflyIII\Http\Requests\ObjectGroupFormRequest;
 use FireflyIII\Models\ObjectGroup;
 use FireflyIII\Repositories\ObjectGroup\ObjectGroupRepositoryInterface;
 use FireflyIII\Support\Facades\Preferences;
-use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Contracts\View\View;
 use Illuminate\Http\RedirectResponse;
@@ -77,8 +76,6 @@ final class EditController extends Controller
 
     /**
      * Update a piggy bank.
-     *
-     * @return Application|Redirector|RedirectResponse
      */
     public function update(ObjectGroupFormRequest $request, ObjectGroup $objectGroup): Redirector|RedirectResponse
     {

app/Http/Controllers/ProfileController.php

@@ -38,7 +38,6 @@ use FireflyIII\Support\Http\Controllers\CreateStuff;
 use FireflyIII\User;
 use Illuminate\Auth\AuthenticationException;
 use Illuminate\Contracts\Auth\Guard;
-use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
@@ -342,8 +341,6 @@ final class ProfileController extends Controller
     }
 
     /**
-     * @return Application|Redirector|RedirectResponse
-     *
      * @throws AuthenticationException
      */
     public function postLogoutOtherSessions(Request $request): Redirector|RedirectResponse

app/Http/Controllers/System/CronController.php

@@ -24,7 +24,6 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\System;
 
-use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Contracts\Routing\ResponseFactory;
 use Illuminate\Http\Response;
 use Illuminate\Support\Facades\Log;
@@ -34,9 +33,6 @@ use Illuminate\Support\Facades\Log;
  */
 final class CronController
 {
-    /**
-     * @return Application|Response|ResponseFactory
-     */
     public function cron(): Response|ResponseFactory
     {
         Log::error('The cron endpoint has moved to GET /api/v1/cron/[token]');

app/Http/Controllers/Transaction/BulkController.php

@@ -34,7 +34,6 @@ use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use FireflyIII\Support\Facades\Preferences;
-use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Routing\Redirector;
@@ -47,8 +46,7 @@ use Illuminate\View\View;
  */
 final class BulkController extends Controller
 {
-    /** @var JournalRepositoryInterface Journals and transactions overview */
-    private $repository;
+    private JournalRepositoryInterface $repository;
 
     /**
      * BulkController constructor.
@@ -91,8 +89,6 @@ final class BulkController extends Controller
 
     /**
      * Update all journals.
-     *
-     * @return Application|Redirector|RedirectResponse
      */
     public function update(BulkEditJournalRequest $request): Redirector|RedirectResponse
     {

app/Http/Controllers/Transaction/MassController.php

@@ -26,6 +26,7 @@ namespace FireflyIII\Http\Controllers\Transaction;
 use Carbon\Carbon;
 use FireflyIII\Enums\AccountTypeEnum;
 use FireflyIII\Enums\TransactionTypeEnum;
+use FireflyIII\Events\Model\TransactionGroup\DestroyedSingleTransactionGroup;
 use FireflyIII\Events\Model\TransactionGroup\TransactionGroupEventFlags;
 use FireflyIII\Events\Model\TransactionGroup\TransactionGroupEventObjects;
 use FireflyIII\Events\Model\TransactionGroup\UpdatedSingleTransactionGroup;
@@ -41,7 +42,6 @@ use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use FireflyIII\Services\Internal\Update\JournalUpdateService;
 use FireflyIII\Support\Facades\Preferences;
 use FireflyIII\Support\Facades\Steam;
-use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Routing\Redirector;
 use Illuminate\Support\Facades\Log;
@@ -84,16 +84,14 @@ final class MassController extends Controller
         return view('transactions.mass.delete', ['journals' => $journals, 'subTitle' => $subTitle]);
     }
 
-    /**
-     * Do the mass delete.
-     *
-     * @return Application|Redirector|RedirectResponse
-     */
     public function destroy(MassDeleteJournalRequest $request): Redirector|RedirectResponse
     {
         Log::debug(sprintf('Now in %s', __METHOD__));
-        $ids   = $request->get('confirm_mass_delete');
-        $count = 0;
+        $ids     = $request->input('confirm_mass_delete');
+        $count   = 0;
+
+        $objects = new TransactionGroupEventObjects();
+
         if (is_array($ids)) {
             Log::debug('Array of IDs', $ids);
 
@@ -104,7 +102,9 @@ final class MassController extends Controller
                 /** @var null|TransactionJournal $journal */
                 $journal = $this->repository->find((int) $journalId);
                 if (null !== $journal && (int) $journalId === $journal->id) {
+                    $objects->appendFromTransactionGroup($journal->transactionGroup);
                     $this->repository->destroyJournal($journal);
+
                     ++$count;
                     Log::debug(sprintf('Deleted transaction journal #%d', $journalId));
 
@@ -116,6 +116,11 @@ final class MassController extends Controller
         Preferences::mark();
         session()->flash('success', trans_choice('firefly.mass_deleted_transactions_success', $count));
 
+        // trigger just after destruction
+        $flags   = new TransactionGroupEventFlags();
+        event(new DestroyedSingleTransactionGroup($flags, $objects));
+        event(new WebhookMessagesRequestSending());
+
         // redirect to previous URL:
         return redirect($this->getPreviousUrl('transactions.mass-delete.url'));
     }

app/Http/Controllers/Webhooks/DeleteController.php

@@ -27,7 +27,6 @@ namespace FireflyIII\Http\Controllers\Webhooks;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\Webhook;
 use FireflyIII\Support\Facades\FireflyConfig;
-use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Contracts\View\View;
 use Illuminate\Support\Facades\Log;
@@ -56,11 +55,6 @@ final class DeleteController extends Controller
         });
     }
 
-    /**
-     * Delete account screen.
-     *
-     * @return Application|Factory|View
-     */
     public function index(Webhook $webhook): Factory|View
     {
         if (false === FireflyConfig::get('allow_webhooks', config('firefly.allow_webhooks'))->data) {

app/Http/Controllers/Webhooks/EditController.php

@@ -27,7 +27,6 @@ namespace FireflyIII\Http\Controllers\Webhooks;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\Webhook;
 use FireflyIII\Support\Facades\FireflyConfig;
-use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Contracts\View\View;
 use Illuminate\Support\Facades\Log;
@@ -55,11 +54,6 @@ final class EditController extends Controller
         });
     }
 
-    /**
-     * Delete account screen.
-     *
-     * @return Application|Factory|View
-     */
     public function index(Webhook $webhook): Factory|View
     {
         if (false === FireflyConfig::get('allow_webhooks', config('firefly.allow_webhooks'))->data) {

app/Http/Controllers/Webhooks/ShowController.php

@@ -27,7 +27,6 @@ namespace FireflyIII\Http\Controllers\Webhooks;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\Webhook;
 use FireflyIII\Support\Facades\FireflyConfig;
-use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Contracts\View\View;
 use Illuminate\Support\Facades\Log;
@@ -55,11 +54,6 @@ final class ShowController extends Controller
         });
     }
 
-    /**
-     * Delete account screen.
-     *
-     * @return Application|Factory|View
-     */
     public function index(Webhook $webhook): Factory|View
     {
         if (false === FireflyConfig::get('allow_webhooks', config('firefly.allow_webhooks'))->data) {

app/Http/Requests/AttachmentFormRequest.php

@@ -37,6 +37,8 @@ class AttachmentFormRequest extends FormRequest
     use ChecksLogin;
     use ConvertsDataTypes;
 
+    protected array $acceptedRoles = [];
+
     /**
      * Returns the data required by the controller.
      */

app/Http/Requests/BillStoreRequest.php

@@ -38,6 +38,8 @@ class BillStoreRequest extends FormRequest
     use ChecksLogin;
     use ConvertsDataTypes;
 
+    protected array $acceptedRoles = [];
+
     /**
      * Returns the data required by the controller.
      */

app/Http/Requests/BillUpdateRequest.php

@@ -39,6 +39,8 @@ class BillUpdateRequest extends FormRequest
     use ChecksLogin;
     use ConvertsDataTypes;
 
+    protected array $acceptedRoles = [];
+
     /**
      * Returns the data required by the controller.
      */

app/Http/Requests/BudgetFormStoreRequest.php

@@ -40,6 +40,8 @@ class BudgetFormStoreRequest extends FormRequest
     use ConvertsDataTypes;
     use ValidatesAutoBudgetRequest;
 
+    protected array $acceptedRoles = [];
+
     /**
      * Returns the data required by the controller.
      */

app/Http/Requests/BudgetFormUpdateRequest.php

@@ -41,6 +41,8 @@ class BudgetFormUpdateRequest extends FormRequest
     use ConvertsDataTypes;
     use ValidatesAutoBudgetRequest;
 
+    protected array $acceptedRoles = [];
+
     /**
      * Returns the data required by the controller.
      */

app/Http/Requests/BudgetIncomeRequest.php

@@ -36,6 +36,8 @@ class BudgetIncomeRequest extends FormRequest
 {
     use ChecksLogin;
 
+    protected array $acceptedRoles = [];
+
     /**
      * Rules for this request.
      */

app/Http/Requests/BulkEditJournalRequest.php

@@ -37,6 +37,8 @@ class BulkEditJournalRequest extends FormRequest
     use ChecksLogin;
     use ConvertsDataTypes;
 
+    protected array $acceptedRoles = [];
+
     /**
      * Rules for this request.
      */

app/Http/Requests/CategoryFormRequest.php

@@ -38,6 +38,8 @@ class CategoryFormRequest extends FormRequest
     use ChecksLogin;
     use ConvertsDataTypes;
 
+    protected array $acceptedRoles = [];
+
     /**
      * Get information for the controller.
      */

app/Http/Requests/ConfigurationRequest.php

@@ -35,6 +35,8 @@ class ConfigurationRequest extends FormRequest
 {
     use ChecksLogin;
 
+    protected array $acceptedRoles = [];
+
     /**
      * Returns the data required by the controller.
      */

app/Http/Requests/CurrencyFormRequest.php

@@ -38,6 +38,8 @@ class CurrencyFormRequest extends FormRequest
     use ChecksLogin;
     use ConvertsDataTypes;
 
+    protected array $acceptedRoles = [];
+
     /**
      * Returns the data required by the controller.
      */

app/Http/Requests/DeleteAccountFormRequest.php

@@ -35,6 +35,8 @@ class DeleteAccountFormRequest extends FormRequest
 {
     use ChecksLogin;
 
+    protected array $acceptedRoles = [];
+
     /**
      * Rules for this request.
      */

app/Http/Requests/EmailFormRequest.php

@@ -37,6 +37,8 @@ class EmailFormRequest extends FormRequest
     use ChecksLogin;
     use ConvertsDataTypes;
 
+    protected array $acceptedRoles = [];
+
     /**
      * Rules for this request.
      */

app/Http/Requests/ExistingTokenFormRequest.php

@@ -35,6 +35,8 @@ class ExistingTokenFormRequest extends FormRequest
 {
     use ChecksLogin;
 
+    protected array $acceptedRoles = [];
+
     /**
      * Rules for this request.
      */

app/Http/Requests/InviteUserFormRequest.php

@@ -38,6 +38,8 @@ class InviteUserFormRequest extends FormRequest
     use ChecksLogin;
     use ConvertsDataTypes;
 
+    protected array $acceptedRoles = [];
+
     /**
      * Rules for this request.
      */

app/Http/Requests/JournalLinkRequest.php

@@ -38,6 +38,8 @@ class JournalLinkRequest extends FormRequest
     use ChecksLogin;
     use ConvertsDataTypes;
 
+    protected array $acceptedRoles = [];
+
     /**
      * Returns the data required by the controller.
      */

app/Http/Requests/LinkTypeFormRequest.php

@@ -37,6 +37,8 @@ class LinkTypeFormRequest extends FormRequest
     use ChecksLogin;
     use ConvertsDataTypes;
 
+    protected array $acceptedRoles = [];
+
     /**
      * Rules for this request.
      */