Fix phpstan issues.

.ci/phpstan.neon

@@ -74,5 +74,5 @@ parameters:
     - ../bootstrap/app.php
 
   # The level 8 is the highest level. original was 5
-  level: 2
+  level: 4
 

app/Console/Commands/System/VerifySecurityAlerts.php

@@ -66,7 +66,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')) {
+        if (!$disk->has('alerts.json')) { // @phpstan-ignore-line
             app('log')->debug('No alerts.json file present.');
 
             return 0;

app/Exceptions/IntervalException.php

@@ -35,9 +35,9 @@ use Throwable;
 final class IntervalException extends Exception
 {
 
-    public readonly array       $availableIntervals;
-    public readonly Periodicity $periodicity;
-    protected                   $message = 'The periodicity %s is unknown. Choose one of available periodicity: %s';
+    public array       $availableIntervals;
+    public Periodicity $periodicity;
+    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/Handlers/Events/Model/BudgetLimitHandler.php

@@ -251,7 +251,7 @@ class BudgetLimitHandler
     {
         app('log')->debug(sprintf('BudgetLimitHandler::deleted(#%s)', $event->budgetLimit->id));
         $budgetLimit     = $event->budgetLimit;
-        $budgetLimit->id = null;
+        $budgetLimit->id = 0;
         $this->updateAvailableBudget($event->budgetLimit);
     }
 

app/Handlers/Observer/PiggyBankObserver.php

@@ -43,7 +43,7 @@ class PiggyBankObserver
         $repetition->piggyBank()->associate($piggyBank);
         $repetition->startdate     = $piggyBank->startdate;
         $repetition->targetdate    = $piggyBank->targetdate;
-        $repetition->currentamount = 0;
+        $repetition->currentamount = '0';
         $repetition->save();
     }
 

app/Handlers/Observer/WebhookObserver.php

@@ -38,7 +38,7 @@ class WebhookObserver
     public function deleting(Webhook $webhook): void
     {
         app('log')->debug('Observe "deleting" of a webhook.');
-        foreach ($webhook->webhookMessages() as $message) {
+        foreach ($webhook->webhookMessages()->get() as $message) {
             $message->delete();
         }
     }

app/Helpers/Report/NetWorth.php

@@ -159,7 +159,7 @@ class NetWorth implements NetWorthInterface
      */
     public function setUser(User | Authenticatable | null $user): void
     {
-        if (null === $user) {
+        if (!($user instanceof User)) {
             return;
         }
         $this->user      = $user;

app/Http/Controllers/ReportController.php

@@ -327,12 +327,12 @@ class ReportController extends Controller
      *
      * @param ReportFormRequest $request
      *
-     * @return RedirectResponse|Redirector
+     * @return RedirectResponse|Redirector|View
      *
      * @throws FireflyException
      *
      */
-    public function postIndex(ReportFormRequest $request)
+    public function postIndex(ReportFormRequest $request): RedirectResponse|Redirector|View
     {
         // report type:
         $reportType = $request->get('report_type');

app/Http/Controllers/Rule/SelectController.php

@@ -107,9 +107,9 @@ class SelectController extends Controller
      *
      * @param Rule $rule
      *
-     * @return Factory|View
+     * @return Factory|View|RedirectResponse
      */
-    public function selectTransactions(Rule $rule)
+    public function selectTransactions(Rule $rule): Factory|View|RedirectResponse
     {
         if (false === $rule->active) {
             session()->flash('warning', trans('firefly.cannot_fire_inactive_rules'));

app/Http/Controllers/System/InstallController.php

@@ -166,11 +166,8 @@ class InstallController extends Controller
      */
     public function keys(): void
     {
-        // switch on PHP version.
-        $keys = [];
-        // switch on class existence.
-        app('log')->info('Will run PHP8 code.');
-        $keys = RSA::createKey(4096);
+
+        $key = RSA::createKey(4096);
 
         [$publicKey, $privateKey] = [
             Passport::keyPath('oauth-public.key'),
@@ -181,7 +178,7 @@ class InstallController extends Controller
             return;
         }
 
-        file_put_contents($publicKey, $keys['publickey']);
-        file_put_contents($privateKey, $keys['privatekey']);
+        file_put_contents($publicKey, (string) $key->getPublicKey());
+        file_put_contents($privateKey, $key->toString('PKCS1'));
     }
 }

app/Jobs/CreateAutoBudgetLimits.php

@@ -240,7 +240,7 @@ class CreateAutoBudgetLimits implements ShouldQueue
         $budgetLimit->end_date   = $end;
         $budgetLimit->amount     = $amount ?? $autoBudget->amount;
         $budgetLimit->period     = $autoBudget->period;
-        $budgetLimit->generated  = true;
+        $budgetLimit->generated  = 1;
         $budgetLimit->save();
 
         app('log')->debug(sprintf('Created budget limit #%d.', $budgetLimit->id));

app/Models/Account.php

@@ -43,9 +43,9 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
  * Class Account
  *
  * @property int                             $id
- * @property \Illuminate\Support\Carbon|null $created_at
- * @property \Illuminate\Support\Carbon|null $updated_at
- * @property \Illuminate\Support\Carbon|null $deleted_at
+ * @property Carbon|null $created_at
+ * @property Carbon|null $updated_at
+ * @property Carbon|null $deleted_at
  * @property int                             $user_id
  * @property int                             $account_type_id
  * @property string                          $name

app/Models/AccountMeta.php

@@ -27,7 +27,7 @@ use Eloquent;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
-use Illuminate\Support\Carbon;
+use Carbon\Carbon;
 
 /**
  * Class AccountMeta

app/Models/AccountType.php

@@ -28,7 +28,7 @@ use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
-use Illuminate\Support\Carbon;
+use Carbon\Carbon;
 
 /**
  * FireflyIII\Models\AccountType

app/Models/Attachment.php

@@ -32,7 +32,7 @@ use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Query\Builder;
-use Illuminate\Support\Carbon;
+use Carbon\Carbon;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**

app/Models/AuditLogEntry.php

@@ -29,7 +29,7 @@ use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 use Illuminate\Database\Eloquent\SoftDeletes;
-use Illuminate\Support\Carbon;
+use Carbon\Carbon;
 
 /**
  * Class AuditLogEntry

app/Models/AutoBudget.php

@@ -30,7 +30,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Query\Builder;
-use Illuminate\Support\Carbon;
+use Carbon\Carbon;
 
 /**
  * FireflyIII\Models\AutoBudget

app/Models/AvailableBudget.php

@@ -30,7 +30,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Query\Builder;
-use Illuminate\Support\Carbon;
+use Carbon\Carbon;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**

app/Models/Bill.php

@@ -33,7 +33,7 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Query\Builder;
-use Illuminate\Support\Carbon;
+use Carbon\Carbon;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**

app/Models/Budget.php

@@ -33,7 +33,7 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Query\Builder;
-use Illuminate\Support\Carbon;
+use Carbon\Carbon;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**

app/Models/BudgetLimit.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Models;
 
+use Carbon\Carbon;
 use Eloquent;
 use FireflyIII\Events\Model\BudgetLimit\Created;
 use FireflyIII\Events\Model\BudgetLimit\Deleted;
@@ -31,7 +32,6 @@ use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
-use Illuminate\Support\Carbon;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**

app/Models/Category.php

@@ -39,9 +39,9 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
  * FireflyIII\Models\Category
  *
  * @property int                                  $id
- * @property \Illuminate\Support\Carbon|null      $created_at
- * @property \Illuminate\Support\Carbon|null      $updated_at
- * @property \Illuminate\Support\Carbon|null      $deleted_at
+ * @property Carbon|null      $created_at
+ * @property Carbon|null      $updated_at
+ * @property Carbon|null      $deleted_at
  * @property int                                  $user_id
  * @property string                               $name
  * @property Carbon                               $lastActivity

app/Models/Configuration.php

@@ -27,7 +27,7 @@ use Eloquent;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Query\Builder;
-use Illuminate\Support\Carbon;
+use Carbon\Carbon;
 
 /**
  * FireflyIII\Models\Configuration

app/Models/CurrencyExchangeRate.php

@@ -30,7 +30,7 @@ use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\SoftDeletes;
-use Illuminate\Support\Carbon;
+use Carbon\Carbon;
 
 /**
  * Class CurrencyExchangeRate

app/Models/GroupMembership.php

@@ -29,7 +29,7 @@ use FireflyIII\User;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
-use Illuminate\Support\Carbon;
+use Carbon\Carbon;
 
 /**
  * Class GroupMembership

app/Models/LinkType.php

@@ -29,7 +29,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Query\Builder;
-use Illuminate\Support\Carbon;
+use Carbon\Carbon;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**

app/Models/Location.php

@@ -30,7 +30,7 @@ use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
-use Illuminate\Support\Carbon;
+use Carbon\Carbon;
 
 /**
  * FireflyIII\Models\Location

app/Models/Note.php

@@ -28,7 +28,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Query\Builder;
-use Illuminate\Support\Carbon;
+use Carbon\Carbon;
 
 /**
  * FireflyIII\Models\Note

app/Models/ObjectGroup.php

@@ -31,7 +31,7 @@ use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\MorphToMany;
-use Illuminate\Support\Carbon;
+use Carbon\Carbon;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**

app/Models/PiggyBank.php

@@ -33,7 +33,7 @@ use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Illuminate\Database\Eloquent\Relations\MorphToMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Query\Builder;
-use Illuminate\Support\Carbon;
+use Carbon\Carbon;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**

app/Models/PiggyBankEvent.php

@@ -28,7 +28,7 @@ use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
-use Illuminate\Support\Carbon;
+use Carbon\Carbon;
 
 /**
  * FireflyIII\Models\PiggyBankEvent

app/Models/PiggyBankRepetition.php

@@ -34,11 +34,11 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
  * FireflyIII\Models\PiggyBankRepetition
  *
  * @property int                             $id
- * @property \Illuminate\Support\Carbon|null $created_at
- * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property Carbon|null $created_at
+ * @property Carbon|null $updated_at
  * @property int                             $piggy_bank_id
- * @property \Illuminate\Support\Carbon|null $startdate
- * @property \Illuminate\Support\Carbon|null $targetdate
+ * @property Carbon|null $startdate
+ * @property Carbon|null $targetdate
  * @property string                          $currentamount
  * @property-read PiggyBank                  $piggyBank
  * @method static EloquentBuilder|PiggyBankRepetition newModelQuery()

app/Models/Preference.php

@@ -28,7 +28,7 @@ use FireflyIII\User;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
-use Illuminate\Support\Carbon;
+use Carbon\Carbon;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**

app/Models/Recurrence.php

@@ -32,7 +32,7 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Query\Builder;
-use Illuminate\Support\Carbon;
+use Carbon\Carbon;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**

app/Models/RecurrenceMeta.php

@@ -28,7 +28,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Query\Builder;
-use Illuminate\Support\Carbon;
+use Carbon\Carbon;
 
 /**
  * FireflyIII\Models\RecurrenceMeta

app/Models/RecurrenceRepetition.php

@@ -28,7 +28,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Query\Builder;
-use Illuminate\Support\Carbon;
+use Carbon\Carbon;
 
 /**
  * FireflyIII\Models\RecurrenceRepetition

app/Models/RecurrenceTransaction.php

@@ -31,7 +31,7 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Query\Builder;
-use Illuminate\Support\Carbon;
+use Carbon\Carbon;
 
 /**
  * FireflyIII\Models\RecurrenceTransaction

app/Models/RecurrenceTransactionMeta.php

@@ -28,7 +28,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Query\Builder;
-use Illuminate\Support\Carbon;
+use Carbon\Carbon;
 
 /**
  * FireflyIII\Models\RecurrenceTransactionMeta

app/Models/Role.php

@@ -29,7 +29,7 @@ use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
-use Illuminate\Support\Carbon;
+use Carbon\Carbon;
 
 /**
  * FireflyIII\Models\Role

app/Models/Rule.php

@@ -31,7 +31,7 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Query\Builder;
-use Illuminate\Support\Carbon;
+use Carbon\Carbon;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**

app/Models/RuleAction.php

@@ -27,7 +27,7 @@ use Eloquent;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
-use Illuminate\Support\Carbon;
+use Carbon\Carbon;
 
 /**
  * FireflyIII\Models\RuleAction

app/Models/RuleGroup.php

@@ -31,7 +31,7 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Query\Builder;
-use Illuminate\Support\Carbon;
+use Carbon\Carbon;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**

app/Models/RuleTrigger.php

@@ -27,7 +27,7 @@ use Eloquent;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
-use Illuminate\Support\Carbon;
+use Carbon\Carbon;
 
 /**
  * FireflyIII\Models\RuleTrigger

app/Models/Tag.php

@@ -32,7 +32,7 @@ use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Query\Builder;
-use Illuminate\Support\Carbon;
+use Carbon\Carbon;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**

app/Models/Transaction.php

@@ -38,9 +38,9 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  * FireflyIII\Models\Transaction
  *
  * @property int                             $id
- * @property \Illuminate\Support\Carbon|null $created_at
- * @property \Illuminate\Support\Carbon|null $updated_at
- * @property \Illuminate\Support\Carbon|null $deleted_at
+ * @property Carbon|null $created_at
+ * @property Carbon|null $updated_at
+ * @property Carbon|null $deleted_at
  * @property bool                            $reconciled
  * @property int                             $account_id
  * @property int                             $transaction_journal_id

app/Models/TransactionCurrency.php

@@ -31,7 +31,7 @@ use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Query\Builder;
-use Illuminate\Support\Carbon;
+use Carbon\Carbon;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**

app/Models/TransactionGroup.php

@@ -31,7 +31,7 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Query\Builder;
-use Illuminate\Support\Carbon;
+use Carbon\Carbon;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**

app/Models/TransactionJournalLink.php

@@ -29,7 +29,7 @@ use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\MorphMany;
-use Illuminate\Support\Carbon;
+use Carbon\Carbon;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**

app/Models/TransactionJournalMeta.php

@@ -28,7 +28,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Query\Builder;
-use Illuminate\Support\Carbon;
+use Carbon\Carbon;
 
 /**
  * FireflyIII\Models\TransactionJournalMeta

app/Models/TransactionType.php

@@ -29,7 +29,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Query\Builder;
-use Illuminate\Support\Carbon;
+use Carbon\Carbon;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**

app/Models/UserGroup.php

@@ -33,7 +33,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\HasManyThrough;
-use Illuminate\Support\Carbon;
+use Carbon\Carbon;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**

app/Models/UserRole.php

@@ -29,7 +29,7 @@ use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
-use Illuminate\Support\Carbon;
+use Carbon\Carbon;
 
 /**
  * Class UserRole

app/Models/Webhook.php

@@ -34,7 +34,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
-use Illuminate\Support\Carbon;
+use Carbon\Carbon;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**

app/Models/WebhookAttempt.php

@@ -29,7 +29,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Query\Builder;
-use Illuminate\Support\Carbon;
+use Carbon\Carbon;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**

app/Models/WebhookMessage.php

@@ -31,7 +31,7 @@ use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
-use Illuminate\Support\Carbon;
+use Carbon\Carbon;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**

app/Repositories/Account/AccountRepository.php

@@ -250,7 +250,7 @@ class AccountRepository implements AccountRepositoryInterface
             static function (Attachment $attachment) use ($disk) {
                 $notes                   = $attachment->notes()->first();
                 $attachment->file_exists = $disk->exists($attachment->fileName());
-                $attachment->notes       = $notes ? $notes->text : '';
+                $attachment->notes_text  = $notes ? $notes->text : '';
 
                 return $attachment;
             }
@@ -279,7 +279,7 @@ class AccountRepository implements AccountRepositoryInterface
      */
     public function setUser(User | Authenticatable | null $user): void
     {
-        if (null !== $user) {
+        if ($user instanceof User) {
             $this->user = $user;
         }
     }

app/Repositories/Account/AccountTasker.php

@@ -315,7 +315,7 @@ class AccountTasker implements AccountTaskerInterface
      */
     public function setUser(User | Authenticatable | null $user): void
     {
-        if (null !== $user) {
+        if ($user instanceof User) {
             $this->user = $user;
         }
     }

app/Repositories/Account/OperationsRepository.php

@@ -83,7 +83,7 @@ class OperationsRepository implements OperationsRepositoryInterface
      */
     public function setUser(User | Authenticatable | null $user): void
     {
-        if (null !== $user) {
+        if ($user instanceof User) {
             $this->user = $user;
         }
     }

app/Repositories/Attachment/AttachmentRepository.php

@@ -156,7 +156,7 @@ class AttachmentRepository implements AttachmentRepositoryInterface
      */
     public function setUser(User | Authenticatable | null $user): void
     {
-        if (null !== $user) {
+        if ($user instanceof User) {
             $this->user = $user;
         }
     }

app/Repositories/Bill/BillRepository.php

@@ -199,7 +199,7 @@ class BillRepository implements BillRepositoryInterface
             static function (Attachment $attachment) use ($disk) {
                 $notes                   = $attachment->notes()->first();
                 $attachment->file_exists = $disk->exists($attachment->fileName());
-                $attachment->notes       = $notes ? $notes->text : '';
+                $attachment->notes_text       = $notes ? $notes->text : '';
 
                 return $attachment;
             }
@@ -344,7 +344,7 @@ class BillRepository implements BillRepositoryInterface
      */
     public function setUser(User | Authenticatable | null $user): void
     {
-        if (null !== $user) {
+        if ($user instanceof User) {
             $this->user = $user;
         }
     }

app/Repositories/Budget/AvailableBudgetRepository.php

@@ -248,8 +248,8 @@ class AvailableBudgetRepository implements AvailableBudgetRepositoryInterface
             $availableBudget = new AvailableBudget();
             $availableBudget->user()->associate($this->user);
             $availableBudget->transactionCurrency()->associate($currency);
-            $availableBudget->start_date = $start->format('Y-m-d');
-            $availableBudget->end_date   = $end->format('Y-m-d');
+            $availableBudget->start_date = $start->startOfDay();
+            $availableBudget->end_date   = $end->endOfDay();
         }
         $availableBudget->amount = $amount;
         $availableBudget->save();
@@ -262,7 +262,7 @@ class AvailableBudgetRepository implements AvailableBudgetRepositoryInterface
      */
     public function setUser(User | Authenticatable | null $user): void
     {
-        if (null !== $user) {
+        if ($user instanceof User) {
             $this->user = $user;
         }
     }

app/Repositories/Budget/BudgetLimitRepository.php

@@ -275,7 +275,7 @@ class BudgetLimitRepository implements BudgetLimitRepositoryInterface
      */
     public function setUser(User | Authenticatable | null $user): void
     {
-        if (null !== $user) {
+        if ($user instanceof User) {
             $this->user = $user;
         }
     }

app/Repositories/Budget/BudgetRepository.php

@@ -148,7 +148,7 @@ class BudgetRepository implements BudgetRepositoryInterface
      */
     public function setUser(User | Authenticatable | null $user): void
     {
-        if (null !== $user) {
+        if ($user instanceof User) {
             $this->user = $user;
         }
     }
@@ -589,7 +589,7 @@ class BudgetRepository implements BudgetRepositoryInterface
             static function (Attachment $attachment) use ($disk) {
                 $notes                   = $attachment->notes()->first();
                 $attachment->file_exists = $disk->exists($attachment->fileName());
-                $attachment->notes       = $notes ? $notes->text : '';
+                $attachment->notes_text  = $notes ? $notes->text : '';
 
                 return $attachment;
             }

app/Repositories/Budget/NoBudgetRepository.php

@@ -143,7 +143,7 @@ class NoBudgetRepository implements NoBudgetRepositoryInterface
      */
     public function setUser(User | Authenticatable | null $user): void
     {
-        if (null !== $user) {
+        if ($user instanceof User) {
             $this->user = $user;
         }
     }

app/Repositories/Budget/OperationsRepository.php

@@ -204,7 +204,7 @@ class OperationsRepository implements OperationsRepositoryInterface
      */
     public function setUser(User | Authenticatable | null $user): void
     {
-        if (null !== $user) {
+        if ($user instanceof User) {
             $this->user = $user;
         }
     }

app/Repositories/Category/CategoryRepository.php

@@ -200,7 +200,7 @@ class CategoryRepository implements CategoryRepositoryInterface
      */
     public function setUser(User | Authenticatable | null $user): void
     {
-        if (null !== $user) {
+        if ($user instanceof User) {
             $this->user = $user;
         }
     }
@@ -306,7 +306,7 @@ class CategoryRepository implements CategoryRepositoryInterface
             static function (Attachment $attachment) use ($disk) {
                 $notes                   = $attachment->notes()->first();
                 $attachment->file_exists = $disk->exists($attachment->fileName());
-                $attachment->notes       = $notes ? $notes->text : '';
+                $attachment->notes_text       = $notes ? $notes->text : '';
 
                 return $attachment;
             }

app/Repositories/Category/NoCategoryRepository.php

@@ -95,7 +95,7 @@ class NoCategoryRepository implements NoCategoryRepositoryInterface
      */
     public function setUser(User | Authenticatable | null $user): void
     {
-        if (null !== $user) {
+        if ($user instanceof User) {
             $this->user = $user;
         }
     }

app/Repositories/Category/OperationsRepository.php

@@ -121,7 +121,7 @@ class OperationsRepository implements OperationsRepositoryInterface
      */
     public function setUser(User | Authenticatable | null $user): void
     {
-        if (null !== $user) {
+        if ($user instanceof User) {
             $this->user = $user;
         }
     }

app/Repositories/Currency/CurrencyRepository.php

@@ -76,7 +76,7 @@ class CurrencyRepository implements CurrencyRepositoryInterface
     {
         if ($fromCurrency->id === $toCurrency->id) {
             $rate       = new CurrencyExchangeRate();
-            $rate->rate = 1;
+            $rate->rate = "1";
             $rate->id   = 0;
 
             return $rate;
@@ -123,7 +123,7 @@ class CurrencyRepository implements CurrencyRepositoryInterface
      */
     public function setUser(User | Authenticatable | null $user): void
     {
-        if (null !== $user) {
+        if ($user instanceof User) {
             $this->user = $user;
         }
     }

app/Repositories/Journal/JournalAPIRepository.php

@@ -74,7 +74,7 @@ class JournalAPIRepository implements JournalAPIRepositoryInterface
             static function (Attachment $attachment) use ($disk) {
                 $notes                   = $attachment->notes()->first();
                 $attachment->file_exists = $disk->exists($attachment->fileName());
-                $attachment->notes       = $notes ? $notes->text : ''; // TODO should not set notes like this.
+                $attachment->notes_text  = $notes ? $notes->text : ''; // TODO should not set notes like this.
 
                 return $attachment;
             }
@@ -115,7 +115,7 @@ class JournalAPIRepository implements JournalAPIRepositoryInterface
      */
     public function setUser(User | Authenticatable | null $user): void
     {
-        if (null !== $user) {
+        if ($user instanceof User) {
             $this->user = $user;
         }
     }

app/Repositories/Journal/JournalRepository.php

@@ -257,7 +257,7 @@ class JournalRepository implements JournalRepositoryInterface
      */
     public function setUser(User | Authenticatable | null $user): void
     {
-        if (null !== $user) {
+        if ($user instanceof User) {
             $this->user = $user;
         }
     }

app/Repositories/LinkType/LinkTypeRepository.php

@@ -209,7 +209,7 @@ class LinkTypeRepository implements LinkTypeRepositoryInterface
      */
     public function setUser(User | Authenticatable | null $user): void
     {
-        if (null !== $user) {
+        if ($user instanceof User) {
             $this->user = $user;
         }
     }

app/Repositories/ObjectGroup/ObjectGroupRepository.php

@@ -155,7 +155,7 @@ class ObjectGroupRepository implements ObjectGroupRepositoryInterface
      */
     public function setUser(User | Authenticatable | null $user): void
     {
-        if (null !== $user) {
+        if ($user instanceof User) {
             $this->user = $user;
         }
     }

app/Repositories/PiggyBank/PiggyBankRepository.php

@@ -125,7 +125,7 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface
             static function (Attachment $attachment) use ($disk) {
                 $notes                   = $attachment->notes()->first();
                 $attachment->file_exists = $disk->exists($attachment->fileName());
-                $attachment->notes       = $notes ? $notes->text : ''; // TODO setting the text to the 'notes' field doesn't work.
+                $attachment->notes_text       = $notes ? $notes->text : '';
 
                 return $attachment;
             }
@@ -278,7 +278,7 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface
      */
     public function setUser(User | Authenticatable | null $user): void
     {
-        if (null !== $user) {
+        if ($user instanceof User) {
             $this->user = $user;
         }
     }

app/Repositories/Recurring/RecurringRepository.php

@@ -349,7 +349,7 @@ class RecurringRepository implements RecurringRepositoryInterface
      */
     public function setUser(User | Authenticatable | null $user): void
     {
-        if (null !== $user) {
+        if ($user instanceof User) {
             $this->user = $user;
         }
     }

app/Repositories/Rule/RuleRepository.php

@@ -366,7 +366,7 @@ class RuleRepository implements RuleRepositoryInterface
      */
     public function setUser(User | Authenticatable | null $user): void
     {
-        if (null !== $user) {
+        if ($user instanceof User) {
             $this->user = $user;
         }
     }

app/Repositories/RuleGroup/RuleGroupRepository.php

@@ -447,7 +447,7 @@ class RuleGroupRepository implements RuleGroupRepositoryInterface
      */
     public function setUser(User | Authenticatable | null $user): void
     {
-        if (null !== $user) {
+        if ($user instanceof User) {
             $this->user = $user;
         }
     }

app/Repositories/Tag/OperationsRepository.php

@@ -124,7 +124,7 @@ class OperationsRepository implements OperationsRepositoryInterface
      */
     public function setUser(User | Authenticatable | null $user): void
     {
-        if (null !== $user) {
+        if ($user instanceof User) {
             $this->user = $user;
         }
     }

app/Repositories/Tag/TagRepository.php

@@ -113,7 +113,7 @@ class TagRepository implements TagRepositoryInterface
      */
     public function setUser(User | Authenticatable | null $user): void
     {
-        if (null !== $user) {
+        if ($user instanceof User   ) {
             $this->user = $user;
         }
     }

app/Repositories/TransactionGroup/TransactionGroupRepository.php

@@ -193,7 +193,7 @@ class TransactionGroupRepository implements TransactionGroupRepositoryInterface
      */
     public function setUser(User | Authenticatable | null $user): void
     {
-        if (null !== $user) {
+        if ($user instanceof user) {
             $this->user = $user;
         }
     }

app/Repositories/UserGroup/UserGroupRepository.php

@@ -182,7 +182,7 @@ class UserGroupRepository implements UserGroupRepositoryInterface
     public function setUser(Authenticatable | User | null $user): void
     {
         app('log')->debug(sprintf('Now in %s', __METHOD__));
-        if (null !== $user) {
+        if ($user instanceof User) {
             $this->user = $user;
         }
     }

app/Repositories/UserGroups/Account/AccountRepositoryInterface.php

@@ -27,6 +27,7 @@ namespace FireflyIII\Repositories\UserGroups\Account;
 
 use FireflyIII\Models\Account;
 use FireflyIII\Models\TransactionCurrency;
+use FireflyIII\Models\UserGroup;
 use FireflyIII\User;
 use Illuminate\Support\Collection;
 
@@ -35,6 +36,12 @@ use Illuminate\Support\Collection;
  */
 interface AccountRepositoryInterface
 {
+    /**
+     * @param UserGroup $userGroup
+     *
+     * @return void
+     */
+    public function setUserGroup(UserGroup $userGroup): void;
 
     /**
      * @param User $user

app/Repositories/UserGroups/Budget/BudgetRepositoryInterface.php

@@ -25,6 +25,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Repositories\UserGroups\Budget;
 
+use FireflyIII\Models\UserGroup;
 use FireflyIII\User;
 use Illuminate\Support\Collection;
 
@@ -39,6 +40,13 @@ interface BudgetRepositoryInterface
      * @return void
      */
     public function setUser(User $user): void;
+
+    /**
+     * @param UserGroup $userGroup
+     *
+     * @return void
+     */
+    public function setUserGroup(UserGroup $userGroup): void;
     /**
      * @return Collection
      */

app/Repositories/Webhook/WebhookRepository.php

@@ -109,7 +109,7 @@ class WebhookRepository implements WebhookRepositoryInterface
      */
     public function setUser(User | Authenticatable | null $user): void
     {
-        if (null !== $user) {
+        if ($user instanceof User) {
             $this->user = $user;
         }
     }

app/Rules/ValidRecurrenceRepetitionType.php

@@ -36,11 +36,9 @@ class ValidRecurrenceRepetitionType implements ValidationRule
     /**
      * Determine if the validation rule passes.
      *
-     * @param string $attribute
-     * @param mixed  $value
-     *
-     * @return bool
-     *
+     * @param string  $attribute
+     * @param mixed   $value
+     * @param Closure $fail
      */
     public function validate(string $attribute, mixed $value, Closure $fail): void
     {

app/Support/Amount.php

@@ -136,7 +136,7 @@ class Amount
     }
 
     /**
-     * @param User $user
+     * @param UserGroup $userGroup
      *
      * @return TransactionCurrency
      */

app/Support/Http/Controllers/CreateStuff.php

@@ -112,12 +112,12 @@ trait CreateStuff
             return;
         }
 
-        $keys = RSA::createKey(4096);
+        $key = RSA::createKey(4096);
 
         Log::alert('NO OAuth keys were found. They have been created.');
 
-        file_put_contents($publicKey, $keys['publickey']);
-        file_put_contents($privateKey, $keys['privatekey']);
+        file_put_contents($publicKey, (string) $key->getPublicKey());
+        file_put_contents($privateKey, $key->toString('PKCS1'));
     }
 
     /**

app/Support/Repositories/UserGroup/UserGroupTrait.php

@@ -66,7 +66,7 @@ trait UserGroupTrait
      */
     public function setUser(Authenticatable | User | null $user): void
     {
-        if (null !== $user) {
+        if ($user instanceof User) {
             $this->user      = $user;
             $this->userGroup = $user->userGroup;
         }

app/Support/Search/AccountSearch.php

@@ -139,7 +139,7 @@ class AccountSearch implements GenericSearchInterface
      */
     public function setUser(User | Authenticatable | null $user): void
     {
-        if (null !== $user) {
+        if ($user instanceof User) {
             $this->user = $user;
         }
     }

app/Transformers/V2/PiggyBankTransformer.php

@@ -239,7 +239,12 @@ class PiggyBankTransformer extends AbstractTransformer
     }
 
     /**
-     * @return string|null
+     * @param string      $currentAmount
+     * @param string      $targetAmount
+     * @param Carbon|null $startDate
+     * @param Carbon|null $targetDate
+     *
+     * @return string
      */
     private function getSuggestedMonthlyAmount(string $currentAmount, string $targetAmount, ?Carbon $startDate, ?Carbon $targetDate): string
     {

app/User.php

@@ -66,7 +66,7 @@ use Illuminate\Notifications\DatabaseNotification;
 use Illuminate\Notifications\DatabaseNotificationCollection;
 use Illuminate\Notifications\Notifiable;
 use Illuminate\Notifications\Notification;
-use Illuminate\Support\Carbon;
+use Carbon\Carbon;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
 use Laravel\Passport\Client;
@@ -389,7 +389,8 @@ class User extends Authenticatable
      *
      * @param UserGroup    $userGroup
      * @param UserRoleEnum $role
-     * @param bool         $allowOverride
+     * @param bool         $allowGroupOverride
+     * @param bool         $allowSystemOverride
      *
      * @return bool
      */

resources/views/list/attachments.twig

@@ -27,8 +27,8 @@
                         {% endif %}
                     </a>
                     ({{ attachment.size|filesize }})
-                    {% if null != attachment.notes  and '' != attachment.notes %}
-                        {{ attachment.notes|default('')|markdown }}
+                    {% if null != attachment.notes_text  and '' != attachment.notes_text %}
+                        {{ attachment.notes_text|default('')|markdown }}
                     {% endif %}
                 {% endif %}
                 {% if not attachment.file_exists %}