🤖 Auto commit for release 'develop' on 2025-09-07

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

@@ -402,16 +402,16 @@
         },
         {
             "name": "friendsofphp/php-cs-fixer",
-            "version": "v3.86.0",
+            "version": "v3.87.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
-                "reference": "4a952bd19dc97879b0620f495552ef09b55f7d36"
+                "reference": "2f5170365e2a422d0c5421f9c8818b2c078105f6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/4a952bd19dc97879b0620f495552ef09b55f7d36",
+                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/2f5170365e2a422d0c5421f9c8818b2c078105f6",
-                "reference": "4a952bd19dc97879b0620f495552ef09b55f7d36",
+                "reference": "2f5170365e2a422d0c5421f9c8818b2c078105f6",
                 "shasum": ""
             },
             "require": {
@@ -422,39 +422,38 @@
                 "ext-hash": "*",
                 "ext-json": "*",
                 "ext-tokenizer": "*",
-                "fidry/cpu-core-counter": "^1.2",
+                "fidry/cpu-core-counter": "^1.3",
                 "php": "^7.4 || ^8.0",
                 "react/child-process": "^0.6.6",
                 "react/event-loop": "^1.5",
-                "react/promise": "^3.2",
+                "react/promise": "^3.3",
                 "react/socket": "^1.16",
                 "react/stream": "^1.4",
                 "sebastian/diff": "^4.0.6 || ^5.1.1 || ^6.0.2 || ^7.0",
-                "symfony/console": "^5.4.47 || ^6.4.13 || ^7.0",
+                "symfony/console": "^5.4.47 || ^6.4.24 || ^7.0",
-                "symfony/event-dispatcher": "^5.4.45 || ^6.4.13 || ^7.0",
+                "symfony/event-dispatcher": "^5.4.45 || ^6.4.24 || ^7.0",
-                "symfony/filesystem": "^5.4.45 || ^6.4.13 || ^7.0",
+                "symfony/filesystem": "^5.4.45 || ^6.4.24 || ^7.0",
-                "symfony/finder": "^5.4.45 || ^6.4.17 || ^7.0",
+                "symfony/finder": "^5.4.45 || ^6.4.24 || ^7.0",
-                "symfony/options-resolver": "^5.4.45 || ^6.4.16 || ^7.0",
+                "symfony/options-resolver": "^5.4.45 || ^6.4.24 || ^7.0",
-                "symfony/polyfill-mbstring": "^1.32",
+                "symfony/polyfill-mbstring": "^1.33",
-                "symfony/polyfill-php80": "^1.32",
+                "symfony/polyfill-php80": "^1.33",
-                "symfony/polyfill-php81": "^1.32",
+                "symfony/polyfill-php81": "^1.33",
-                "symfony/process": "^5.4.47 || ^6.4.20 || ^7.2",
+                "symfony/process": "^5.4.47 || ^6.4.24 || ^7.2",
-                "symfony/stopwatch": "^5.4.45 || ^6.4.19 || ^7.0"
+                "symfony/stopwatch": "^5.4.45 || ^6.4.24 || ^7.0"
             },
             "require-dev": {
-                "facile-it/paraunit": "^1.3.1 || ^2.6",
+                "facile-it/paraunit": "^1.3.1 || ^2.7",
                 "infection/infection": "^0.29.14",
-                "justinrainbow/json-schema": "^5.3 || ^6.4",
+                "justinrainbow/json-schema": "^6.5",
                 "keradus/cli-executor": "^2.2",
                 "mikey179/vfsstream": "^1.6.12",
                 "php-coveralls/php-coveralls": "^2.8",
-                "php-cs-fixer/accessible-object": "^1.1",
                 "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.6",
                 "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.6",
-                "phpunit/phpunit": "^9.6.23 || ^10.5.47 || ^11.5.25",
+                "phpunit/phpunit": "^9.6.25 || ^10.5.53 || ^11.5.34",
-                "symfony/polyfill-php84": "^1.32",
+                "symfony/polyfill-php84": "^1.33",
-                "symfony/var-dumper": "^5.4.48 || ^6.4.23 || ^7.3.1",
+                "symfony/var-dumper": "^5.4.48 || ^6.4.24 || ^7.3.2",
-                "symfony/yaml": "^5.4.45 || ^6.4.23 || ^7.3.1"
+                "symfony/yaml": "^5.4.45 || ^6.4.24 || ^7.3.2"
             },
             "suggest": {
                 "ext-dom": "For handling output formats in XML",
@@ -495,7 +494,7 @@
             ],
             "support": {
                 "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues",
-                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.86.0"
+                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.87.1"
             },
             "funding": [
                 {
@@ -503,7 +502,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-08-13T22:36:21+00:00"
+            "time": "2025-09-02T15:27:36+00:00"
         },
         {
             "name": "psr/container",

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

@@ -200,18 +200,18 @@ class BudgetController extends Controller
         return $return;
     }
 
-//    /**
+    //    /**
-//     * When no budget limits are present, the expenses of the whole period are collected and grouped.
+    //     * When no budget limits are present, the expenses of the whole period are collected and grouped.
-//     * This is grouped per currency. Because there is no limit set, "left to spend" and "overspent" are empty.
+    //     * This is grouped per currency. Because there is no limit set, "left to spend" and "overspent" are empty.
-//     *
+    //     *
-//     * @throws FireflyException
+    //     * @throws FireflyException
-//     */
+    //     */
-//    private function noBudgetLimits(Budget $budget, Carbon $start, Carbon $end): array
+    //    private function noBudgetLimits(Budget $budget, Carbon $start, Carbon $end): array
-//    {
+    //    {
-//        $spent = $this->opsRepository->listExpenses($start, $end, null, new Collection([$budget]));
+    //        $spent = $this->opsRepository->listExpenses($start, $end, null, new Collection([$budget]));
-//
+    //
-//        return $this->processExpenses($budget->id, $spent, $start, $end);
+    //        return $this->processExpenses($budget->id, $spent, $start, $end);
-//    }
+    //    }
 
     /**
      * Shared between the "noBudgetLimits" function and "processLimit". Will take a single set of expenses and return
@@ -257,59 +257,59 @@ class BudgetController extends Controller
         return $return;
     }
 
-//    /**
+    //    /**
-//     * Function that processes each budget limit (per budget).
+    //     * Function that processes each budget limit (per budget).
-//     *
+    //     *
-//     * If you have a budget limit in EUR, only transactions in EUR will be considered.
+    //     * If you have a budget limit in EUR, only transactions in EUR will be considered.
-//     * If you have a budget limit in GBP, only transactions in GBP will be considered.
+    //     * If you have a budget limit in GBP, only transactions in GBP will be considered.
-//     *
+    //     *
-//     * If you have a budget limit in EUR, and a transaction in GBP, it will not be considered for the EUR budget limit.
+    //     * If you have a budget limit in EUR, and a transaction in GBP, it will not be considered for the EUR budget limit.
-//     *
+    //     *
-//     * @throws FireflyException
+    //     * @throws FireflyException
-//     */
+    //     */
-//    private function budgetLimits(Budget $budget, Collection $limits): array
+    //    private function budgetLimits(Budget $budget, Collection $limits): array
-//    {
+    //    {
-//        Log::debug(sprintf('Now in budgetLimits(#%d)', $budget->id));
+    //        Log::debug(sprintf('Now in budgetLimits(#%d)', $budget->id));
-//        $data = [];
+    //        $data = [];
-//
+    //
-//        /** @var BudgetLimit $limit */
+    //        /** @var BudgetLimit $limit */
-//        foreach ($limits as $limit) {
+    //        foreach ($limits as $limit) {
-//            $data = array_merge($data, $this->processLimit($budget, $limit));
+    //            $data = array_merge($data, $this->processLimit($budget, $limit));
-//        }
+    //        }
-//
+    //
-//        return $data;
+    //        return $data;
-//    }
+    //    }
 
-//    /**
+    //    /**
-//     * @throws FireflyException
+    //     * @throws FireflyException
-//     */
+    //     */
-//    private function processLimit(Budget $budget, BudgetLimit $limit): array
+    //    private function processLimit(Budget $budget, BudgetLimit $limit): array
-//    {
+    //    {
-//        Log::debug(sprintf('Created new ExchangeRateConverter in %s', __METHOD__));
+    //        Log::debug(sprintf('Created new ExchangeRateConverter in %s', __METHOD__));
-//        $end             = clone $limit->end_date;
+    //        $end             = clone $limit->end_date;
-//        $end->endOfDay();
+    //        $end->endOfDay();
-//        $spent           = $this->opsRepository->listExpenses($limit->start_date, $end, null, new Collection([$budget]));
+    //        $spent           = $this->opsRepository->listExpenses($limit->start_date, $end, null, new Collection([$budget]));
-//        $limitCurrencyId = $limit->transaction_currency_id;
+    //        $limitCurrencyId = $limit->transaction_currency_id;
-//
+    //
-//        /** @var array $entry */
+    //        /** @var array $entry */
-//        // only spent the entry where the entry's currency matches the budget limit's currency
+    //        // only spent the entry where the entry's currency matches the budget limit's currency
-//        // so $filtered will only have 1 or 0 entries
+    //        // so $filtered will only have 1 or 0 entries
-//        $filtered        = array_filter($spent, fn ($entry) => $entry['currency_id'] === $limitCurrencyId);
+    //        $filtered        = array_filter($spent, fn ($entry) => $entry['currency_id'] === $limitCurrencyId);
-//        $result          = $this->processExpenses($budget->id, $filtered, $limit->start_date, $end);
+    //        $result          = $this->processExpenses($budget->id, $filtered, $limit->start_date, $end);
-//        if (1 === count($result)) {
+    //        if (1 === count($result)) {
-//            $compare                              = bccomp($limit->amount, (string)app('steam')->positive($result[$limitCurrencyId]['spent']));
+    //            $compare                              = bccomp($limit->amount, (string)app('steam')->positive($result[$limitCurrencyId]['spent']));
-//            $result[$limitCurrencyId]['budgeted'] = $limit->amount;
+    //            $result[$limitCurrencyId]['budgeted'] = $limit->amount;
-//            if (1 === $compare) {
+    //            if (1 === $compare) {
-//                // convert this amount into the primary currency:
+    //                // convert this amount into the primary currency:
-//                $result[$limitCurrencyId]['left'] = bcadd($limit->amount, (string)$result[$limitCurrencyId]['spent']);
+    //                $result[$limitCurrencyId]['left'] = bcadd($limit->amount, (string)$result[$limitCurrencyId]['spent']);
-//            }
+    //            }
-//            if ($compare <= 0) {
+    //            if ($compare <= 0) {
-//                $result[$limitCurrencyId]['overspent'] = app('steam')->positive(bcadd($limit->amount, (string)$result[$limitCurrencyId]['spent']));
+    //                $result[$limitCurrencyId]['overspent'] = app('steam')->positive(bcadd($limit->amount, (string)$result[$limitCurrencyId]['spent']));
-//            }
+    //            }
-//        }
+    //        }
-//
+    //
-//        return $result;
+    //        return $result;
-//    }
+    //    }
 
     private function filterLimit(int $currencyId, Collection $limits): ?BudgetLimit
     {

app/Api/V1/Controllers/Controller.php

@@ -147,7 +147,7 @@ abstract class Controller extends BaseController
             }
             if (null !== $value) {
                 $value = (int)$value;
-                $value     = min(max(1, $value), 2 ** 16);
+                $value = min(max(1, $value), 2 ** 16);
                 $bag->set($integer, $value);
             }
             if (null === $value
@@ -165,7 +165,7 @@ abstract class Controller extends BaseController
 
         // sort fields:
         return $bag;
-        //return $this->getSortParameters($bag);
+        // return $this->getSortParameters($bag);
     }
 
     /**

app/Api/V1/Controllers/Insight/Income/TagController.php

@@ -36,7 +36,7 @@ use Illuminate\Http\JsonResponse;
 /**
  * Class TagController
  */
-class   TagController extends Controller
+class TagController extends Controller
 {
     private TagRepositoryInterface $repository;
 

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

@@ -114,8 +114,8 @@ class ShowController extends Controller
     public function show(AvailableBudget $availableBudget): JsonResponse
     {
         $manager         = $this->getManager();
-//        $start           = $this->parameters->get('start');
+        //        $start           = $this->parameters->get('start');
-//        $end             = $this->parameters->get('end');
+        //        $end             = $this->parameters->get('end');
 
         /** @var AvailableBudgetTransformer $transformer */
         $transformer     = app(AvailableBudgetTransformer::class);
@@ -126,8 +126,8 @@ class ShowController extends Controller
         $admin           = auth()->user();
         $enrichment      = new AvailableBudgetEnrichment();
         $enrichment->setUser($admin);
-//        $enrichment->setStart($start);
+        //        $enrichment->setStart($start);
-//        $enrichment->setEnd($end);
+        //        $enrichment->setEnd($end);
         $availableBudget = $enrichment->enrichSingle($availableBudget);
 
 

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

@@ -84,6 +84,7 @@ class ShowController extends Controller
         $enrichment->setUser($admin);
         $enrichment->setStart($this->parameters->get('start'));
         $enrichment->setEnd($this->parameters->get('end'));
+
         /** @var Budget $budget */
         $budget       = $enrichment->enrichSingle($budget);
 

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

@@ -30,9 +30,7 @@ use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\Bill;
 use FireflyIII\Models\Recurrence;
-use FireflyIII\Models\RecurrenceTransaction;
 use FireflyIII\Models\Rule;
-use FireflyIII\Models\RuleTrigger;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Bill\BillRepositoryInterface;

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

@@ -156,7 +156,7 @@ class ConfigurationController extends Controller
         }
 
         // fallback
-        $data = [
+        $data     = [
             'title'    => $configKey,
             'value'    => config($shortKey),
             'editable' => false,
@@ -176,7 +176,7 @@ class ConfigurationController extends Controller
      */
     public function update(UpdateRequest $request, string $name): JsonResponse
     {
-        $rules = ['value' => 'required'];
+        $rules     = ['value' => 'required'];
         if (!$this->repository->hasRole(auth()->user(), 'owner')) {
             $messages = ['value' => '200005: You need the "owner" role to do this.'];
             Validator::make([], $rules, $messages)->validate();

app/Api/V1/Controllers/Webhook/UpdateController.php

@@ -77,6 +77,7 @@ class UpdateController extends Controller
         $admin       = auth()->user();
         $enrichment  = new WebhookEnrichment();
         $enrichment->setUser($admin);
+
         /** @var Webhook $webhook */
         $webhook     = $enrichment->enrichSingle($webhook);
 

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

@@ -25,7 +25,6 @@ namespace FireflyIII\Api\V1\Requests\Models\Account;
 
 use Carbon\Carbon;
 use FireflyIII\Models\Account;
-use FireflyIII\Models\Preference;
 use FireflyIII\Rules\IsValidSortInstruction;
 use FireflyIII\Support\Facades\Preferences;
 use FireflyIII\Support\Http\Api\AccountFilter;
@@ -55,7 +54,7 @@ class ShowRequest extends FormRequest
         return [
             'type'  => $this->convertString('type', 'all'),
             'limit' => $limit,
-            'sort' => $this->convertSortParameters('sort',Account::class),
+            'sort'  => $this->convertSortParameters('sort', Account::class),
             'page'  => $page,
         ];
     }

app/Console/Commands/Correction/CorrectsUnevenAmount.php

@@ -302,10 +302,10 @@ class CorrectsUnevenAmount extends Command
 
     private function isBetweenAssetAndLiability(TransactionJournal $journal): bool
     {
-        /** @var Transaction|null $sourceTransaction */
+        /** @var null|Transaction $sourceTransaction */
         $sourceTransaction      = $journal->transactions()->where('amount', '<', 0)->first();
 
-        /** @var Transaction|null $destinationTransaction */
+        /** @var null|Transaction $destinationTransaction */
         $destinationTransaction = $journal->transactions()->where('amount', '>', 0)->first();
         if (null === $sourceTransaction || null === $destinationTransaction) {
             Log::warning('Either transaction is false, stop.');

app/Console/Commands/System/RecalculatesRunningBalance.php

@@ -60,6 +60,7 @@ class RecalculatesRunningBalance extends Command
             return 0;
         }
         $this->friendlyWarning('This command has been disabled.');
+
         return 0;
     }
 

app/Console/Commands/System/ResetsErrorMailLimit.php

@@ -25,12 +25,13 @@ declare(strict_types=1);
 
 namespace FireflyIII\Console\Commands\System;
 
-use function Safe\file_put_contents;
-use function Safe\json_encode;
 use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use Illuminate\Console\Command;
 use Symfony\Component\Console\Command\Command as CommandAlias;
 
+use function Safe\file_put_contents;
+use function Safe\json_encode;
+
 class ResetsErrorMailLimit extends Command
 {
     use ShowsFriendlyMessages;

app/Events/ActuallyLoggedIn.php

@@ -37,7 +37,7 @@ class ActuallyLoggedIn extends Event
 
     public User $user;
 
-    public function __construct(null|Authenticatable|User $user)
+    public function __construct(Authenticatable|User|null $user)
     {
         if ($user instanceof User) {
             $this->user = $user;

app/Events/Security/DisabledMFA.php

@@ -35,7 +35,7 @@ class DisabledMFA extends Event
 
     public User $user;
 
-    public function __construct(null|Authenticatable|User $user)
+    public function __construct(Authenticatable|User|null $user)
     {
         if ($user instanceof User) {
             $this->user = $user;

app/Events/Security/EnabledMFA.php

@@ -35,7 +35,7 @@ class EnabledMFA extends Event
 
     public User $user;
 
-    public function __construct(null|Authenticatable|User $user)
+    public function __construct(Authenticatable|User|null $user)
     {
         if ($user instanceof User) {
             $this->user = $user;

app/Events/Security/MFABackupFewLeft.php

@@ -35,7 +35,7 @@ class MFABackupFewLeft extends Event
 
     public User $user;
 
-    public function __construct(null|Authenticatable|User $user, public int $count)
+    public function __construct(Authenticatable|User|null $user, public int $count)
     {
         if ($user instanceof User) {
             $this->user = $user;

app/Events/Security/MFABackupNoLeft.php

@@ -35,7 +35,7 @@ class MFABackupNoLeft extends Event
 
     public User $user;
 
-    public function __construct(null|Authenticatable|User $user)
+    public function __construct(Authenticatable|User|null $user)
     {
         if ($user instanceof User) {
             $this->user = $user;

app/Events/Security/MFAManyFailedAttempts.php

@@ -35,7 +35,7 @@ class MFAManyFailedAttempts extends Event
 
     public User $user;
 
-    public function __construct(null|Authenticatable|User $user, public int $count)
+    public function __construct(Authenticatable|User|null $user, public int $count)
     {
         if ($user instanceof User) {
             $this->user = $user;

app/Events/Security/MFANewBackupCodes.php

@@ -35,7 +35,7 @@ class MFANewBackupCodes extends Event
 
     public User $user;
 
-    public function __construct(null|Authenticatable|User $user)
+    public function __construct(Authenticatable|User|null $user)
     {
         if ($user instanceof User) {
             $this->user = $user;

app/Events/Security/MFAUsedBackupCode.php

@@ -35,7 +35,7 @@ class MFAUsedBackupCode extends Event
 
     public User $user;
 
-    public function __construct(null|Authenticatable|User $user)
+    public function __construct(Authenticatable|User|null $user)
     {
         if ($user instanceof User) {
             $this->user = $user;

app/Events/Security/UserAttemptedLogin.php

@@ -35,7 +35,7 @@ class UserAttemptedLogin extends Event
 
     public User $user;
 
-    public function __construct(null|Authenticatable|User $user)
+    public function __construct(Authenticatable|User|null $user)
     {
         if ($user instanceof User) {
             $this->user = $user;

app/Generator/Webhook/StandardMessageGenerator.php

@@ -184,6 +184,7 @@ class StandardMessageGenerator implements MessageGeneratorInterface
                 if ($model instanceof Budget) {
                     $enrichment              = new BudgetEnrichment();
                     $enrichment->setUser($model->user);
+
                     /** @var Budget $model */
                     $model                   = $enrichment->enrichSingle($model);
                     $transformer             = new BudgetTransformer();
@@ -197,6 +198,7 @@ class StandardMessageGenerator implements MessageGeneratorInterface
                     $parameters              = new ParameterBag();
                     $parameters->set('start', $model->start_date);
                     $parameters->set('end', $model->end_date);
+
                     /** @var BudgetLimit $model */
                     $model                   = $enrichment->enrichSingle($model);
                     $transformer             = new BudgetLimitTransformer();

app/Handlers/Events/AdminEventHandler.php

@@ -140,10 +140,10 @@ class AdminEventHandler
 
                 break;
 
-//            case 'ntfy':
+                //            case 'ntfy':
-//                $class = OwnerTestNotificationNtfy::class;
+                //                $class = OwnerTestNotificationNtfy::class;
-//
+                //
-//                break;
+                //                break;
 
             case 'pushover':
                 $class = OwnerTestNotificationPushover::class;

app/Handlers/Events/BillEventHandler.php

@@ -24,7 +24,6 @@ declare(strict_types=1);
 
 namespace FireflyIII\Handlers\Events;
 
-use function Safe\json_encode;
 use Exception;
 use FireflyIII\Events\Model\Bill\WarnUserAboutBill;
 use FireflyIII\Events\Model\Bill\WarnUserAboutOverdueSubscriptions;
@@ -35,6 +34,8 @@ use FireflyIII\Support\Facades\Preferences;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Notification;
 
+use function Safe\json_encode;
+
 /**
  * Class BillEventHandler
  */

app/Handlers/Events/UserEventHandler.php

@@ -411,10 +411,10 @@ class UserEventHandler
 
                 break;
 
-//            case 'ntfy':
+                //            case 'ntfy':
-//                $class = UserTestNotificationNtfy::class;
+                //                $class = UserTestNotificationNtfy::class;
-//
+                //
-//                break;
+                //                break;
 
             case 'pushover':
                 $class = UserTestNotificationPushover::class;

app/Helpers/Attachments/AttachmentHelper.php

@@ -128,6 +128,7 @@ class AttachmentHelper implements AttachmentHelperInterface
     public function saveAttachmentFromApi(Attachment $attachment, string $content): bool
     {
         Log::debug(sprintf('Now in %s', __METHOD__));
+
         try {
             $resource = tmpfile();
         } catch (FilesystemException $e) {
@@ -144,6 +145,7 @@ class AttachmentHelper implements AttachmentHelperInterface
 
         $path                 = stream_get_meta_data($resource)['uri'];
         Log::debug(sprintf('Path is %s', $path));
+
         try {
             $result = fwrite($resource, $content);
         } catch (FilesystemException $e) {
@@ -152,6 +154,7 @@ class AttachmentHelper implements AttachmentHelperInterface
             return false;
         }
         Log::debug(sprintf('Wrote %d bytes to temp file.', $result));
+
         try {
             $finfo = finfo_open(FILEINFO_MIME_TYPE);
         } catch (FileinfoException $e) {
@@ -175,7 +178,7 @@ class AttachmentHelper implements AttachmentHelperInterface
         $this->uploadDisk->put($file, $content);
 
         // update attachment.
-        $attachment->md5      =  md5_file($path);
+        $attachment->md5      = md5_file($path);
         $attachment->mime     = $mime;
         $attachment->size     = strlen($content);
         $attachment->uploaded = true;
@@ -237,7 +240,7 @@ class AttachmentHelper implements AttachmentHelperInterface
             $attachment           = new Attachment(); // create Attachment object.
             $attachment->user()->associate($user);
             $attachment->attachable()->associate($model);
-            $attachment->md5      =  md5_file($file->getRealPath());
+            $attachment->md5      = md5_file($file->getRealPath());
             $attachment->filename = $file->getClientOriginalName();
             $attachment->mime     = $file->getMimeType();
             $attachment->size     = $file->getSize();

app/Helpers/Report/NetWorth.php

@@ -116,7 +116,7 @@ class NetWorth implements NetWorthInterface
         return $netWorth;
     }
 
-    public function setUser(null|Authenticatable|User $user): void
+    public function setUser(Authenticatable|User|null $user): void
     {
         if (!$user instanceof User) {
             return;

app/Helpers/Report/NetWorthInterface.php

@@ -46,7 +46,7 @@ interface NetWorthInterface
      */
     public function byAccounts(Collection $accounts, Carbon $date): array;
 
-    public function setUser(null|Authenticatable|User $user): void;
+    public function setUser(Authenticatable|User|null $user): void;
 
     public function setUserGroup(UserGroup $userGroup): void;
 

app/Http/Controllers/Admin/NotificationController.php

@@ -70,7 +70,7 @@ class NotificationController extends Controller
         }
         $forcedAvailability['ntfy']     = '' !== $ntfyTopic;
         $forcedAvailability['pushover'] = '' !== $pushoverAppToken && '' !== $pushoverUserToken;
-        $forcedAvailability['slack'] = '' !== $slackUrl;
+        $forcedAvailability['slack']    = '' !== $slackUrl;
 
         return view(
             'settings.notifications.index',

app/Http/Controllers/Auth/ForgotPasswordController.php

@@ -33,8 +33,8 @@ use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Log;
 use Illuminate\View\View;
-
 use Safe\Exceptions\UrlException;
+
 use function Safe\parse_url;
 
 /**
@@ -107,12 +107,12 @@ class ForgotPasswordController extends Controller
         try {
             $configuredHost = parse_url((string)config('app.url'), PHP_URL_HOST);
         } catch (UrlException $e) {
-            throw new FireflyException('Please set a valid and correct Firefly III URL in the APP_URL environment variable.',0, $e);
+            throw new FireflyException('Please set a valid and correct Firefly III URL in the APP_URL environment variable.', 0, $e);
         }
-        if (!is_string( $configuredHost)) {
+        if (!is_string($configuredHost)) {
             throw new FireflyException('Please set a valid and correct Firefly III URL in the APP_URL environment variable.');
         }
-        $host           = request()->host();
+        $host = request()->host();
         if ($configuredHost !== $host) {
             Log::error(sprintf('Host header is "%s", APP_URL is "%s".', $host, $configuredHost));
 

app/Http/Controllers/Bill/CreateController.php

@@ -69,14 +69,14 @@ class CreateController extends Controller
      */
     public function create(Request $request)
     {
-        $periods         = [];
+        $periods     = [];
 
         /** @var array $billPeriods */
-        $billPeriods     = config('firefly.bill_periods');
+        $billPeriods = config('firefly.bill_periods');
         foreach ($billPeriods as $current) {
             $periods[$current] = (string) trans('firefly.repeat_freq_'.$current);
         }
-        $subTitle        = (string) trans('firefly.create_new_bill');
+        $subTitle    = (string) trans('firefly.create_new_bill');
 
         // put previous url in session if not redirect from store (not "create another").
         if (true !== session('bills.create.fromStore')) {

app/Http/Controllers/Chart/BudgetReportController.php

@@ -117,7 +117,7 @@ class BudgetReportController extends Controller
                     ];
 
                     $amount                   = Steam::positive($journal['amount']);
-                    $result[$title]['amount'] = bcadd($result[$title]['amount'],  $amount);
+                    $result[$title]['amount'] = bcadd($result[$title]['amount'], $amount);
                 }
             }
         }
@@ -147,7 +147,7 @@ class BudgetReportController extends Controller
                     ];
 
                     $amount                   = Steam::positive($journal['amount']);
-                    $result[$title]['amount'] = bcadd($result[$title]['amount'],  $amount);
+                    $result[$title]['amount'] = bcadd($result[$title]['amount'], $amount);
                 }
             }
         }
@@ -235,7 +235,7 @@ class BudgetReportController extends Controller
                     ];
 
                     $amount                   = Steam::positive($journal['amount']);
-                    $result[$title]['amount'] = bcadd($result[$title]['amount'],  $amount);
+                    $result[$title]['amount'] = bcadd($result[$title]['amount'], $amount);
                 }
             }
         }

app/Http/Controllers/Controller.php

@@ -95,8 +95,8 @@ abstract class Controller extends BaseController
         View::share('logoutUrl', $logoutUrl);
 
         // upload size
-        $maxFileSize      = Steam::phpBytes( ini_get('upload_max_filesize'));
+        $maxFileSize      = Steam::phpBytes(ini_get('upload_max_filesize'));
-        $maxPostSize      = Steam::phpBytes( ini_get('post_max_size'));
+        $maxPostSize      = Steam::phpBytes(ini_get('post_max_size'));
         $uploadSize       = min($maxFileSize, $maxPostSize);
         View::share('uploadSize', $uploadSize);
 

app/Http/Controllers/DebugController.php

@@ -175,8 +175,8 @@ class DebugController extends Controller
 
     private function getSystemInformation(): array
     {
-        $maxFileSize   = Steam::phpBytes( ini_get('upload_max_filesize'));
+        $maxFileSize   = Steam::phpBytes(ini_get('upload_max_filesize'));
-        $maxPostSize   = Steam::phpBytes( ini_get('post_max_size'));
+        $maxPostSize   = Steam::phpBytes(ini_get('post_max_size'));
         $drivers       = DB::availableDrivers();
         $currentDriver = DB::getDriverName();
 
@@ -208,7 +208,7 @@ class DebugController extends Controller
 
         try {
             if (file_exists('/var/www/counter-main.txt')) {
-                $return['build'] = trim( file_get_contents('/var/www/counter-main.txt'));
+                $return['build'] = trim(file_get_contents('/var/www/counter-main.txt'));
                 app('log')->debug(sprintf('build is now "%s"', $return['build']));
             }
         } catch (Exception $e) {
@@ -218,7 +218,7 @@ class DebugController extends Controller
 
         try {
             if (file_exists('/var/www/build-date-main.txt')) {
-                $return['build_date'] = trim( file_get_contents('/var/www/build-date-main.txt'));
+                $return['build_date'] = trim(file_get_contents('/var/www/build-date-main.txt'));
             }
         } catch (Exception $e) {
             app('log')->debug('Could not check build date, but thats ok.');

app/Http/Controllers/PiggyBank/ShowController.php

@@ -82,6 +82,7 @@ class ShowController extends Controller
         $admin       = auth()->user();
         $enrichment  = new PiggyBankEnrichment();
         $enrichment->setUser($admin);
+
         /** @var PiggyBank $piggyBank */
         $piggyBank   = $enrichment->enrichSingle($piggyBank);
 

app/Http/Controllers/Recurring/CreateController.php

@@ -65,8 +65,8 @@ class CreateController extends Controller
                 app('view')->share('title', (string) trans('firefly.recurrences'));
                 app('view')->share('subTitle', (string) trans('firefly.create_new_recurrence'));
 
-                $this->repository  = app(RecurringRepositoryInterface::class);
+                $this->repository     = app(RecurringRepositoryInterface::class);
-                $this->budgetRepos = app(BudgetRepositoryInterface::class);
+                $this->budgetRepos    = app(BudgetRepositoryInterface::class);
                 $this->attachments    = app(AttachmentHelperInterface::class);
                 $this->billRepository = app(BillRepositoryInterface::class);
 
@@ -115,7 +115,7 @@ class CreateController extends Controller
 
         return view(
             'recurring.create',
-            compact('tomorrow', 'oldRepetitionType', 'bills', 'weekendResponses', 'preFilled', 'repetitionEnds',  'budgets')
+            compact('tomorrow', 'oldRepetitionType', 'bills', 'weekendResponses', 'preFilled', 'repetitionEnds', 'budgets')
         );
     }
 

app/Http/Controllers/Recurring/EditController.php

@@ -70,8 +70,8 @@ class EditController extends Controller
                 app('view')->share('title', (string) trans('firefly.recurrences'));
                 app('view')->share('subTitle', (string) trans('firefly.recurrences'));
 
-                $this->repository  = app(RecurringRepositoryInterface::class);
+                $this->repository     = app(RecurringRepositoryInterface::class);
-                $this->budgetRepos = app(BudgetRepositoryInterface::class);
+                $this->budgetRepos    = app(BudgetRepositoryInterface::class);
                 $this->attachments    = app(AttachmentHelperInterface::class);
                 $this->billRepository = app(BillRepositoryInterface::class);
 
@@ -100,6 +100,7 @@ class EditController extends Controller
         $admin                            = auth()->user();
         $enrichment                       = new RecurringEnrichment();
         $enrichment->setUser($admin);
+
         /** @var Recurrence $recurrence */
         $recurrence                       = $enrichment->enrichSingle($recurrence);
 

app/Http/Controllers/Recurring/ShowController.php

@@ -86,6 +86,7 @@ class ShowController extends Controller
         $admin                  = auth()->user();
         $enrichment             = new RecurringEnrichment();
         $enrichment->setUser($admin);
+
         /** @var Recurrence $recurrence */
         $recurrence             = $enrichment->enrichSingle($recurrence);
 

app/Http/Controllers/Recurring/TriggerController.php

@@ -60,6 +60,7 @@ class TriggerController extends Controller
             }
         );
     }
+
     public function trigger(Recurrence $recurrence, TriggerRecurrenceRequest $request): RedirectResponse
     {
         $all                        = $request->getAll();

app/Http/Controllers/Transaction/ConvertController.php

@@ -338,7 +338,7 @@ class ConvertController extends Controller
             'type'             => $transactionType->type,
         ];
 
-        /** @var Transaction|null $sourceTransaction */
+        /** @var null|Transaction $sourceTransaction */
         $sourceTransaction = $journal->transactions()->where('amount', '<', 0)->first();
         $amount            = $sourceTransaction->amount ?? '0';
 

app/Http/Controllers/Transaction/ShowController.php

@@ -92,7 +92,7 @@ class ShowController extends Controller
         $collector       = app(GroupCollectorInterface::class);
         $collector->setUser($admin)->setTransactionGroup($transactionGroup)->withAPIInformation();
 
-        /** @var TransactionGroup|null $selectedGroup */
+        /** @var null|TransactionGroup $selectedGroup */
         $selectedGroup   = $collector->getGroups()->first();
         if (null === $selectedGroup) {
             throw new NotFoundHttpException();
@@ -119,6 +119,7 @@ class ShowController extends Controller
         // enrich
         $enrichment      = new TransactionGroupEnrichment();
         $enrichment->setUser($admin);
+
         /** @var array $selectedGroup */
         $selectedGroup   = $enrichment->enrichSingle($selectedGroup);
 

app/Http/Requests/PiggyBankStoreRequest.php

@@ -23,7 +23,6 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Requests;
 
-
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Rules\IsValidPositiveAmount;

app/Jobs/MailError.php

@@ -129,7 +129,7 @@ class MailError extends Job implements ShouldQueue
         }
         if (file_exists($file)) {
             Log::debug(sprintf('Read file in "%s"', $file));
-            $limits = json_decode( file_get_contents($file), true);
+            $limits = json_decode(file_get_contents($file), true);
         }
         // limit reached?
         foreach ($types as $type => $info) {

app/Jobs/WarnAboutBills.php

@@ -171,6 +171,7 @@ class WarnAboutBills implements ShouldQueue
         $enrichment->setUser($bill->user);
         $enrichment->setStart($start);
         $enrichment->setEnd($end);
+
         /** @var Bill $single */
         $single     = $enrichment->enrichSingle($bill);
 

app/Mail/InvitationMail.php

@@ -45,9 +45,9 @@ class InvitationMail extends Mailable
      */
     public function __construct(public string $invitee, public string $admin, public string $url)
     {
-        $host = parse_url($this->url, PHP_URL_HOST);
+        $host       = parse_url($this->url, PHP_URL_HOST);
-        if(is_array($host)) {
+        if (is_array($host)) {
-            $host ='';
+            $host = '';
         }
         $this->host = (string) $host;
     }

app/Notifications/Admin/UnknownUserLoginAttempt.php

@@ -68,21 +68,21 @@ class UnknownUserLoginAttempt extends Notification
         ;
     }
 
-//    /**
+    //    /**
-//     * @SuppressWarnings("PHPMD.UnusedFormalParameter")
+    //     * @SuppressWarnings("PHPMD.UnusedFormalParameter")
-//     */
+    //     */
-//
+    //
-//    public function toNtfy(OwnerNotifiable $notifiable): Message
+    //    public function toNtfy(OwnerNotifiable $notifiable): Message
-//    {
+    //    {
-//        $settings = ReturnsSettings::getSettings('ntfy', 'owner', null);
+    //        $settings = ReturnsSettings::getSettings('ntfy', 'owner', null);
-//        $message  = new Message();
+    //        $message  = new Message();
-//        $ip       = Request::ip();
+    //        $ip       = Request::ip();
-//        $message->topic($settings['ntfy_topic']);
+    //        $message->topic($settings['ntfy_topic']);
-//        $message->title((string) trans('email.unknown_user_subject'));
+    //        $message->title((string) trans('email.unknown_user_subject'));
-//        $message->body((string) trans('email.unknown_user_message', ['address' => $this->address, 'ip' => $ip]));
+    //        $message->body((string) trans('email.unknown_user_message', ['address' => $this->address, 'ip' => $ip]));
-//
+    //
-//        return $message;
+    //        return $message;
-//    }
+    //    }
 
     /**
      * @SuppressWarnings("PHPMD.UnusedFormalParameter")

app/Notifications/Admin/UserInvitation.php

@@ -73,20 +73,20 @@ class UserInvitation extends Notification
         ;
     }
 
-//    /**
+    //    /**
-//     * @SuppressWarnings("PHPMD.UnusedFormalParameter")
+    //     * @SuppressWarnings("PHPMD.UnusedFormalParameter")
-//     */
+    //     */
-//    public function toNtfy(OwnerNotifiable $notifiable): Message
+    //    public function toNtfy(OwnerNotifiable $notifiable): Message
-//    {
+    //    {
-//        Log::debug('Now in toNtfy() for UserInvitation');
+    //        Log::debug('Now in toNtfy() for UserInvitation');
-//        $settings = ReturnsSettings::getSettings('ntfy', 'owner', null);
+    //        $settings = ReturnsSettings::getSettings('ntfy', 'owner', null);
-//        $message  = new Message();
+    //        $message  = new Message();
-//        $message->topic($settings['ntfy_topic']);
+    //        $message->topic($settings['ntfy_topic']);
-//        $message->title((string) trans('email.invitation_created_subject'));
+    //        $message->title((string) trans('email.invitation_created_subject'));
-//        $message->body((string) trans('email.invitation_created_body', ['email' => $this->invitee->user->email, 'invitee' => $this->invitee->email]));
+    //        $message->body((string) trans('email.invitation_created_body', ['email' => $this->invitee->user->email, 'invitee' => $this->invitee->email]));
-//
+    //
-//        return $message;
+    //        return $message;
-//    }
+    //    }
 
     /**
      * @SuppressWarnings("PHPMD.UnusedFormalParameter")

app/Notifications/Admin/UserRegistration.php

@@ -72,20 +72,20 @@ class UserRegistration extends Notification
         ;
     }
 
-//    /**
+    //    /**
-//     * @SuppressWarnings("PHPMD.UnusedFormalParameter")
+    //     * @SuppressWarnings("PHPMD.UnusedFormalParameter")
-//     */
+    //     */
-//    public function toNtfy(OwnerNotifiable $notifiable): Message
+    //    public function toNtfy(OwnerNotifiable $notifiable): Message
-//    {
+    //    {
-//        Log::debug('Now in toNtfy() for (Admin) UserRegistration');
+    //        Log::debug('Now in toNtfy() for (Admin) UserRegistration');
-//        $settings = ReturnsSettings::getSettings('ntfy', 'owner', null);
+    //        $settings = ReturnsSettings::getSettings('ntfy', 'owner', null);
-//        $message  = new Message();
+    //        $message  = new Message();
-//        $message->topic($settings['ntfy_topic']);
+    //        $message->topic($settings['ntfy_topic']);
-//        $message->title((string) trans('email.registered_subject_admin'));
+    //        $message->title((string) trans('email.registered_subject_admin'));
-//        $message->body((string) trans('email.admin_new_user_registered', ['email' => $this->user->email, 'invitee' => $this->user->email]));
+    //        $message->body((string) trans('email.admin_new_user_registered', ['email' => $this->user->email, 'invitee' => $this->user->email]));
-//
+    //
-//        return $message;
+    //        return $message;
-//    }
+    //    }
 
     /**
      * @SuppressWarnings("PHPMD.UnusedFormalParameter")

app/Notifications/Admin/VersionCheckResult.php

@@ -64,20 +64,20 @@ class VersionCheckResult extends Notification
         ;
     }
 
-//    /**
+    //    /**
-//     * @SuppressWarnings("PHPMD.UnusedFormalParameter")
+    //     * @SuppressWarnings("PHPMD.UnusedFormalParameter")
-//     */
+    //     */
-//    public function toNtfy(OwnerNotifiable $notifiable): Message
+    //    public function toNtfy(OwnerNotifiable $notifiable): Message
-//    {
+    //    {
-//        Log::debug('Now in toNtfy() for VersionCheckResult');
+    //        Log::debug('Now in toNtfy() for VersionCheckResult');
-//        $settings = ReturnsSettings::getSettings('ntfy', 'owner', null);
+    //        $settings = ReturnsSettings::getSettings('ntfy', 'owner', null);
-//        $message  = new Message();
+    //        $message  = new Message();
-//        $message->topic($settings['ntfy_topic']);
+    //        $message->topic($settings['ntfy_topic']);
-//        $message->title((string) trans('email.new_version_email_subject'));
+    //        $message->title((string) trans('email.new_version_email_subject'));
-//        $message->body($this->message);
+    //        $message->body($this->message);
-//
+    //
-//        return $message;
+    //        return $message;
-//    }
+    //    }
 
     /**
      * @SuppressWarnings("PHPMD.UnusedFormalParameter")

app/Notifications/ReturnsAvailableChannels.php

@@ -28,7 +28,8 @@ use FireflyIII\Support\Notifications\UrlValidator;
 use FireflyIII\User;
 use Illuminate\Support\Facades\Log;
 use NotificationChannels\Pushover\PushoverChannel;
-//use Wijourdil\NtfyNotificationChannel\Channels\NtfyChannel;
+
+// use Wijourdil\NtfyNotificationChannel\Channels\NtfyChannel;
 
 class ReturnsAvailableChannels
 {
@@ -58,16 +59,16 @@ class ReturnsAvailableChannels
             }
         }
 
-//        if (true === config('notifications.channels.ntfy.enabled', false)) {
+        //        if (true === config('notifications.channels.ntfy.enabled', false)) {
-//            // validate presence of of Ntfy settings.
+        //            // validate presence of of Ntfy settings.
-//            if ('' !== (string) app('fireflyconfig')->getEncrypted('ntfy_topic', '')->data) {
+        //            if ('' !== (string) app('fireflyconfig')->getEncrypted('ntfy_topic', '')->data) {
-//                Log::debug('Enabled ntfy.');
+        //                Log::debug('Enabled ntfy.');
-//                $channels[] = NtfyChannel::class;
+        //                $channels[] = NtfyChannel::class;
-//            }
+        //            }
-//            if ('' === (string) app('fireflyconfig')->getEncrypted('ntfy_topic', '')->data) {
+        //            if ('' === (string) app('fireflyconfig')->getEncrypted('ntfy_topic', '')->data) {
-//                Log::warning('No topic name for Ntfy, channel is disabled.');
+        //                Log::warning('No topic name for Ntfy, channel is disabled.');
-//            }
+        //            }
-//        }
+        //        }
 
         // pushover
         if (true === config('notifications.channels.pushover.enabled', false)) {
@@ -99,17 +100,17 @@ class ReturnsAvailableChannels
             }
         }
 
-//        // validate presence of of Ntfy settings.
+        //        // validate presence of of Ntfy settings.
-//        if (true === config('notifications.channels.nfy.enabled', false)) {
+        //        if (true === config('notifications.channels.nfy.enabled', false)) {
-//            $ntfyTopic = (string) app('preferences')->getEncryptedForUser($user, 'ntfy_topic', '')->data;
+        //            $ntfyTopic = (string) app('preferences')->getEncryptedForUser($user, 'ntfy_topic', '')->data;
-//            if ('' !== $ntfyTopic) {
+        //            if ('' !== $ntfyTopic) {
-//                Log::debug(sprintf('Enabled ntfy, "%s"', $ntfyTopic));
+        //                Log::debug(sprintf('Enabled ntfy, "%s"', $ntfyTopic));
-//                $channels[] = NtfyChannel::class;
+        //                $channels[] = NtfyChannel::class;
-//            }
+        //            }
-//            if ('' === (string) app('preferences')->getEncryptedForUser($user, 'ntfy_topic', '')->data) {
+        //            if ('' === (string) app('preferences')->getEncryptedForUser($user, 'ntfy_topic', '')->data) {
-//                Log::warning('No topic name for Ntfy, channel is disabled.');
+        //                Log::warning('No topic name for Ntfy, channel is disabled.');
-//            }
+        //            }
-//        }
+        //        }
 
         // pushover
         if (true === config('notifications.channels.slack.enabled', false)) {

app/Notifications/Security/DisabledMFANotification.php

@@ -65,16 +65,16 @@ class DisabledMFANotification extends Notification
         return new MailMessage()->markdown('emails.security.disabled-mfa', ['user' => $this->user, 'ip' => $ip, 'host' => $host, 'userAgent' => $userAgent, 'time' => $time])->subject($subject);
     }
 
-//    public function toNtfy(User $notifiable): Message
+    //    public function toNtfy(User $notifiable): Message
-//    {
+    //    {
-//        $settings = ReturnsSettings::getSettings('ntfy', 'user', $notifiable);
+    //        $settings = ReturnsSettings::getSettings('ntfy', 'user', $notifiable);
-//        $message  = new Message();
+    //        $message  = new Message();
-//        $message->topic($settings['ntfy_topic']);
+    //        $message->topic($settings['ntfy_topic']);
-//        $message->title((string) trans('email.disabled_mfa_subject'));
+    //        $message->title((string) trans('email.disabled_mfa_subject'));
-//        $message->body((string) trans('email.disabled_mfa_slack', ['email' => $this->user->email]));
+    //        $message->body((string) trans('email.disabled_mfa_slack', ['email' => $this->user->email]));
-//
+    //
-//        return $message;
+    //        return $message;
-//    }
+    //    }
 
     /**
      * @SuppressWarnings("PHPMD.UnusedFormalParameter")

app/Notifications/Security/EnabledMFANotification.php

@@ -65,16 +65,16 @@ class EnabledMFANotification extends Notification
         return new MailMessage()->markdown('emails.security.enabled-mfa', ['user' => $this->user, 'ip' => $ip, 'host' => $host, 'userAgent' => $userAgent, 'time' => $time])->subject($subject);
     }
 
-//    public function toNtfy(User $notifiable): Message
+    //    public function toNtfy(User $notifiable): Message
-//    {
+    //    {
-//        $settings = ReturnsSettings::getSettings('ntfy', 'user', $notifiable);
+    //        $settings = ReturnsSettings::getSettings('ntfy', 'user', $notifiable);
-//        $message  = new Message();
+    //        $message  = new Message();
-//        $message->topic($settings['ntfy_topic']);
+    //        $message->topic($settings['ntfy_topic']);
-//        $message->title((string) trans('email.enabled_mfa_subject'));
+    //        $message->title((string) trans('email.enabled_mfa_subject'));
-//        $message->body((string) trans('email.enabled_mfa_slack', ['email' => $this->user->email]));
+    //        $message->body((string) trans('email.enabled_mfa_slack', ['email' => $this->user->email]));
-//
+    //
-//        return $message;
+    //        return $message;
-//    }
+    //    }
 
     /**
      * @SuppressWarnings("PHPMD.UnusedFormalParameter")

app/Notifications/Security/MFABackupFewLeftNotification.php

@@ -65,16 +65,16 @@ class MFABackupFewLeftNotification extends Notification
         return new MailMessage()->markdown('emails.security.few-backup-codes', ['user' => $this->user, 'count' => $this->count, 'ip' => $ip, 'host' => $host, 'userAgent' => $userAgent, 'time' => $time])->subject($subject);
     }
 
-//    public function toNtfy(User $notifiable): Message
+    //    public function toNtfy(User $notifiable): Message
-//    {
+    //    {
-//        $settings = ReturnsSettings::getSettings('ntfy', 'user', $notifiable);
+    //        $settings = ReturnsSettings::getSettings('ntfy', 'user', $notifiable);
-//        $message  = new Message();
+    //        $message  = new Message();
-//        $message->topic($settings['ntfy_topic']);
+    //        $message->topic($settings['ntfy_topic']);
-//        $message->title((string) trans('email.mfa_few_backups_left_subject'));
+    //        $message->title((string) trans('email.mfa_few_backups_left_subject'));
-//        $message->body((string) trans('email.mfa_few_backups_left_slack', ['email' => $this->user->email, 'count' => $this->count]));
+    //        $message->body((string) trans('email.mfa_few_backups_left_slack', ['email' => $this->user->email, 'count' => $this->count]));
-//
+    //
-//        return $message;
+    //        return $message;
-//    }
+    //    }
 
     /**
      * @SuppressWarnings("PHPMD.UnusedFormalParameter")

app/Notifications/Security/MFABackupNoLeftNotification.php

@@ -65,16 +65,16 @@ class MFABackupNoLeftNotification extends Notification
         return new MailMessage()->markdown('emails.security.no-backup-codes', ['user' => $this->user, 'ip' => $ip, 'host' => $host, 'userAgent' => $userAgent, 'time' => $time])->subject($subject);
     }
 
-//    public function toNtfy(User $notifiable): Message
+    //    public function toNtfy(User $notifiable): Message
-//    {
+    //    {
-//        $settings = ReturnsSettings::getSettings('ntfy', 'user', $notifiable);
+    //        $settings = ReturnsSettings::getSettings('ntfy', 'user', $notifiable);
-//        $message  = new Message();
+    //        $message  = new Message();
-//        $message->topic($settings['ntfy_topic']);
+    //        $message->topic($settings['ntfy_topic']);
-//        $message->title((string) trans('email.mfa_no_backups_left_subject'));
+    //        $message->title((string) trans('email.mfa_no_backups_left_subject'));
-//        $message->body((string) trans('email.mfa_no_backups_left_slack', ['email' => $this->user->email]));
+    //        $message->body((string) trans('email.mfa_no_backups_left_slack', ['email' => $this->user->email]));
-//
+    //
-//        return $message;
+    //        return $message;
-//    }
+    //    }
 
     /**
      * @SuppressWarnings("PHPMD.UnusedFormalParameter")

app/Notifications/Security/MFAManyFailedAttemptsNotification.php

@@ -62,16 +62,16 @@ class MFAManyFailedAttemptsNotification extends Notification
         return new MailMessage()->markdown('emails.security.many-failed-attempts', ['user' => $this->user, 'count' => $this->count, 'ip' => $ip, 'host' => $host, 'userAgent' => $userAgent, 'time' => $time])->subject($subject);
     }
 
-//    public function toNtfy(User $notifiable): Message
+    //    public function toNtfy(User $notifiable): Message
-//    {
+    //    {
-//        $settings = ReturnsSettings::getSettings('ntfy', 'user', $notifiable);
+    //        $settings = ReturnsSettings::getSettings('ntfy', 'user', $notifiable);
-//        $message  = new Message();
+    //        $message  = new Message();
-//        $message->topic($settings['ntfy_topic']);
+    //        $message->topic($settings['ntfy_topic']);
-//        $message->title((string) trans('email.mfa_many_failed_subject'));
+    //        $message->title((string) trans('email.mfa_many_failed_subject'));
-//        $message->body((string) trans('email.mfa_many_failed_slack', ['email' => $this->user->email, 'count' => $this->count]));
+    //        $message->body((string) trans('email.mfa_many_failed_slack', ['email' => $this->user->email, 'count' => $this->count]));
-//
+    //
-//        return $message;
+    //        return $message;
-//    }
+    //    }
 
     /**
      * @SuppressWarnings("PHPMD.UnusedFormalParameter")

app/Notifications/Security/MFAUsedBackupCodeNotification.php

@@ -65,16 +65,16 @@ class MFAUsedBackupCodeNotification extends Notification
         return new MailMessage()->markdown('emails.security.used-backup-code', ['user' => $this->user, 'ip' => $ip, 'host' => $host, 'userAgent' => $userAgent, 'time' => $time])->subject($subject);
     }
 
-//    public function toNtfy(User $notifiable): Message
+    //    public function toNtfy(User $notifiable): Message
-//    {
+    //    {
-//        $settings = ReturnsSettings::getSettings('ntfy', 'user', $notifiable);
+    //        $settings = ReturnsSettings::getSettings('ntfy', 'user', $notifiable);
-//        $message  = new Message();
+    //        $message  = new Message();
-//        $message->topic($settings['ntfy_topic']);
+    //        $message->topic($settings['ntfy_topic']);
-//        $message->title((string) trans('email.used_backup_code_subject'));
+    //        $message->title((string) trans('email.used_backup_code_subject'));
-//        $message->body((string) trans('email.used_backup_code_slack', ['email' => $this->user->email]));
+    //        $message->body((string) trans('email.used_backup_code_slack', ['email' => $this->user->email]));
-//
+    //
-//        return $message;
+    //        return $message;
-//    }
+    //    }
 
     /**
      * @SuppressWarnings("PHPMD.UnusedFormalParameter")

app/Notifications/Security/NewBackupCodesNotification.php

@@ -65,16 +65,16 @@ class NewBackupCodesNotification extends Notification
         return new MailMessage()->markdown('emails.security.new-backup-codes', ['user' => $this->user, 'ip' => $ip, 'host' => $host, 'userAgent' => $userAgent, 'time' => $time])->subject($subject);
     }
 
-//    public function toNtfy(User $notifiable): Message
+    //    public function toNtfy(User $notifiable): Message
-//    {
+    //    {
-//        $settings = ReturnsSettings::getSettings('ntfy', 'user', $notifiable);
+    //        $settings = ReturnsSettings::getSettings('ntfy', 'user', $notifiable);
-//        $message  = new Message();
+    //        $message  = new Message();
-//        $message->topic($settings['ntfy_topic']);
+    //        $message->topic($settings['ntfy_topic']);
-//        $message->title((string) trans('email.new_backup_codes_subject'));
+    //        $message->title((string) trans('email.new_backup_codes_subject'));
-//        $message->body((string) trans('email.new_backup_codes_slack', ['email' => $this->user->email]));
+    //        $message->body((string) trans('email.new_backup_codes_slack', ['email' => $this->user->email]));
-//
+    //
-//        return $message;
+    //        return $message;
-//    }
+    //    }
 
     /**
      * @SuppressWarnings("PHPMD.UnusedFormalParameter")

app/Notifications/Security/UserFailedLoginAttempt.php

@@ -63,17 +63,17 @@ class UserFailedLoginAttempt extends Notification
         return new MailMessage()->markdown('emails.security.failed-login', ['user' => $this->user, 'ip' => $ip, 'host' => $host, 'userAgent' => $userAgent, 'time' => $time])->subject($subject);
     }
 
-//    public function toNtfy(User $notifiable): Message
+    //    public function toNtfy(User $notifiable): Message
-//    {
+    //    {
-//        $settings = ReturnsSettings::getSettings('ntfy', 'user', $notifiable);
+    //        $settings = ReturnsSettings::getSettings('ntfy', 'user', $notifiable);
-//        $message  = new Message();
+    //        $message  = new Message();
-//        $ip       = Request::ip();
+    //        $ip       = Request::ip();
-//        $message->topic($settings['ntfy_topic']);
+    //        $message->topic($settings['ntfy_topic']);
-//        $message->title((string) trans('email.failed_login_subject'));
+    //        $message->title((string) trans('email.failed_login_subject'));
-//        $message->body((string) trans('email.failed_login_message', ['ip' => $ip, 'email' => $this->user->email]));
+    //        $message->body((string) trans('email.failed_login_message', ['ip' => $ip, 'email' => $this->user->email]));
-//
+    //
-//        return $message;
+    //        return $message;
-//    }
+    //    }
 
     /**
      * @SuppressWarnings("PHPMD.UnusedFormalParameter")

app/Notifications/Test/OwnerTestNotificationNtfy.php

@@ -49,20 +49,20 @@ class OwnerTestNotificationNtfy extends Notification
         ];
     }
 
-//    public function toNtfy(OwnerNotifiable $notifiable): Message
+    //    public function toNtfy(OwnerNotifiable $notifiable): Message
-//    {
+    //    {
-//        $settings = ReturnsSettings::getSettings('ntfy', 'owner', null);
+    //        $settings = ReturnsSettings::getSettings('ntfy', 'owner', null);
-//        $message  = new Message();
+    //        $message  = new Message();
-//        $message->topic($settings['ntfy_topic']);
+    //        $message->topic($settings['ntfy_topic']);
-//        $message->title((string) trans('email.admin_test_subject'));
+    //        $message->title((string) trans('email.admin_test_subject'));
-//        $message->body((string) trans('email.admin_test_message', ['channel' => 'ntfy']));
+    //        $message->body((string) trans('email.admin_test_message', ['channel' => 'ntfy']));
-//        $message->tags(['white_check_mark']);
+    //        $message->tags(['white_check_mark']);
-//
+    //
-//        return $message;
+    //        return $message;
-//    }
+    //    }
 
-//    public function via(OwnerNotifiable $notifiable): array
+    //    public function via(OwnerNotifiable $notifiable): array
-//    {
+    //    {
-//        return [NtfyChannel::class];
+    //        return [NtfyChannel::class];
-//    }
+    //    }
 }

app/Notifications/Test/UserTestNotificationNtfy.php

@@ -49,20 +49,20 @@ class UserTestNotificationNtfy extends Notification
         ];
     }
 
-//    public function toNtfy(User $user): Message
+    //    public function toNtfy(User $user): Message
-//    {
+    //    {
-//        $settings = ReturnsSettings::getSettings('ntfy', 'user', $user);
+    //        $settings = ReturnsSettings::getSettings('ntfy', 'user', $user);
-//        $message  = new Message();
+    //        $message  = new Message();
-//        $message->topic($settings['ntfy_topic']);
+    //        $message->topic($settings['ntfy_topic']);
-//        $message->title((string) trans('email.admin_test_subject'));
+    //        $message->title((string) trans('email.admin_test_subject'));
-//        $message->body((string) trans('email.admin_test_message', ['channel' => 'ntfy']));
+    //        $message->body((string) trans('email.admin_test_message', ['channel' => 'ntfy']));
-//        $message->tags(['white_check_mark']);
+    //        $message->tags(['white_check_mark']);
-//
+    //
-//        return $message;
+    //        return $message;
-//    }
+    //    }
 
-//    public function via(User $user): array
+    //    public function via(User $user): array
-//    {
+    //    {
-//        return [NtfyChannel::class];
+    //        return [NtfyChannel::class];
-//    }
+    //    }
 }

app/Notifications/User/BillReminder.php

@@ -73,16 +73,16 @@ class BillReminder extends Notification
         return (string) trans(sprintf('email.bill_warning_subject_%s', $this->field), ['diff' => $this->diff, 'name' => $this->bill->name]);
     }
 
-//    public function toNtfy(User $notifiable): Message
+    //    public function toNtfy(User $notifiable): Message
-//    {
+    //    {
-//        $settings = ReturnsSettings::getSettings('ntfy', 'user', $notifiable);
+    //        $settings = ReturnsSettings::getSettings('ntfy', 'user', $notifiable);
-//        $message  = new Message();
+    //        $message  = new Message();
-//        $message->topic($settings['ntfy_topic']);
+    //        $message->topic($settings['ntfy_topic']);
-//        $message->title($this->getSubject());
+    //        $message->title($this->getSubject());
-//        $message->body((string) trans('email.bill_warning_please_action'));
+    //        $message->body((string) trans('email.bill_warning_please_action'));
-//
+    //
-//        return $message;
+    //        return $message;
-//    }
+    //    }
 
     /**
      * @SuppressWarnings("PHPMD.UnusedFormalParameter")

app/Notifications/User/NewAccessToken.php

@@ -68,16 +68,16 @@ class NewAccessToken extends Notification
         ;
     }
 
-//    public function toNtfy(User $notifiable): Message
+    //    public function toNtfy(User $notifiable): Message
-//    {
+    //    {
-//        $settings = ReturnsSettings::getSettings('ntfy', 'user', $notifiable);
+    //        $settings = ReturnsSettings::getSettings('ntfy', 'user', $notifiable);
-//        $message  = new Message();
+    //        $message  = new Message();
-//        $message->topic($settings['ntfy_topic']);
+    //        $message->topic($settings['ntfy_topic']);
-//        $message->title((string) trans('email.access_token_created_subject'));
+    //        $message->title((string) trans('email.access_token_created_subject'));
-//        $message->body((string) trans('email.access_token_created_body'));
+    //        $message->body((string) trans('email.access_token_created_body'));
-//
+    //
-//        return $message;
+    //        return $message;
-//    }
+    //    }
 
     /**
      * @SuppressWarnings("PHPMD.UnusedFormalParameter")

app/Notifications/User/RuleActionFailed.php

@@ -65,15 +65,15 @@ class RuleActionFailed extends Notification
         ];
     }
 
-//    public function toNtfy(User $notifiable): Message
+    //    public function toNtfy(User $notifiable): Message
-//    {
+    //    {
-//        $settings = ReturnsSettings::getSettings('ntfy', 'user', $notifiable);
+    //        $settings = ReturnsSettings::getSettings('ntfy', 'user', $notifiable);
-//        $message  = new Message();
+    //        $message  = new Message();
-//        $message->topic($settings['ntfy_topic']);
+    //        $message->topic($settings['ntfy_topic']);
-//        $message->body($this->message);
+    //        $message->body($this->message);
-//
+    //
-//        return $message;
+    //        return $message;
-//    }
+    //    }
 
     /**
      * @SuppressWarnings("PHPMD.UnusedFormalParameter")

app/Notifications/User/UserLogin.php

@@ -65,18 +65,18 @@ class UserLogin extends Notification
         ;
     }
 
-//    public function toNtfy(User $notifiable): Message
+    //    public function toNtfy(User $notifiable): Message
-//    {
+    //    {
-//        $ip       = Request::ip();
+    //        $ip       = Request::ip();
-//        $host     = Steam::getHostName($ip);
+    //        $host     = Steam::getHostName($ip);
-//        $settings = ReturnsSettings::getSettings('ntfy', 'user', $notifiable);
+    //        $settings = ReturnsSettings::getSettings('ntfy', 'user', $notifiable);
-//        $message  = new Message();
+    //        $message  = new Message();
-//        $message->topic($settings['ntfy_topic']);
+    //        $message->topic($settings['ntfy_topic']);
-//        $message->title((string) trans('email.login_from_new_ip'));
+    //        $message->title((string) trans('email.login_from_new_ip'));
-//        $message->body((string) trans('email.slack_login_from_new_ip', ['ip' => $ip, 'host' => $host]));
+    //        $message->body((string) trans('email.slack_login_from_new_ip', ['ip' => $ip, 'host' => $host]));
-//
+    //
-//        return $message;
+    //        return $message;
-//    }
+    //    }
 
     /**
      * @SuppressWarnings("PHPMD.UnusedFormalParameter")

app/Notifications/User/UserNewPassword.php

@@ -70,15 +70,15 @@ class UserNewPassword extends Notification
         ;
     }
 
-//    public function toNtfy(User $notifiable): Message
+    //    public function toNtfy(User $notifiable): Message
-//    {
+    //    {
-//        $settings = ReturnsSettings::getSettings('ntfy', 'user', $notifiable);
+    //        $settings = ReturnsSettings::getSettings('ntfy', 'user', $notifiable);
-//        $message  = new Message();
+    //        $message  = new Message();
-//        $message->topic($settings['ntfy_topic']);
+    //        $message->topic($settings['ntfy_topic']);
-//        $message->body((string) trans('email.reset_pw_message'));
+    //        $message->body((string) trans('email.reset_pw_message'));
-//
+    //
-//        return $message;
+    //        return $message;
-//    }
+    //    }
 
     /**
      * @SuppressWarnings("PHPMD.UnusedFormalParameter")

app/Repositories/Account/AccountRepository.php

@@ -478,18 +478,18 @@ class AccountRepository implements AccountRepositoryInterface, UserGroupInterfac
 
     public function getAccountsByType(array $types, ?array $sort = []): Collection
     {
-        $res   = array_intersect([AccountTypeEnum::ASSET->value, AccountTypeEnum::MORTGAGE->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::DEBT->value], $types);
+        $res     = array_intersect([AccountTypeEnum::ASSET->value, AccountTypeEnum::MORTGAGE->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::DEBT->value], $types);
-        $query = $this->user->accounts();
+        $query   = $this->user->accounts();
         if (0 !== count($types)) {
             $query->accountTypeIn($types);
         }
 
         // add sort parameters
         $allowed = config('firefly.allowed_db_sort_parameters.Account', []);
-        $sorted = 0;
+        $sorted  = 0;
         if (0 !== count($sort)) {
             foreach ($sort as $param) {
-                if(in_array($param[0], $allowed, true)) {
+                if (in_array($param[0], $allowed, true)) {
                     $query->orderBy($param[0], $param[1]);
                     ++$sorted;
                 }

app/Repositories/LinkType/LinkTypeRepository.php

@@ -115,12 +115,13 @@ class LinkTypeRepository implements LinkTypeRepositoryInterface, UserGroupInterf
     public function getJournalLinks(?LinkType $linkType = null): Collection
     {
         $query = TransactionJournalLink::with(['source', 'destination'])
-                                       ->leftJoin('transaction_journals as source_journals', 'journal_links.source_id', '=', 'source_journals.id')
+            ->leftJoin('transaction_journals as source_journals', 'journal_links.source_id', '=', 'source_journals.id')
-                                       ->leftJoin('transaction_journals as dest_journals', 'journal_links.destination_id', '=', 'dest_journals.id')
+            ->leftJoin('transaction_journals as dest_journals', 'journal_links.destination_id', '=', 'dest_journals.id')
-                                       ->where('source_journals.user_id', $this->user->id)
+            ->where('source_journals.user_id', $this->user->id)
-                                       ->where('dest_journals.user_id', $this->user->id)
+            ->where('dest_journals.user_id', $this->user->id)
-                                       ->whereNull('source_journals.deleted_at')
+            ->whereNull('source_journals.deleted_at')
-                                       ->whereNull('dest_journals.deleted_at');
+            ->whereNull('dest_journals.deleted_at')
+        ;
 
         if ($linkType instanceof LinkType) {
             $query->where('journal_links.link_type_id', $linkType->id);
@@ -149,7 +150,7 @@ class LinkTypeRepository implements LinkTypeRepositoryInterface, UserGroupInterf
         $merged  = $outward->merge($inward);
 
         return $merged->filter(
-            static fn(TransactionJournalLink $link) => null !== $link->source && null !== $link->destination
+            static fn (TransactionJournalLink $link) => null !== $link->source && null !== $link->destination
         );
     }
 
@@ -188,7 +189,7 @@ class LinkTypeRepository implements LinkTypeRepositoryInterface, UserGroupInterf
             return $existing;
         }
 
-        $link = new TransactionJournalLink();
+        $link     = new TransactionJournalLink();
         $link->linkType()->associate($linkType);
         if ('inward' === $information['direction']) {
             app('log')->debug(sprintf('Link type is inwards ("%s"), so %d is source and %d is destination.', $linkType->inward, $inward->id, $outward->id));
@@ -229,8 +230,9 @@ class LinkTypeRepository implements LinkTypeRepositoryInterface, UserGroupInterf
     public function findSpecificLink(LinkType $linkType, TransactionJournal $inward, TransactionJournal $outward): ?TransactionJournalLink
     {
         return TransactionJournalLink::where('link_type_id', $linkType->id)
-                                     ->where('source_id', $inward->id)
+            ->where('source_id', $inward->id)
-                                     ->where('destination_id', $outward->id)->first();
+            ->where('destination_id', $outward->id)->first()
+        ;
     }
 
     /**
@@ -292,7 +294,7 @@ class LinkTypeRepository implements LinkTypeRepositoryInterface, UserGroupInterf
             $journalLink->refresh();
         }
 
-        $journalLink->link_type_id = $data['link_type_id'] ?? $journalLink->link_type_id;
+        $journalLink->link_type_id   = $data['link_type_id'] ?? $journalLink->link_type_id;
         $journalLink->save();
         if (array_key_exists('notes', $data) && null !== $data['notes']) {
             $this->setNoteText($journalLink, $data['notes']);

app/Repositories/PiggyBank/PiggyBankRepository.php

@@ -241,7 +241,7 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface, UserGroupInte
         Log::debug(sprintf('Will add/remove %f to piggy bank #%d ("%s")', $amount, $piggyBank->id, $piggyBank->name));
 
         // if the amount is positive, make sure it fits in piggy bank:
-        if (1 === bccomp($amount, '0') && -1 === bccomp( $room, $amount)) {
+        if (1 === bccomp($amount, '0') && -1 === bccomp($room, $amount)) {
             // amount is positive and $room is smaller than $amount
             Log::debug(sprintf('Room in piggy bank for extra money is %f', $room));
             Log::debug(sprintf('There is NO room to add %f to piggy bank #%d ("%s")', $amount, $piggyBank->id, $piggyBank->name));
@@ -259,7 +259,7 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface, UserGroupInte
             return $compare;
         }
 
-        return  $amount;
+        return $amount;
     }
 
     /**

app/Repositories/Tag/TagRepository.php

@@ -272,9 +272,9 @@ class TagRepository implements TagRepositoryInterface, UserGroupInterface
             $amount                   = Steam::positive((string) $journal['amount']);
             $type                     = $journal['transaction_type_type'];
             if (TransactionTypeEnum::WITHDRAWAL->value === $type) {
-                $amount = bcmul( $amount, '-1');
+                $amount = bcmul($amount, '-1');
             }
-            $sums[$currencyId][$type] = bcadd((string) $sums[$currencyId][$type],  $amount);
+            $sums[$currencyId][$type] = bcadd((string) $sums[$currencyId][$type], $amount);
 
             $foreignCurrencyId        = $journal['foreign_currency_id'];
             if (null !== $foreignCurrencyId && 0 !== $foreignCurrencyId) {
@@ -292,7 +292,7 @@ class TagRepository implements TagRepositoryInterface, UserGroupInterface
                 // add foreign amount to correct type:
                 $amount                          = Steam::positive((string) $journal['foreign_amount']);
                 if (TransactionTypeEnum::WITHDRAWAL->value === $type) {
-                    $amount = bcmul( $amount, '-1');
+                    $amount = bcmul($amount, '-1');
                 }
                 $sums[$foreignCurrencyId][$type] = bcadd((string) $sums[$foreignCurrencyId][$type], $amount);
             }

app/Repositories/TransactionGroup/TransactionGroupRepository.php

@@ -50,6 +50,7 @@ use FireflyIII\Support\Repositories\UserGroup\UserGroupTrait;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
+
 use function Safe\json_decode;
 
 /**
@@ -143,21 +144,22 @@ class TransactionGroupRepository implements TransactionGroupRepositoryInterface,
     {
         $repository = app(AttachmentRepositoryInterface::class);
         $repository->setUser($this->user);
-        $journals = $group->transactionJournals->pluck('id')->toArray();
+        $journals   = $group->transactionJournals->pluck('id')->toArray();
-        $set      = Attachment::whereIn('attachable_id', $journals)
+        $set        = Attachment::whereIn('attachable_id', $journals)
-                              ->where('attachable_type', TransactionJournal::class)
+            ->where('attachable_type', TransactionJournal::class)
-                              ->where('uploaded', true)
+            ->where('uploaded', true)
-                              ->whereNull('deleted_at')->get();
+            ->whereNull('deleted_at')->get()
+        ;
 
-        $result = [];
+        $result     = [];
 
         /** @var Attachment $attachment */
         foreach ($set as $attachment) {
-            $journalId              = $attachment->attachable_id;
+            $journalId                = $attachment->attachable_id;
-            $result[$journalId]     ??= [];
+            $result[$journalId] ??= [];
-            $current                = $attachment->toArray();
+            $current                  = $attachment->toArray();
-            $current['file_exists'] = true;
+            $current['file_exists']   = true;
-            $current['notes']       = $repository->getNoteText($attachment);
+            $current['notes']         = $repository->getNoteText($attachment);
             // already determined that this attachable is a TransactionJournal.
             $current['journal_title'] = $attachment->attachable->description;
             $result[$journalId][]     = $current;
@@ -173,8 +175,9 @@ class TransactionGroupRepository implements TransactionGroupRepositoryInterface,
     {
         /** @var null|Note $note */
         $note = Note::where('noteable_id', $journalId)
-                    ->where('noteable_type', TransactionJournal::class)
+            ->where('noteable_type', TransactionJournal::class)
-                    ->first();
+            ->first()
+        ;
         if (null === $note) {
             return null;
         }
@@ -195,13 +198,14 @@ class TransactionGroupRepository implements TransactionGroupRepositoryInterface,
                 $q->orWhereIn('destination_id', $journals);
             }
         )
-                                          ->with(['source', 'destination', 'source.transactions'])
+            ->with(['source', 'destination', 'source.transactions'])
-                                          ->leftJoin('link_types', 'link_types.id', '=', 'journal_links.link_type_id')
+            ->leftJoin('link_types', 'link_types.id', '=', 'journal_links.link_type_id')
-                                          ->get(['journal_links.*', 'link_types.inward', 'link_types.outward', 'link_types.editable']);
+            ->get(['journal_links.*', 'link_types.inward', 'link_types.outward', 'link_types.editable'])
+        ;
 
         /** @var TransactionJournalLink $entry */
         foreach ($set as $entry) {
-            $journalId          = in_array($entry->source_id, $journals, true) ? $entry->source_id : $entry->destination_id;
+            $journalId = in_array($entry->source_id, $journals, true) ? $entry->source_id : $entry->destination_id;
             $return[$journalId] ??= [];
 
             // phpstan: the editable field is provided by the query.
@@ -247,6 +251,7 @@ class TransactionGroupRepository implements TransactionGroupRepositoryInterface,
         if (TransactionTypeEnum::WITHDRAWAL->value === $type) {
             return Amount::formatAnything($currency, app('steam')->negative($amount));
         }
+
         return Amount::formatAnything($currency, $amount);
     }
 
@@ -262,13 +267,14 @@ class TransactionGroupRepository implements TransactionGroupRepositoryInterface,
             return '';
         }
 
-        $currency = $transaction->foreignCurrency;
+        $currency    = $transaction->foreignCurrency;
-        $type     = $journal->transactionType->type;
+        $type        = $journal->transactionType->type;
-        $amount   = app('steam')->positive($transaction->foreign_amount);
+        $amount      = app('steam')->positive($transaction->foreign_amount);
         if (TransactionTypeEnum::WITHDRAWAL->value === $type) {
             return Amount::formatAnything($currency, app('steam')->negative($amount));
         }
-            return Amount::formatAnything($currency, $amount);
+
+        return Amount::formatAnything($currency, $amount);
     }
 
     public function getLocation(int $journalId): ?Location
@@ -288,10 +294,11 @@ class TransactionGroupRepository implements TransactionGroupRepositoryInterface,
     public function getMetaDateFields(int $journalId, array $fields): NullArrayObject
     {
         $query  = DB::table('journal_meta')
-                    ->where('transaction_journal_id', $journalId)
+            ->where('transaction_journal_id', $journalId)
-                    ->whereIn('name', $fields)
+            ->whereIn('name', $fields)
-                    ->whereNull('deleted_at')
+            ->whereNull('deleted_at')
-                    ->get(['name', 'data']);
+            ->get(['name', 'data'])
+        ;
         $return = [];
 
         foreach ($query as $row) {
@@ -307,10 +314,11 @@ class TransactionGroupRepository implements TransactionGroupRepositoryInterface,
     public function getMetaFields(int $journalId, array $fields): NullArrayObject
     {
         $query  = DB::table('journal_meta')
-                    ->where('transaction_journal_id', $journalId)
+            ->where('transaction_journal_id', $journalId)
-                    ->whereIn('name', $fields)
+            ->whereIn('name', $fields)
-                    ->whereNull('deleted_at')
+            ->whereNull('deleted_at')
-                    ->get(['name', 'data']);
+            ->get(['name', 'data'])
+        ;
         $return = [];
 
         foreach ($query as $row) {
@@ -331,8 +339,9 @@ class TransactionGroupRepository implements TransactionGroupRepositoryInterface,
         $journals = $group->transactionJournals->pluck('id')->toArray();
         $currency = Amount::getPrimaryCurrencyByUserGroup($this->user->userGroup);
         $data     = PiggyBankEvent::whereIn('transaction_journal_id', $journals)
-                                  ->with('piggyBank', 'piggyBank.account')
+            ->with('piggyBank', 'piggyBank.account')
-                                  ->get(['piggy_bank_events.*']);
+            ->get(['piggy_bank_events.*'])
+        ;
 
         /** @var PiggyBankEvent $row */
         foreach ($data as $row) {
@@ -340,13 +349,14 @@ class TransactionGroupRepository implements TransactionGroupRepositoryInterface,
                 continue;
             }
             // get currency preference.
-            $currencyPreference = AccountMeta::where('account_id', $row->piggyBank->account_id)
+            $currencyPreference   = AccountMeta::where('account_id', $row->piggyBank->account_id)
-                                             ->where('name', 'currency_id')
+                ->where('name', 'currency_id')
-                                             ->first();
+                ->first()
+            ;
             if (null !== $currencyPreference) {
                 $currency = TransactionCurrency::where('id', $currencyPreference->data)->first();
             }
-            $journalId          = $row->transaction_journal_id;
+            $journalId            = $row->transaction_journal_id;
             $return[$journalId] ??= [];
 
             $return[$journalId][] = [
@@ -373,10 +383,11 @@ class TransactionGroupRepository implements TransactionGroupRepositoryInterface,
     public function getTags(int $journalId): array
     {
         $result = DB::table('tag_transaction_journal')
-                    ->leftJoin('tags', 'tag_transaction_journal.tag_id', '=', 'tags.id')
+            ->leftJoin('tags', 'tag_transaction_journal.tag_id', '=', 'tags.id')
-                    ->where('tag_transaction_journal.transaction_journal_id', $journalId)
+            ->where('tag_transaction_journal.transaction_journal_id', $journalId)
-                    ->orderBy('tags.tag', 'ASC')
+            ->orderBy('tags.tag', 'ASC')
-                    ->get(['tags.tag']);
+            ->get(['tags.tag'])
+        ;
 
         return $result->pluck('tag')->toArray();
     }

app/Repositories/User/UserRepository.php

@@ -229,7 +229,7 @@ class UserRepository implements UserRepositoryInterface
         return $return;
     }
 
-    public function hasRole(null|Authenticatable|User $user, string $role): bool
+    public function hasRole(Authenticatable|User|null $user, string $role): bool
     {
         if (!$user instanceof Authenticatable) {
             return false;
@@ -270,7 +270,7 @@ class UserRepository implements UserRepositoryInterface
         return $collection;
     }
 
-    public function inviteUser(null|Authenticatable|User $user, string $email): InvitedUser
+    public function inviteUser(Authenticatable|User|null $user, string $email): InvitedUser
     {
         if (!$user instanceof User) {
             throw new FireflyException('User is not a User object.');

app/Repositories/User/UserRepositoryInterface.php

@@ -105,9 +105,9 @@ interface UserRepositoryInterface
 
     public function getUserGroups(User $user): Collection;
 
-    public function hasRole(null|Authenticatable|User $user, string $role): bool;
+    public function hasRole(Authenticatable|User|null $user, string $role): bool;
 
-    public function inviteUser(null|Authenticatable|User $user, string $email): InvitedUser;
+    public function inviteUser(Authenticatable|User|null $user, string $email): InvitedUser;
 
     public function redeemCode(string $code): void;
 

app/Rules/IsValidSortInstruction.php

@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /*
  * IsValidSortInstruction.php
  * Copyright (c) 2025 james@firefly-iii.org
@@ -35,21 +37,24 @@ class IsValidSortInstruction implements ValidationRule
 
     public function validate(string $attribute, mixed $value, Closure $fail): void
     {
-        $shortClass = str_replace('FireflyIII\\Models\\', '', $this->class);
+        $shortClass      = str_replace('FireflyIII\Models\\', '', $this->class);
         if (!is_string($value)) {
             $fail('validation.invalid_sort_instruction')->translate(['object' => $shortClass]);
+
             return;
         }
         $validParameters = config(sprintf('firefly.allowed_sort_parameters.%s', $shortClass));
         if (!is_array($validParameters)) {
             $fail('validation.no_sort_instructions')->translate(['object' => $shortClass]);
+
             return;
         }
-        $parts = explode(',', $value);
+        $parts           = explode(',', $value);
         foreach ($parts as $i => $part) {
             $part = trim($part);
             if (strlen($part) < 2) {
                 $fail('validation.invalid_sort_instruction_index')->translate(['index' => $i, 'object' => $shortClass]);
+
                 return;
             }
             if ('-' === $part[0]) {
@@ -57,6 +62,7 @@ class IsValidSortInstruction implements ValidationRule
             }
             if (!in_array($part, $validParameters, true)) {
                 $fail('validation.invalid_sort_instruction_index')->translate(['index' => $i, 'object' => $shortClass]);
+
                 return;
             }
         }

app/Services/Internal/Update/JournalUpdateService.php

@@ -780,10 +780,10 @@ class JournalUpdateService
 
     private function isBetweenAssetAndLiability(): bool
     {
-        /** @var Transaction|null $sourceTransaction */
+        /** @var null|Transaction $sourceTransaction */
         $sourceTransaction      = $this->transactionJournal->transactions()->where('amount', '<', 0)->first();
 
-        /** @var Transaction|null $destinationTransaction */
+        /** @var null|Transaction $destinationTransaction */
         $destinationTransaction = $this->transactionJournal->transactions()->where('amount', '>', 0)->first();
         if (null === $sourceTransaction || null === $destinationTransaction) {
             Log::warning('Either transaction is false, stop.');

app/Support/Authentication/RemoteUserGuard.php

@@ -139,14 +139,14 @@ class RemoteUserGuard implements Guard
     /**
      * @SuppressWarnings("PHPMD.ShortMethodName")
      */
-    public function id(): null|int|string
+    public function id(): int|string|null
     {
         Log::debug(sprintf('Now at %s', __METHOD__));
 
         return $this->user?->id;
     }
 
-    public function setUser(null|Authenticatable|User $user): void // @phpstan-ignore-line
+    public function setUser(Authenticatable|User|null $user): void // @phpstan-ignore-line
     {
         Log::debug(sprintf('Now at %s', __METHOD__));
         if ($user instanceof User) {

app/Support/Facades/Navigation.php

@@ -23,7 +23,6 @@ declare(strict_types=1);
 
 namespace FireflyIII\Support\Facades;
 
-use Carbon\Carbon;
 use Illuminate\Support\Facades\Facade;
 
 class Navigation extends Facade

app/Support/JsonApi/Enrichments/AccountEnrichment.php

@@ -144,9 +144,10 @@ class AccountEnrichment implements EnrichmentInterface
 
     private function collectMetaData(): void
     {
-        $set = AccountMeta::whereIn('name', ['is_multi_currency', 'include_net_worth', 'currency_id', 'account_role', 'account_number', 'BIC', 'liability_direction', 'interest', 'interest_period', 'current_debt'])
+        $set                 = AccountMeta::whereIn('name', ['is_multi_currency', 'include_net_worth', 'currency_id', 'account_role', 'account_number', 'BIC', 'liability_direction', 'interest', 'interest_period', 'current_debt'])
-                          ->whereIn('account_id', $this->ids)
+            ->whereIn('account_id', $this->ids)
-                          ->get(['account_meta.id', 'account_meta.account_id', 'account_meta.name', 'account_meta.data'])->toArray();
+            ->get(['account_meta.id', 'account_meta.account_id', 'account_meta.name', 'account_meta.data'])->toArray()
+        ;
 
         /** @var array $entry */
         foreach ($set as $entry) {
@@ -172,9 +173,10 @@ class AccountEnrichment implements EnrichmentInterface
     private function collectNotes(): void
     {
         $notes = Note::query()->whereIn('noteable_id', $this->ids)
-                     ->whereNotNull('notes.text')
+            ->whereNotNull('notes.text')
-                     ->where('notes.text', '!=', '')
+            ->where('notes.text', '!=', '')
-                     ->where('noteable_type', Account::class)->get(['notes.noteable_id', 'notes.text'])->toArray();
+            ->where('noteable_type', Account::class)->get(['notes.noteable_id', 'notes.text'])->toArray()
+        ;
         foreach ($notes as $note) {
             $this->notes[(int)$note['noteable_id']] = (string)$note['text'];
         }
@@ -184,14 +186,15 @@ class AccountEnrichment implements EnrichmentInterface
     private function collectLocations(): void
     {
         $locations = Location::query()->whereIn('locatable_id', $this->ids)
-                             ->where('locatable_type', Account::class)->get(['locations.locatable_id', 'locations.latitude', 'locations.longitude', 'locations.zoom_level'])->toArray();
+            ->where('locatable_type', Account::class)->get(['locations.locatable_id', 'locations.latitude', 'locations.longitude', 'locations.zoom_level'])->toArray()
+        ;
         foreach ($locations as $location) {
             $this->locations[(int)$location['locatable_id']]
                 = [
-                'latitude'   => (float)$location['latitude'],
+                    'latitude'   => (float)$location['latitude'],
-                'longitude'  => (float)$location['longitude'],
+                    'longitude'  => (float)$location['longitude'],
-                'zoom_level' => (int)$location['zoom_level'],
+                    'zoom_level' => (int)$location['zoom_level'],
-            ];
+                ];
         }
         Log::debug(sprintf('Enrich with %d locations(s)', count($this->locations)));
     }
@@ -206,19 +209,20 @@ class AccountEnrichment implements EnrichmentInterface
             ->setUserGroup($this->userGroup)
             ->setAccounts($this->collection)
             ->withAccountInformation()
-            ->setTypes([TransactionTypeEnum::OPENING_BALANCE->value]);
+            ->setTypes([TransactionTypeEnum::OPENING_BALANCE->value])
-        $journals = $collector->getExtractedJournals();
+        ;
+        $journals  = $collector->getExtractedJournals();
         foreach ($journals as $journal) {
             $this->openingBalances[(int)$journal['source_account_id']]
                 = [
-                'amount' => Steam::negative($journal['amount']),
+                    'amount' => Steam::negative($journal['amount']),
-                'date'   => $journal['date'],
+                    'date'   => $journal['date'],
-            ];
+                ];
             $this->openingBalances[(int)$journal['destination_account_id']]
                 = [
-                'amount' => Steam::positive($journal['amount']),
+                    'amount' => Steam::positive($journal['amount']),
-                'date'   => $journal['date'],
+                    'date'   => $journal['date'],
-            ];
+                ];
         }
     }
 
@@ -236,9 +240,9 @@ class AccountEnrichment implements EnrichmentInterface
     private function appendCollectedData(): void
     {
         $this->collection = $this->collection->map(function (Account $item) {
-            $id                      = (int)$item->id;
+            $id                           = (int)$item->id;
-            $item->full_account_type = $this->accountTypes[(int)$item->account_type_id] ?? null;
+            $item->full_account_type      = $this->accountTypes[(int)$item->account_type_id] ?? null;
-            $meta                    = [
+            $meta                         = [
                 'currency'               => null,
                 'location'               => [
                     'latitude'   => null,
@@ -285,30 +289,30 @@ class AccountEnrichment implements EnrichmentInterface
 
             // add balances
             // get currencies:
-            $currency = $this->primaryCurrency; // assume primary currency
+            $currency                     = $this->primaryCurrency; // assume primary currency
             if (null !== $meta['currency']) {
                 $currency = $meta['currency'];
             }
 
             // get the current balance:
-            $date = $this->getDate();
+            $date                         = $this->getDate();
             // $finalBalance            = Steam::finalAccountBalance($item, $date, $this->primaryCurrency, $this->convertToPrimary);
-            $finalBalance      = $this->balances[$id];
+            $finalBalance                 = $this->balances[$id];
-            $balanceDifference = $this->getBalanceDifference($id, $currency);
+            $balanceDifference            = $this->getBalanceDifference($id, $currency);
             Log::debug(sprintf('Call finalAccountBalance(%s) with date/time "%s"', var_export($this->convertToPrimary, true), $date->toIso8601String()), $finalBalance);
 
             // collect current balances:
-            $currentBalance = Steam::bcround($finalBalance[$currency->code] ?? '0', $currency->decimal_places);
+            $currentBalance               = Steam::bcround($finalBalance[$currency->code] ?? '0', $currency->decimal_places);
-            $openingBalance = Steam::bcround($meta['opening_balance_amount'] ?? '0', $currency->decimal_places);
+            $openingBalance               = Steam::bcround($meta['opening_balance_amount'] ?? '0', $currency->decimal_places);
-            $virtualBalance = Steam::bcround($item->virtual_balance ?? '0', $currency->decimal_places);
+            $virtualBalance               = Steam::bcround($item->virtual_balance ?? '0', $currency->decimal_places);
-            $debtAmount     = $meta['current_debt'] ?? null;
+            $debtAmount                   = $meta['current_debt'] ?? null;
 
             // set some pc_ default values to NULL:
-            $pcCurrentBalance    = null;
+            $pcCurrentBalance             = null;
-            $pcOpeningBalance    = null;
+            $pcOpeningBalance             = null;
-            $pcVirtualBalance    = null;
+            $pcVirtualBalance             = null;
-            $pcDebtAmount        = null;
+            $pcDebtAmount                 = null;
-            $pcBalanceDifference = null;
+            $pcBalanceDifference          = null;
 
             // convert to primary currency if needed:
             if ($this->convertToPrimary && $currency->id !== $this->primaryCurrency->id) {
@@ -347,7 +351,7 @@ class AccountEnrichment implements EnrichmentInterface
                 'pc_balance_difference' => $pcBalanceDifference,
             ];
             // end add balances
-            $item->meta = $meta;
+            $item->meta                   = $meta;
 
             return $item;
         });
@@ -369,12 +373,13 @@ class AccountEnrichment implements EnrichmentInterface
 
     private function collectObjectGroups(): void
     {
-        $set = DB::table('object_groupables')
+        $set    = DB::table('object_groupables')
-                 ->whereIn('object_groupable_id', $this->ids)
+            ->whereIn('object_groupable_id', $this->ids)
-                 ->where('object_groupable_type', Account::class)
+            ->where('object_groupable_type', Account::class)
-                 ->get(['object_groupable_id', 'object_group_id']);
+            ->get(['object_groupable_id', 'object_group_id'])
+        ;
 
-        $ids = array_unique($set->pluck('object_group_id')->toArray());
+        $ids    = array_unique($set->pluck('object_group_id')->toArray());
 
         foreach ($set as $entry) {
             $this->mappedObjects[(int)$entry->object_groupable_id] = (int)$entry->object_group_id;
@@ -426,8 +431,8 @@ class AccountEnrichment implements EnrichmentInterface
         if (0 === count($startBalance) || 0 === count($endBalance)) {
             return null;
         }
-        $start = $startBalance[$currency->code] ?? '0';
+        $start        = $startBalance[$currency->code] ?? '0';
-        $end   = $endBalance[$currency->code] ?? '0';
+        $end          = $endBalance[$currency->code] ?? '0';
 
         return bcsub($end, $start);
     }
@@ -440,22 +445,25 @@ class AccountEnrichment implements EnrichmentInterface
     private function sortData(): void
     {
         $dbParams = config('firefly.allowed_db_sort_parameters.Account', []);
+
         /** @var array $parameter */
         foreach ($this->sort as $parameter) {
             if (in_array($parameter[0], $dbParams, true)) {
                 continue;
             }
+
             switch ($parameter[0]) {
                 default:
                     throw new FireflyException(sprintf('Account enrichment cannot sort on field "%s"', $parameter[0]));
+
                 case 'current_balance':
                 case 'pc_current_balance':
                     $this->collection = $this->collection->sortBy(static function (Account $account) use ($parameter) {
                         return $account->meta['balances'][$parameter[0]] ?? '0';
                     }, SORT_NUMERIC, 'desc' === $parameter[1]);
+
                     break;
             }
         }
     }
-
 }

app/Support/JsonApi/Enrichments/AvailableBudgetEnrichment.php

@@ -55,10 +55,9 @@ class AvailableBudgetEnrichment implements EnrichmentInterface
     private readonly OperationsRepositoryInterface $opsRepository;
     private readonly BudgetRepositoryInterface     $repository;
 
-
     public function __construct()
     {
-        //$this->primaryCurrency    = Amount::getPrimaryCurrency();
+        // $this->primaryCurrency    = Amount::getPrimaryCurrency();
         $this->convertToPrimary   = Amount::convertToPrimary();
         $this->noBudgetRepository = app(NoBudgetRepositoryInterface::class);
         $this->opsRepository      = app(OperationsRepositoryInterface::class);

app/Support/JsonApi/Enrichments/BudgetEnrichment.php

@@ -30,10 +30,8 @@ use FireflyIII\Models\AutoBudget;
 use FireflyIII\Models\Budget;
 use FireflyIII\Models\Note;
 use FireflyIII\Models\ObjectGroup;
-use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Models\UserGroup;
 use FireflyIII\Repositories\Budget\OperationsRepositoryInterface;
-use FireflyIII\Support\Facades\Amount;
 use FireflyIII\User;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Collection;
@@ -56,9 +54,7 @@ class BudgetEnrichment implements EnrichmentInterface
     private array               $objectGroups  = [];
     private array               $mappedObjects = [];
 
-    public function __construct()
+    public function __construct() {}
-    {
-    }
 
     public function enrich(Collection $collection): Collection
     {

app/Support/JsonApi/Enrichments/PiggyBankEnrichment.php

@@ -55,8 +55,8 @@ class PiggyBankEnrichment implements EnrichmentInterface
     private array               $mappedObjects = [];
     private TransactionCurrency $primaryCurrency;
     private array               $amounts       = [];
-    private array $accounts=  [];
+    private array $accounts                    = [];
-    private array $objectGroups=  [];
+    private array $objectGroups                = [];
 
     public function __construct()
     {

app/Support/JsonApi/Enrichments/RecurringEnrichment.php

@@ -25,7 +25,6 @@ declare(strict_types=1);
 
 namespace FireflyIII\Support\JsonApi\Enrichments;
 
-use function Safe\json_decode;
 use Carbon\Carbon;
 use FireflyIII\Enums\RecurrenceRepetitionWeekend;
 use FireflyIII\Exceptions\FireflyException;
@@ -53,11 +52,13 @@ use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Log;
 
+use function Safe\json_decode;
+
 class RecurringEnrichment implements EnrichmentInterface
 {
     private Collection          $collection;
     private array               $ids                   = [];
-//    private array               $transactionTypeIds    = [];
+    //    private array               $transactionTypeIds    = [];
     // private array               $transactionTypes      = [];
     private array               $notes                 = [];
     private array               $repetitions           = [];
@@ -122,10 +123,10 @@ class RecurringEnrichment implements EnrichmentInterface
     {
         /** @var Recurrence $recurrence */
         foreach ($this->collection as $recurrence) {
-            $id                            = (int)$recurrence->id;
+            $id          = (int)$recurrence->id;
-//            $typeId                        = (int)$recurrence->transaction_type_id;
+            //            $typeId                        = (int)$recurrence->transaction_type_id;
-            $this->ids[]                   = $id;
+            $this->ids[] = $id;
-            //$this->transactionTypeIds[$id] = $typeId;
+            // $this->transactionTypeIds[$id] = $typeId;
         }
         $this->ids = array_unique($this->ids);
 
@@ -146,7 +147,7 @@ class RecurringEnrichment implements EnrichmentInterface
 
         /** @var RecurrenceRepetition $repetition */
         foreach ($set as $repetition) {
-            $recurrence                     = $this->collection->filter(fn(Recurrence $item) => (int)$item->id === (int)$repetition->recurrence_id)->first();
+            $recurrence                     = $this->collection->filter(fn (Recurrence $item) => (int)$item->id === (int)$repetition->recurrence_id)->first();
             $fromDate                       = clone ($recurrence->latest_date ?? $recurrence->first_date);
             $id                             = (int)$repetition->recurrence_id;
             $repId                          = (int)$repetition->id;

app/Support/JsonApi/Enrichments/SubscriptionEnrichment.php

@@ -28,7 +28,6 @@ namespace FireflyIII\Support\JsonApi\Enrichments;
 use Carbon\Carbon;
 use Carbon\CarbonInterface;
 use Carbon\Exceptions\InvalidFormatException;
-use Carbon\Exceptions\ParseErrorException;
 use FireflyIII\Models\Bill;
 use FireflyIII\Models\Note;
 use FireflyIII\Models\ObjectGroup;
@@ -87,11 +86,11 @@ class SubscriptionEnrichment implements EnrichmentInterface
         $paidDates        = $this->paidDates;
         $payDates         = $this->payDates;
         $this->collection = $this->collection->map(function (Bill $item) use ($notes, $objectGroups, $paidDates, $payDates) {
-            $id       = (int)$item->id;
+            $id            = (int)$item->id;
-            $currency = $item->transactionCurrency;
+            $currency      = $item->transactionCurrency;
-            $nem      = $this->getNextExpectedMatch($payDates[$id] ?? []);
+            $nem           = $this->getNextExpectedMatch($payDates[$id] ?? []);
 
-            $meta    = [
+            $meta          = [
                 'notes'              => null,
                 'object_group_id'    => null,
                 'object_group_title' => null,
@@ -102,7 +101,7 @@ class SubscriptionEnrichment implements EnrichmentInterface
                 'nem'                => $nem,
                 'nem_diff'           => $this->getNextExpectedMatchDiff($nem, $payDates[$id] ?? []),
             ];
-            $amounts = [
+            $amounts       = [
                 'amount_min'    => Steam::bcround($item->amount_min, $currency->decimal_places),
                 'amount_max'    => Steam::bcround($item->amount_max, $currency->decimal_places),
                 'average'       => Steam::bcround(bcdiv(bcadd($item->amount_min, $item->amount_max), '2'), $currency->decimal_places),
@@ -155,9 +154,10 @@ class SubscriptionEnrichment implements EnrichmentInterface
     private function collectNotes(): void
     {
         $notes = Note::query()->whereIn('noteable_id', $this->subscriptionIds)
-                     ->whereNotNull('notes.text')
+            ->whereNotNull('notes.text')
-                     ->where('notes.text', '!=', '')
+            ->where('notes.text', '!=', '')
-                     ->where('noteable_type', Bill::class)->get(['notes.noteable_id', 'notes.text'])->toArray();
+            ->where('noteable_type', Bill::class)->get(['notes.noteable_id', 'notes.text'])->toArray()
+        ;
         foreach ($notes as $note) {
             $this->notes[(int)$note['noteable_id']] = (string)$note['text'];
         }
@@ -186,12 +186,13 @@ class SubscriptionEnrichment implements EnrichmentInterface
 
     private function collectObjectGroups(): void
     {
-        $set = DB::table('object_groupables')
+        $set    = DB::table('object_groupables')
-                 ->whereIn('object_groupable_id', $this->subscriptionIds)
+            ->whereIn('object_groupable_id', $this->subscriptionIds)
-                 ->where('object_groupable_type', Bill::class)
+            ->where('object_groupable_type', Bill::class)
-                 ->get(['object_groupable_id', 'object_group_id']);
+            ->get(['object_groupable_id', 'object_group_id'])
+        ;
 
-        $ids = array_unique($set->pluck('object_group_id')->toArray());
+        $ids    = array_unique($set->pluck('object_group_id')->toArray());
 
         foreach ($set as $entry) {
             $this->mappedObjects[(int)$entry->object_groupable_id] = (int)$entry->object_group_id;
@@ -219,13 +220,13 @@ class SubscriptionEnrichment implements EnrichmentInterface
         // 2023-07-18 this particular date is used to search for the last paid date.
         // 2023-07-18 the cloned $searchDate is used to grab the correct transactions.
         /** @var Carbon $start */
-        $start       = clone $this->start;
+        $start           = clone $this->start;
-        $searchStart = clone $start;
+        $searchStart     = clone $start;
         $start->subDay();
 
         /** @var Carbon $end */
-        $end       = clone $this->end;
+        $end             = clone $this->end;
-        $searchEnd = clone $end;
+        $searchEnd       = clone $end;
 
         // move the search dates to the start of the day.
         $searchStart->startOfDay();
@@ -234,13 +235,13 @@ class SubscriptionEnrichment implements EnrichmentInterface
         Log::debug(sprintf('Search parameters are: start: %s, end: %s', $searchStart->format('Y-m-d H:i:s'), $searchEnd->format('Y-m-d H:i:s')));
 
         // Get from database when bills were paid.
-        $set = $this->user->transactionJournals()
+        $set             = $this->user->transactionJournals()
-                          ->whereIn('bill_id', $this->subscriptionIds)
+            ->whereIn('bill_id', $this->subscriptionIds)
-                          ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
+            ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
-                          ->leftJoin('transaction_currencies AS currency', 'currency.id', '=', 'transactions.transaction_currency_id')
+            ->leftJoin('transaction_currencies AS currency', 'currency.id', '=', 'transactions.transaction_currency_id')
-                          ->leftJoin('transaction_currencies AS foreign_currency', 'foreign_currency.id', '=', 'transactions.foreign_currency_id')
+            ->leftJoin('transaction_currencies AS foreign_currency', 'foreign_currency.id', '=', 'transactions.foreign_currency_id')
-                          ->where('transactions.amount', '>', 0)
+            ->where('transactions.amount', '>', 0)
-                          ->before($searchEnd)->after($searchStart)->get(
+            ->before($searchEnd)->after($searchStart)->get(
                 [
                     'transaction_journals.id',
                     'transaction_journals.date',
@@ -257,26 +258,27 @@ class SubscriptionEnrichment implements EnrichmentInterface
                     'transactions.amount',
                     'transactions.foreign_amount',
                 ]
-            );
+            )
+        ;
         Log::debug(sprintf('Count %d entries in set', $set->count()));
 
         // for each bill, do a loop.
-        $converter = new ExchangeRateConverter();
+        $converter       = new ExchangeRateConverter();
 
         /** @var Bill $subscription */
         foreach ($this->collection as $subscription) {
             // Grab from array the most recent payment. If none exist, fall back to the start date and pretend *that* was the last paid date.
             Log::debug(sprintf('Grab last paid date from function, return %s if it comes up with nothing.', $start->format('Y-m-d')));
-            $lastPaidDate = $this->lastPaidDate($subscription, $set, $start);
+            $lastPaidDate                            = $this->lastPaidDate($subscription, $set, $start);
             Log::debug(sprintf('Result of lastPaidDate is %s', $lastPaidDate->format('Y-m-d')));
 
             // At this point the "next match" is exactly after the last time the bill was paid.
-            $result   = [];
+            $result                                  = [];
-            $filtered = $set->filter(function (TransactionJournal $journal) use ($subscription) {
+            $filtered                                = $set->filter(function (TransactionJournal $journal) use ($subscription) {
                 return (int)$journal->bill_id === (int)$subscription->id;
             });
             foreach ($filtered as $entry) {
-                $array = [
+                $array    = [
                     'transaction_group_id'            => (string)$entry->transaction_group_id,
                     'transaction_journal_id'          => (string)$entry->id,
                     'date'                            => $entry->date->toAtomString(),
@@ -352,7 +354,7 @@ class SubscriptionEnrichment implements EnrichmentInterface
             return $default;
         }
 
-        $latest = $filtered->first()->date;
+        $latest   = $filtered->first()->date;
 
         /** @var TransactionJournal $journal */
         foreach ($filtered as $journal) {
@@ -398,12 +400,12 @@ class SubscriptionEnrichment implements EnrichmentInterface
 
         /** @var Bill $subscription */
         foreach ($this->collection as $subscription) {
-            $id                = (int)$subscription->id;
+            $id                  = (int)$subscription->id;
-            $lastPaidDate      = $this->getLastPaidDate($this->paidDates[$id] ?? []);
+            $lastPaidDate        = $this->getLastPaidDate($this->paidDates[$id] ?? []);
-            $payDates          = $this->calculator->getPayDates($this->start, $this->end, $subscription->date, $subscription->repeat_freq, $subscription->skip, $lastPaidDate);
+            $payDates            = $this->calculator->getPayDates($this->start, $this->end, $subscription->date, $subscription->repeat_freq, $subscription->skip, $lastPaidDate);
-            $payDatesFormatted = [];
+            $payDatesFormatted   = [];
             foreach ($payDates as $string) {
-                $date = Carbon::createFromFormat('!Y-m-d', $string, config('app.timezone'));
+                $date                = Carbon::createFromFormat('!Y-m-d', $string, config('app.timezone'));
                 if (!$date instanceof Carbon) {
                     $date = today(config('app.timezone'));
                 }

app/Support/Preferences.php

@@ -57,7 +57,7 @@ class Preferences
         ;
     }
 
-    public function get(string $name, null|array|bool|int|string $default = null): ?Preference
+    public function get(string $name, array|bool|int|string|null $default = null): ?Preference
     {
         /** @var null|User $user */
         $user = auth()->user();
@@ -71,7 +71,7 @@ class Preferences
         return $this->getForUser($user, $name, $default);
     }
 
-    public function getForUser(User $user, string $name, null|array|bool|int|string $default = null): ?Preference
+    public function getForUser(User $user, string $name, array|bool|int|string|null $default = null): ?Preference
     {
         // Log::debug(sprintf('getForUser(#%d, "%s")', $user->id, $name));
         // don't care about user group ID, except for some specific preferences.
@@ -135,7 +135,7 @@ class Preferences
         Cache::put($key, '', 5);
     }
 
-    public function setForUser(User $user, string $name, null|array|bool|int|string $value): Preference
+    public function setForUser(User $user, string $name, array|bool|int|string|null $value): Preference
     {
         $fullName         = sprintf('preference%s%s', $user->id, $name);
         $userGroupId      = $this->getUserGroupId($user, $name);
@@ -240,7 +240,7 @@ class Preferences
         return $result;
     }
 
-    public function getEncryptedForUser(User $user, string $name, null|array|bool|int|string $default = null): ?Preference
+    public function getEncryptedForUser(User $user, string $name, array|bool|int|string|null $default = null): ?Preference
     {
         $result = $this->getForUser($user, $name, $default);
         if ('' === $result->data) {
@@ -265,7 +265,7 @@ class Preferences
         return $result;
     }
 
-    public function getFresh(string $name, null|array|bool|int|string $default = null): ?Preference
+    public function getFresh(string $name, array|bool|int|string|null $default = null): ?Preference
     {
         /** @var null|User $user */
         $user = auth()->user();
@@ -313,7 +313,7 @@ class Preferences
         Session::forget('first');
     }
 
-    public function set(string $name, null|array|bool|int|string $value): Preference
+    public function set(string $name, array|bool|int|string|null $value): Preference
     {
         /** @var null|User $user */
         $user = auth()->user();

app/Support/Repositories/UserGroup/UserGroupInterface.php

@@ -37,7 +37,7 @@ interface UserGroupInterface
 
     public function getUserGroup(): ?UserGroup;
 
-    public function setUser(null|Authenticatable|User $user): void;
+    public function setUser(Authenticatable|User|null $user): void;
 
     public function setUserGroup(UserGroup $userGroup): void;
 

app/Support/Repositories/UserGroup/UserGroupTrait.php

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

app/Support/Request/ConvertsDataTypes.php

@@ -31,6 +31,7 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Support\Facades\Steam;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Log;
+
 use function Safe\preg_replace;
 
 /**
@@ -105,14 +106,15 @@ trait ConvertsDataTypes
         $parts          = explode(',', $parameter);
         $sortParameters = [];
         foreach ($parts as $part) {
-            $part      = trim($part);
+            $part             = trim($part);
-            $direction = 'asc';
+            $direction        = 'asc';
             if ('-' === $part[0]) {
                 $part      = substr($part, 1);
                 $direction = 'desc';
             }
             $sortParameters[] = [$part, $direction];
         }
+
         return $sortParameters;
     }
 
@@ -434,7 +436,7 @@ trait ConvertsDataTypes
             if (!is_array($entry)) {
                 continue;
             }
-            $amount = null;
+            $amount   = null;
             if (array_key_exists('current_amount', $entry)) {
                 $amount = $this->clearString((string)($entry['current_amount'] ?? '0'));
                 if (null === $entry['current_amount']) {

app/Support/Search/AccountSearch.php

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

app/Support/Twig/AmountFormat.php

@@ -116,9 +116,10 @@ class AmountFormat extends AbstractExtension
             'formatAmountBySymbol',
             static function (string $amount, ?string $symbol, ?int $decimalPlaces = null, ?bool $coloured = null): string {
 
-                if(null === $symbol) {
+                if (null === $symbol) {
-                    $message = sprintf('formatAmountBySymbol("%s", %s, %d, %s) was called without a symbol. Please browse to /flush to clear your cache.', $amount,var_export($symbol, true), $decimalPlaces, var_export($coloured, true));
+                    $message = sprintf('formatAmountBySymbol("%s", %s, %d, %s) was called without a symbol. Please browse to /flush to clear your cache.', $amount, var_export($symbol, true), $decimalPlaces, var_export($coloured, true));
                     Log::error($message);
+
                     throw new FireflyException($message);
                 }
 

app/Support/Twig/General.php

@@ -38,6 +38,7 @@ use Override;
 use Twig\Extension\AbstractExtension;
 use Twig\TwigFilter;
 use Twig\TwigFunction;
+
 use function Safe\parse_url;
 
 /**
@@ -70,14 +71,14 @@ class General extends AbstractExtension
                 }
 
                 /** @var Carbon $date */
-                $date = session('end', today(config('app.timezone'))->endOfMonth());
+                $date             = session('end', today(config('app.timezone'))->endOfMonth());
                 Log::debug(sprintf('twig balance: Call finalAccountBalance with date/time "%s"', $date->toIso8601String()));
                 $info             = Steam::finalAccountBalance($account, $date);
                 $currency         = Steam::getAccountCurrency($account);
                 $primary          = Amount::getPrimaryCurrency();
                 $convertToPrimary = Amount::convertToPrimary();
                 $usePrimary       = $convertToPrimary && $primary->id !== $currency->id;
-                $currency         ??= $primary;
+                $currency ??= $primary;
                 $strings          = [];
                 foreach ($info as $key => $balance) {
                     if ('balance' === $key) {
@@ -118,15 +119,15 @@ class General extends AbstractExtension
             static function (int $size): string {
                 // less than one GB, more than one MB
                 if ($size < (1024 * 1024 * 2014) && $size >= (1024 * 1024)) {
-                    return round($size / (1024 * 1024), 2) . ' MB';
+                    return round($size / (1024 * 1024), 2).' MB';
                 }
 
                 // less than one MB
                 if ($size < (1024 * 1024)) {
-                    return round($size / 1024, 2) . ' KB';
+                    return round($size / 1024, 2).' KB';
                 }
 
-                return $size . ' bytes';
+                return $size.' bytes';
             }
         );
     }
@@ -140,7 +141,7 @@ class General extends AbstractExtension
     {
         return new TwigFilter(
             'mimeIcon',
-            static fn(string $string): string => match ($string) {
+            static fn (string $string): string => match ($string) {
                 'application/pdf'                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           => 'fa-file-pdf-o',
                 'image/webp', 'image/png', 'image/jpeg', 'image/svg+xml', 'image/heic', 'image/heic-sequence', 'application/vnd.oasis.opendocument.image'                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   => 'fa-file-image-o',
                 'application/msword', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/vnd.openxmlformats-officedocument.wordprocessingml.template', 'application/x-iwork-pages-sffpages', 'application/vnd.sun.xml.writer', 'application/vnd.sun.xml.writer.template', 'application/vnd.sun.xml.writer.global', 'application/vnd.stardivision.writer', 'application/vnd.stardivision.writer-global', 'application/vnd.oasis.opendocument.text', 'application/vnd.oasis.opendocument.text-template', 'application/vnd.oasis.opendocument.text-web', 'application/vnd.oasis.opendocument.text-master' => 'fa-file-word-o',
@@ -213,7 +214,7 @@ class General extends AbstractExtension
     {
         return new TwigFunction(
             'phpdate',
-            static fn(string $str): string => date($str)
+            static fn (string $str): string => date($str)
         );
     }
 
@@ -269,7 +270,7 @@ class General extends AbstractExtension
             'activeRoutePartialObjectType',
             static function ($context): string {
                 [, $route, $objectType] = func_get_args();
-                $activeObjectType = $context['objectType'] ?? false;
+                $activeObjectType       = $context['objectType'] ?? false;
 
                 if ($objectType === $activeObjectType
                     && false !== stripos(
@@ -375,7 +376,7 @@ class General extends AbstractExtension
     {
         return new TwigFunction(
             'carbonize',
-            static fn(string $date): Carbon => new Carbon($date, config('app.timezone'))
+            static fn (string $date): Carbon => new Carbon($date, config('app.timezone'))
         );
     }
 }

composer.lock

@@ -129,25 +129,25 @@
         },
         {
             "name": "brick/math",
-            "version": "0.13.1",
+            "version": "0.14.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/brick/math.git",
-                "reference": "fc7ed316430118cc7836bf45faff18d5dfc8de04"
+                "reference": "113a8ee2656b882d4c3164fa31aa6e12cbb7aaa2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/brick/math/zipball/fc7ed316430118cc7836bf45faff18d5dfc8de04",
+                "url": "https://api.github.com/repos/brick/math/zipball/113a8ee2656b882d4c3164fa31aa6e12cbb7aaa2",
-                "reference": "fc7ed316430118cc7836bf45faff18d5dfc8de04",
+                "reference": "113a8ee2656b882d4c3164fa31aa6e12cbb7aaa2",
                 "shasum": ""
             },
             "require": {
-                "php": "^8.1"
+                "php": "^8.2"
             },
             "require-dev": {
                 "php-coveralls/php-coveralls": "^2.2",
-                "phpunit/phpunit": "^10.1",
+                "phpstan/phpstan": "2.1.22",
-                "vimeo/psalm": "6.8.8"
+                "phpunit/phpunit": "^11.5"
             },
             "type": "library",
             "autoload": {
@@ -177,7 +177,7 @@
             ],
             "support": {
                 "issues": "https://github.com/brick/math/issues",
-                "source": "https://github.com/brick/math/tree/0.13.1"
+                "source": "https://github.com/brick/math/tree/0.14.0"
             },
             "funding": [
                 {
@@ -185,7 +185,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-03-29T13:50:30+00:00"
+            "time": "2025-08-29T12:40:03+00:00"
         },
         {
             "name": "carbonphp/carbon-doctrine-types",
@@ -3714,16 +3714,16 @@
         },
         {
             "name": "nesbot/carbon",
-            "version": "3.10.2",
+            "version": "3.10.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/CarbonPHP/carbon.git",
-                "reference": "76b5c07b8a9d2025ed1610e14cef1f3fd6ad2c24"
+                "reference": "8e3643dcd149ae0fe1d2ff4f2c8e4bbfad7c165f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/76b5c07b8a9d2025ed1610e14cef1f3fd6ad2c24",
+                "url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/8e3643dcd149ae0fe1d2ff4f2c8e4bbfad7c165f",
-                "reference": "76b5c07b8a9d2025ed1610e14cef1f3fd6ad2c24",
+                "reference": "8e3643dcd149ae0fe1d2ff4f2c8e4bbfad7c165f",
                 "shasum": ""
             },
             "require": {
@@ -3741,13 +3741,13 @@
             "require-dev": {
                 "doctrine/dbal": "^3.6.3 || ^4.0",
                 "doctrine/orm": "^2.15.2 || ^3.0",
-                "friendsofphp/php-cs-fixer": "^3.75.0",
+                "friendsofphp/php-cs-fixer": "^v3.87.1",
                 "kylekatarnls/multi-tester": "^2.5.3",
                 "phpmd/phpmd": "^2.15.0",
                 "phpstan/extension-installer": "^1.4.3",
-                "phpstan/phpstan": "^2.1.17",
+                "phpstan/phpstan": "^2.1.22",
-                "phpunit/phpunit": "^10.5.46",
+                "phpunit/phpunit": "^10.5.53",
-                "squizlabs/php_codesniffer": "^3.13.0"
+                "squizlabs/php_codesniffer": "^3.13.4"
             },
             "bin": [
                 "bin/carbon"
@@ -3815,7 +3815,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-08-02T09:36:06+00:00"
+            "time": "2025-09-06T13:39:36+00:00"
         },
         {
             "name": "nette/schema",
@@ -5751,20 +5751,20 @@
         },
         {
             "name": "ramsey/uuid",
-            "version": "4.9.0",
+            "version": "4.9.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/ramsey/uuid.git",
-                "reference": "4e0e23cc785f0724a0e838279a9eb03f28b092a0"
+                "reference": "81f941f6f729b1e3ceea61d9d014f8b6c6800440"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ramsey/uuid/zipball/4e0e23cc785f0724a0e838279a9eb03f28b092a0",
+                "url": "https://api.github.com/repos/ramsey/uuid/zipball/81f941f6f729b1e3ceea61d9d014f8b6c6800440",
-                "reference": "4e0e23cc785f0724a0e838279a9eb03f28b092a0",
+                "reference": "81f941f6f729b1e3ceea61d9d014f8b6c6800440",
                 "shasum": ""
             },
             "require": {
-                "brick/math": "^0.8.8 || ^0.9 || ^0.10 || ^0.11 || ^0.12 || ^0.13",
+                "brick/math": "^0.8.8 || ^0.9 || ^0.10 || ^0.11 || ^0.12 || ^0.13 || ^0.14",
                 "php": "^8.0",
                 "ramsey/collection": "^1.2 || ^2.0"
             },
@@ -5823,9 +5823,9 @@
             ],
             "support": {
                 "issues": "https://github.com/ramsey/uuid/issues",
-                "source": "https://github.com/ramsey/uuid/tree/4.9.0"
+                "source": "https://github.com/ramsey/uuid/tree/4.9.1"
             },
-            "time": "2025-06-25T14:20:11+00:00"
+            "time": "2025-09-04T20:59:21+00:00"
         },
         {
             "name": "rcrowe/twigbridge",
@@ -11924,16 +11924,16 @@
         },
         {
             "name": "rector/rector",
-            "version": "2.1.5",
+            "version": "2.1.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/rectorphp/rector.git",
-                "reference": "1cd6abfb5976fd4ed728d5b73ebd67c7c810cd88"
+                "reference": "729aabc0ec66e700ef164e26454a1357f222a2f3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/rectorphp/rector/zipball/1cd6abfb5976fd4ed728d5b73ebd67c7c810cd88",
+                "url": "https://api.github.com/repos/rectorphp/rector/zipball/729aabc0ec66e700ef164e26454a1357f222a2f3",
-                "reference": "1cd6abfb5976fd4ed728d5b73ebd67c7c810cd88",
+                "reference": "729aabc0ec66e700ef164e26454a1357f222a2f3",
                 "shasum": ""
             },
             "require": {
@@ -11972,7 +11972,7 @@
             ],
             "support": {
                 "issues": "https://github.com/rectorphp/rector/issues",
-                "source": "https://github.com/rectorphp/rector/tree/2.1.5"
+                "source": "https://github.com/rectorphp/rector/tree/2.1.6"
             },
             "funding": [
                 {
@@ -11980,7 +11980,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-09-04T14:19:07+00:00"
+            "time": "2025-09-05T15:43:08+00:00"
         },
         {
             "name": "sebastian/cli-parser",

config/firefly.php

@@ -78,8 +78,8 @@ return [
         'running_balance_column' => env('USE_RUNNING_BALANCE', false),
         // see cer.php for exchange rates feature flag.
     ],
-    'version'                      => 'develop/2025-09-02',
+    'version'                      => 'develop/2025-09-07',
-    'build_time'                   => 1756787029,
+    'build_time'                   => 1757224461,
     'api_version'                  => '2.1.0', // field is no longer used.
     'db_version'                   => 26,
 
@@ -407,7 +407,7 @@ return [
     ],
 
 
-    'rule-actions'         => [
+    'rule-actions'                 => [
         'set_category'            => SetCategory::class,
         'clear_category'          => ClearCategory::class,
         'set_budget'              => SetBudget::class,
@@ -441,7 +441,7 @@ return [
         // 'set_foreign_amount' => SetForeignAmount::class,
         // 'set_foreign_currency' => SetForeignCurrency::class,
     ],
-    'context-rule-actions' => [
+    'context-rule-actions'         => [
         'set_category',
         'set_budget',
         'add_tag',
@@ -460,13 +460,13 @@ return [
         'convert_transfer',
     ],
 
-    'test-triggers'             => [
+    'test-triggers'                => [
         'limit' => 10,
         'range' => 200,
     ],
 
     // expected source types for each transaction type, in order of preference.
-    'expected_source_types'     => [
+    'expected_source_types'        => [
         'source'      => [
             TransactionTypeEnum::WITHDRAWAL->value       => [AccountTypeEnum::ASSET->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::DEBT->value, AccountTypeEnum::MORTGAGE->value],
             TransactionTypeEnum::DEPOSIT->value          => [AccountTypeEnum::LOAN->value, AccountTypeEnum::DEBT->value, AccountTypeEnum::MORTGAGE->value, AccountTypeEnum::REVENUE->value, AccountTypeEnum::CASH->value],
@@ -511,7 +511,7 @@ return [
             TransactionTypeEnum::LIABILITY_CREDIT->value => [AccountTypeEnum::LIABILITY_CREDIT->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::DEBT->value, AccountTypeEnum::MORTGAGE->value],
         ],
     ],
-    'allowed_opposing_types'    => [
+    'allowed_opposing_types'       => [
         'source'      => [
             AccountTypeEnum::ASSET->value            => [
                 AccountTypeEnum::ASSET->value,
@@ -601,7 +601,7 @@ return [
         ],
     ],
     // depending on the account type, return the allowed transaction types:
-    'allowed_transaction_types' => [
+    'allowed_transaction_types'    => [
         'source'      => [
             AccountTypeEnum::ASSET->value            => [
                 TransactionTypeEnum::WITHDRAWAL->value,
@@ -670,7 +670,7 @@ return [
     ],
 
     // having the source + dest will tell you the transaction type.
-    'account_to_transaction'    => [
+    'account_to_transaction'       => [
         AccountTypeEnum::ASSET->value            => [
             AccountTypeEnum::ASSET->value           => TransactionTypeEnum::TRANSFER->value,
             AccountTypeEnum::CASH->value            => TransactionTypeEnum::WITHDRAWAL->value,
@@ -735,7 +735,7 @@ return [
     ],
 
     // allowed source -> destination accounts.
-    'source_dests'              => [
+    'source_dests'                 => [
         TransactionTypeEnum::WITHDRAWAL->value       => [
             AccountTypeEnum::ASSET->value    => [AccountTypeEnum::EXPENSE->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::DEBT->value, AccountTypeEnum::MORTGAGE->value, AccountTypeEnum::CASH->value],
             AccountTypeEnum::LOAN->value     => [AccountTypeEnum::EXPENSE->value, AccountTypeEnum::CASH->value],
@@ -774,7 +774,7 @@ return [
         ],
     ],
     // if you add fields to this array, don't forget to update the export routine (ExportDataGenerator).
-    'journal_meta_fields'       => [
+    'journal_meta_fields'          => [
         // sepa
         'sepa_cc',
         'sepa_ct_op',
@@ -808,47 +808,47 @@ return [
         'recurrence_count',
         'recurrence_date',
     ],
-    'webhooks'                  => [
+    'webhooks'                     => [
         'max_attempts' => env('WEBHOOK_MAX_ATTEMPTS', 3),
     ],
-    'can_have_virtual_amounts'  => [AccountTypeEnum::ASSET->value],
+    'can_have_virtual_amounts'     => [AccountTypeEnum::ASSET->value],
-    'can_have_opening_balance'  => [AccountTypeEnum::ASSET->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::DEBT->value, AccountTypeEnum::MORTGAGE->value],
+    'can_have_opening_balance'     => [AccountTypeEnum::ASSET->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::DEBT->value, AccountTypeEnum::MORTGAGE->value],
-    'dynamic_creation_allowed'  => [
+    'dynamic_creation_allowed'     => [
         AccountTypeEnum::EXPENSE->value,
         AccountTypeEnum::REVENUE->value,
         AccountTypeEnum::INITIAL_BALANCE->value,
         AccountTypeEnum::RECONCILIATION->value,
         AccountTypeEnum::LIABILITY_CREDIT->value,
     ],
-    'valid_asset_fields'        => ['account_role', 'account_number', 'currency_id', 'BIC', 'include_net_worth'],
+    'valid_asset_fields'           => ['account_role', 'account_number', 'currency_id', 'BIC', 'include_net_worth'],
-    'valid_cc_fields'           => ['account_role', 'cc_monthly_payment_date', 'cc_type', 'account_number', 'currency_id', 'BIC', 'include_net_worth'],
+    'valid_cc_fields'              => ['account_role', 'cc_monthly_payment_date', 'cc_type', 'account_number', 'currency_id', 'BIC', 'include_net_worth'],
-    'valid_account_fields'      => ['account_number', 'currency_id', 'BIC', 'interest', 'interest_period', 'include_net_worth', 'liability_direction'],
+    'valid_account_fields'         => ['account_number', 'currency_id', 'BIC', 'interest', 'interest_period', 'include_net_worth', 'liability_direction'],
 
     // dynamic date ranges are as follows:
-    'dynamic_date_ranges'       => ['last7', 'last30', 'last90', 'last365', 'MTD', 'QTD', 'YTD'],
+    'dynamic_date_ranges'          => ['last7', 'last30', 'last90', 'last365', 'MTD', 'QTD', 'YTD'],
 
-    'allowed_sort_parameters'    => [
+    'allowed_sort_parameters'      => [
         'Account' => ['id', 'order', 'name', 'iban', 'active', 'account_type_id',
-                      'current_balance',
+            'current_balance',
-                      'pc_current_balance',
+            'pc_current_balance',
-                      'opening_balance',
+            'opening_balance',
-                      'pc_opening_balance',
+            'pc_opening_balance',
-                      'virtual_balance',
+            'virtual_balance',
-                      'pc_virtual_balance',
+            'pc_virtual_balance',
-                      'debt_amount',
+            'debt_amount',
-                      'pc_debt_amount',
+            'pc_debt_amount',
-                      'balance_difference',
+            'balance_difference',
-                      'pc_balance_difference',
+            'pc_balance_difference',
         ],
     ],
-    'allowed_db_sort_parameters' => [
+    'allowed_db_sort_parameters'   => [
         'Account' => ['id', 'order', 'name', 'iban', 'active', 'account_type_id'],
     ],
 
 
     // preselected account lists possibilities:
-    'preselected_accounts'       => ['all', 'assets', 'liabilities'],
+    'preselected_accounts'         => ['all', 'assets', 'liabilities'],
 
     // allowed to store a piggy bank in:
-    'piggy_bank_account_types'   => [AccountTypeEnum::ASSET->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::DEBT->value, AccountTypeEnum::MORTGAGE->value],
+    'piggy_bank_account_types'     => [AccountTypeEnum::ASSET->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::DEBT->value, AccountTypeEnum::MORTGAGE->value],
 ];

package-lock.json

@@ -13,20 +13,6 @@
                 "postcss": "^8.4.47"
             }
         },
-        "node_modules/@ampproject/remapping": {
-            "version": "2.3.0",
-            "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
-            "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==",
-            "dev": true,
-            "license": "Apache-2.0",
-            "dependencies": {
-                "@jridgewell/gen-mapping": "^0.3.5",
-                "@jridgewell/trace-mapping": "^0.3.24"
-            },
-            "engines": {
-                "node": ">=6.0.0"
-            }
-        },
         "node_modules/@babel/code-frame": {
             "version": "7.27.1",
             "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.27.1.tgz",
@@ -43,9 +29,9 @@
             }
         },
         "node_modules/@babel/compat-data": {
-            "version": "7.28.0",
+            "version": "7.28.4",
-            "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.28.0.tgz",
+            "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.28.4.tgz",
-            "integrity": "sha512-60X7qkglvrap8mn1lh2ebxXdZYtUcpd7gsmy9kLaBJ4i/WdY8PqTSdxyA8qraikqKQK5C1KRBKXqznrVapyNaw==",
+            "integrity": "sha512-YsmSKC29MJwf0gF8Rjjrg5LQCmyh+j/nD8/eP7f+BeoQTKYqs9RoWbjGOdy0+1Ekr68RJZMUOPVQaQisnIo4Rw==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -53,22 +39,22 @@
             }
         },
         "node_modules/@babel/core": {
-            "version": "7.28.3",
+            "version": "7.28.4",
-            "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.28.3.tgz",
+            "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.28.4.tgz",
-            "integrity": "sha512-yDBHV9kQNcr2/sUr9jghVyz9C3Y5G2zUM2H2lo+9mKv4sFgbA8s8Z9t8D1jiTkGoO/NoIfKMyKWr4s6CN23ZwQ==",
+            "integrity": "sha512-2BCOP7TN8M+gVDj7/ht3hsaO/B/n5oDbiAyyvnRlNOs+u1o+JWNYTQrmpuNp1/Wq2gcFrI01JAW+paEKDMx/CA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@ampproject/remapping": "^2.2.0",
                 "@babel/code-frame": "^7.27.1",
                 "@babel/generator": "^7.28.3",
                 "@babel/helper-compilation-targets": "^7.27.2",
                 "@babel/helper-module-transforms": "^7.28.3",
-                "@babel/helpers": "^7.28.3",
+                "@babel/helpers": "^7.28.4",
-                "@babel/parser": "^7.28.3",
+                "@babel/parser": "^7.28.4",
                 "@babel/template": "^7.27.2",
-                "@babel/traverse": "^7.28.3",
+                "@babel/traverse": "^7.28.4",
-                "@babel/types": "^7.28.2",
+                "@babel/types": "^7.28.4",
+                "@jridgewell/remapping": "^2.3.5",
                 "convert-source-map": "^2.0.0",
                 "debug": "^4.1.0",
                 "gensync": "^1.0.0-beta.2",
@@ -402,27 +388,27 @@
             }
         },
         "node_modules/@babel/helpers": {
-            "version": "7.28.3",
+            "version": "7.28.4",
-            "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.28.3.tgz",
+            "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.28.4.tgz",
-            "integrity": "sha512-PTNtvUQihsAsDHMOP5pfobP8C6CM4JWXmP8DrEIt46c3r2bf87Ua1zoqevsMo9g+tWDwgWrFP5EIxuBx5RudAw==",
+            "integrity": "sha512-HFN59MmQXGHVyYadKLVumYsA9dBFun/ldYxipEjzA4196jpLZd8UjEEBLkbEkvfYreDqJhZxYAWFPtrfhNpj4w==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "@babel/template": "^7.27.2",
-                "@babel/types": "^7.28.2"
+                "@babel/types": "^7.28.4"
             },
             "engines": {
                 "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/parser": {
-            "version": "7.28.3",
+            "version": "7.28.4",
-            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.3.tgz",
+            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.4.tgz",
-            "integrity": "sha512-7+Ey1mAgYqFAx2h0RuoxcQT5+MlG3GTV0TQrgr7/ZliKsm/MNDxVVutlWaziMq7wJNAz8MTqz55XLpWvva6StA==",
+            "integrity": "sha512-yZbBqeM6TkpP9du/I2pUZnJsRMGGvOuIrhjzC1AwHwW+6he4mni6Bp/m8ijn0iOuZuPI2BfkCoSRunpyjnrQKg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@babel/types": "^7.28.2"
+                "@babel/types": "^7.28.4"
             },
             "bin": {
                 "parser": "bin/babel-parser.js"
@@ -693,9 +679,9 @@
             }
         },
         "node_modules/@babel/plugin-transform-block-scoping": {
-            "version": "7.28.0",
+            "version": "7.28.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.28.0.tgz",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.28.4.tgz",
-            "integrity": "sha512-gKKnwjpdx5sER/wl0WN0efUBFzF/56YZO0RJrSYP4CljXnP31ByY7fol89AzomdlLNzI36AvOTmYHsnZTCkq8Q==",
+            "integrity": "sha512-1yxmvN0MJHOhPVmAsmoW5liWwoILobu/d/ShymZmj867bAdxGbehIrew1DuLpw2Ukv+qDSSPQdYW1dLNE7t11A==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -743,9 +729,9 @@
             }
         },
         "node_modules/@babel/plugin-transform-classes": {
-            "version": "7.28.3",
+            "version": "7.28.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.28.3.tgz",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.28.4.tgz",
-            "integrity": "sha512-DoEWC5SuxuARF2KdKmGUq3ghfPMO6ZzR12Dnp5gubwbeWJo4dbNWXJPVlwvh4Zlq6Z7YVvL8VFxeSOJgjsx4Sg==",
+            "integrity": "sha512-cFOlhIYPBv/iBoc+KS3M6et2XPtbT2HiCRfBXWtfpc9OAyostldxIf9YAYB6ypURBBbx+Qv6nyrLzASfJe+hBA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -754,7 +740,7 @@
                 "@babel/helper-globals": "^7.28.0",
                 "@babel/helper-plugin-utils": "^7.27.1",
                 "@babel/helper-replace-supers": "^7.27.1",
-                "@babel/traverse": "^7.28.3"
+                "@babel/traverse": "^7.28.4"
             },
             "engines": {
                 "node": ">=6.9.0"
@@ -1147,9 +1133,9 @@
             }
         },
         "node_modules/@babel/plugin-transform-object-rest-spread": {
-            "version": "7.28.0",
+            "version": "7.28.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.28.0.tgz",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.28.4.tgz",
-            "integrity": "sha512-9VNGikXxzu5eCiQjdE4IZn8sb9q7Xsk5EXLDBKUYg1e/Tve8/05+KJEtcxGxAgCY5t/BpKQM+JEL/yT4tvgiUA==",
+            "integrity": "sha512-373KA2HQzKhQCYiRVIRr+3MjpCObqzDlyrM6u4I201wL8Mp2wHf7uB8GhDwis03k2ti8Zr65Zyyqs1xOxUF/Ew==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -1157,7 +1143,7 @@
                 "@babel/helper-plugin-utils": "^7.27.1",
                 "@babel/plugin-transform-destructuring": "^7.28.0",
                 "@babel/plugin-transform-parameters": "^7.27.7",
-                "@babel/traverse": "^7.28.0"
+                "@babel/traverse": "^7.28.4"
             },
             "engines": {
                 "node": ">=6.9.0"
@@ -1284,9 +1270,9 @@
             }
         },
         "node_modules/@babel/plugin-transform-regenerator": {
-            "version": "7.28.3",
+            "version": "7.28.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.28.3.tgz",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.28.4.tgz",
-            "integrity": "sha512-K3/M/a4+ESb5LEldjQb+XSrpY0nF+ZBFlTCbSnKaYAMfD8v33O6PMs4uYnOk19HlcsI8WMu3McdFPTiQHF/1/A==",
+            "integrity": "sha512-+ZEdQlBoRg9m2NnzvEeLgtvBMO4tkFBw5SQIUgLICgTrumLoU7lr+Oghi6km2PFj+dbUt2u1oby2w3BDO9YQnA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -1622,9 +1608,9 @@
             }
         },
         "node_modules/@babel/runtime": {
-            "version": "7.28.3",
+            "version": "7.28.4",
-            "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.28.3.tgz",
+            "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.28.4.tgz",
-            "integrity": "sha512-9uIQ10o0WGdpP6GDhXcdOJPJuDgFtIDtN/9+ArJQ2NAfAmiuhTQdzkaTGR33v43GYS2UrSA0eX2pPPHoFVvpxA==",
+            "integrity": "sha512-Q/N6JNWvIvPnLDvjlE1OUBLPQHH6l3CltCEsHIujp45zQUSSh8K+gHnaEX45yAT1nyngnINhvWtzN+Nb9D8RAQ==",
             "license": "MIT",
             "engines": {
                 "node": ">=6.9.0"
@@ -1646,18 +1632,18 @@
             }
         },
         "node_modules/@babel/traverse": {
-            "version": "7.28.3",
+            "version": "7.28.4",
-            "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.28.3.tgz",
+            "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.28.4.tgz",
-            "integrity": "sha512-7w4kZYHneL3A6NP2nxzHvT3HCZ7puDZZjFMqDpBPECub79sTtSO5CGXDkKrTQq8ksAwfD/XI2MRFX23njdDaIQ==",
+            "integrity": "sha512-YEzuboP2qvQavAcjgQNVgsvHIDv6ZpwXvcvjmyySP2DIMuByS/6ioU5G9pYrWHM6T2YDfc7xga9iNzYOs12CFQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "@babel/code-frame": "^7.27.1",
                 "@babel/generator": "^7.28.3",
                 "@babel/helper-globals": "^7.28.0",
-                "@babel/parser": "^7.28.3",
+                "@babel/parser": "^7.28.4",
                 "@babel/template": "^7.27.2",
-                "@babel/types": "^7.28.2",
+                "@babel/types": "^7.28.4",
                 "debug": "^4.3.1"
             },
             "engines": {
@@ -1665,9 +1651,9 @@
             }
         },
         "node_modules/@babel/types": {
-            "version": "7.28.2",
+            "version": "7.28.4",
-            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.2.tgz",
+            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.4.tgz",
-            "integrity": "sha512-ruv7Ae4J5dUYULmeXw1gmb7rYRz57OWCPM57pHojnLq/3Z1CK2lNSLTCVjxVk1F/TZHwOZZrOWi0ur95BbLxNQ==",
+            "integrity": "sha512-bkFqkLhh3pMBUQQkpVgWDWq/lqzc2678eUyDlTBhRqhCHFguYYGM0Efga7tYk4TogG/3x0EEl66/OQ+WGbWB/Q==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -2149,9 +2135,9 @@
             }
         },
         "node_modules/@fortawesome/fontawesome-free": {
-            "version": "7.0.0",
+            "version": "7.0.1",
-            "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-7.0.0.tgz",
+            "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-7.0.1.tgz",
-            "integrity": "sha512-X48nISrSOa89zu2VMljC4XaRf8NmgTwQBVHfS2Nu5G00ZwM31oOVrAtGxZF3b6wDYf9lJsf/Eq4cCSFKIkOWPQ==",
+            "integrity": "sha512-RLmb9U6H2rJDnGxEqXxzy7ANPrQz7WK2/eTjdZqyU9uRU5W+FkAec9uU5gTYzFBH7aoXIw2WTJSCJR4KPlReQw==",
             "license": "(CC-BY-4.0 AND OFL-1.1 AND MIT)",
             "engines": {
                 "node": ">=6"
@@ -2181,6 +2167,17 @@
                 "@jridgewell/trace-mapping": "^0.3.24"
             }
         },
+        "node_modules/@jridgewell/remapping": {
+            "version": "2.3.5",
+            "resolved": "https://registry.npmjs.org/@jridgewell/remapping/-/remapping-2.3.5.tgz",
+            "integrity": "sha512-LI9u/+laYG4Ds1TDKSJW2YPrIlcVYOwi2fUC6xB43lueCjgxV4lffOCZCtYFiH6TNOX+tQKXx97T4IKHbhyHEQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@jridgewell/gen-mapping": "^0.3.5",
+                "@jridgewell/trace-mapping": "^0.3.24"
+            }
+        },
         "node_modules/@jridgewell/resolve-uri": {
             "version": "3.1.2",
             "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
@@ -3162,9 +3159,9 @@
             "license": "MIT"
         },
         "node_modules/@types/node": {
-            "version": "24.3.0",
+            "version": "24.3.1",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-24.3.0.tgz",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-24.3.1.tgz",
-            "integrity": "sha512-aPTXCrfwnDLj4VvXrm+UUCQjNEvJgNA8s5F1cvwQU+3KNltTOkBm1j30uNLyqqPNe7gE3KFzImYoZEfLhp4Yow==",
+            "integrity": "sha512-3vXmQDXy+woz+gnrTvuvNrPzekOi+Ds0ReMxw0LzBiK3a+1k0kQn9f2NWk+lgD4rJehFUmYy2gMhJ2ZI+7YP9g==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -3270,57 +3267,57 @@
             }
         },
         "node_modules/@vue/compiler-core": {
-            "version": "3.5.20",
+            "version": "3.5.21",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.20.tgz",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.21.tgz",
-            "integrity": "sha512-8TWXUyiqFd3GmP4JTX9hbiTFRwYHgVL/vr3cqhr4YQ258+9FADwvj7golk2sWNGHR67QgmCZ8gz80nQcMokhwg==",
+            "integrity": "sha512-8i+LZ0vf6ZgII5Z9XmUvrCyEzocvWT+TeR2VBUVlzIH6Tyv57E20mPZ1bCS+tbejgUgmjrEh7q/0F0bibskAmw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "@babel/parser": "^7.28.3",
-                "@vue/shared": "3.5.20",
+                "@vue/shared": "3.5.21",
                 "entities": "^4.5.0",
                 "estree-walker": "^2.0.2",
                 "source-map-js": "^1.2.1"
             }
         },
         "node_modules/@vue/compiler-dom": {
-            "version": "3.5.20",
+            "version": "3.5.21",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.20.tgz",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.21.tgz",
-            "integrity": "sha512-whB44M59XKjqUEYOMPYU0ijUV0G+4fdrHVKDe32abNdX/kJe1NUEMqsi4cwzXa9kyM9w5S8WqFsrfo1ogtBZGQ==",
+            "integrity": "sha512-jNtbu/u97wiyEBJlJ9kmdw7tAr5Vy0Aj5CgQmo+6pxWNQhXZDPsRr1UWPN4v3Zf82s2H3kF51IbzZ4jMWAgPlQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@vue/compiler-core": "3.5.20",
+                "@vue/compiler-core": "3.5.21",
-                "@vue/shared": "3.5.20"
+                "@vue/shared": "3.5.21"
             }
         },
         "node_modules/@vue/compiler-sfc": {
-            "version": "3.5.20",
+            "version": "3.5.21",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.20.tgz",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.21.tgz",
-            "integrity": "sha512-SFcxapQc0/feWiSBfkGsa1v4DOrnMAQSYuvDMpEaxbpH5dKbnEM5KobSNSgU+1MbHCl+9ftm7oQWxvwDB6iBfw==",
+            "integrity": "sha512-SXlyk6I5eUGBd2v8Ie7tF6ADHE9kCR6mBEuPyH1nUZ0h6Xx6nZI29i12sJKQmzbDyr2tUHMhhTt51Z6blbkTTQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "@babel/parser": "^7.28.3",
-                "@vue/compiler-core": "3.5.20",
+                "@vue/compiler-core": "3.5.21",
-                "@vue/compiler-dom": "3.5.20",
+                "@vue/compiler-dom": "3.5.21",
-                "@vue/compiler-ssr": "3.5.20",
+                "@vue/compiler-ssr": "3.5.21",
-                "@vue/shared": "3.5.20",
+                "@vue/shared": "3.5.21",
                 "estree-walker": "^2.0.2",
-                "magic-string": "^0.30.17",
+                "magic-string": "^0.30.18",
                 "postcss": "^8.5.6",
                 "source-map-js": "^1.2.1"
             }
         },
         "node_modules/@vue/compiler-ssr": {
-            "version": "3.5.20",
+            "version": "3.5.21",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.20.tgz",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.21.tgz",
-            "integrity": "sha512-RSl5XAMc5YFUXpDQi+UQDdVjH9FnEpLDHIALg5J0ITHxkEzJ8uQLlo7CIbjPYqmZtt6w0TsIPbo1izYXwDG7JA==",
+            "integrity": "sha512-vKQ5olH5edFZdf5ZrlEgSO1j1DMA4u23TVK5XR1uMhvwnYvVdDF0nHXJUblL/GvzlShQbjhZZ2uvYmDlAbgo9w==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@vue/compiler-dom": "3.5.20",
+                "@vue/compiler-dom": "3.5.21",
-                "@vue/shared": "3.5.20"
+                "@vue/shared": "3.5.21"
             }
         },
         "node_modules/@vue/component-compiler-utils": {
@@ -3402,9 +3399,9 @@
             "license": "MIT"
         },
         "node_modules/@vue/shared": {
-            "version": "3.5.20",
+            "version": "3.5.21",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.20.tgz",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.21.tgz",
-            "integrity": "sha512-SoRGP596KU/ig6TfgkCMbXkr4YJ91n/QSdMuqeP5r3hVIYA3CPHUBCc7Skak0EAKV+5lL4KyIh61VA/pK1CIAA==",
+            "integrity": "sha512-+2k1EQpnYuVuu3N7atWyG3/xoFWIVJZq4Mz8XNOdScFI0etES75fbny/oU4lKWk/577P1zmg0ioYvpGEDZ3DLw==",
             "dev": true,
             "license": "MIT"
         },
@@ -3755,9 +3752,9 @@
             }
         },
         "node_modules/alpinejs": {
-            "version": "3.14.9",
+            "version": "3.15.0",
-            "resolved": "https://registry.npmjs.org/alpinejs/-/alpinejs-3.14.9.tgz",
+            "resolved": "https://registry.npmjs.org/alpinejs/-/alpinejs-3.15.0.tgz",
-            "integrity": "sha512-gqSOhTEyryU9FhviNqiHBHzgjkvtukq9tevew29fTj+ofZtfsYriw4zPirHHOAy9bw8QoL3WGhyk7QqCh5AYlw==",
+            "integrity": "sha512-lpokA5okCF1BKh10LG8YjqhfpxyHBk4gE7boIgVHltJzYoM7O9nK3M7VlntLEJGsVmu7U/RzUWajmHREGT38Eg==",
             "license": "MIT",
             "dependencies": {
                 "@vue/reactivity": "~3.1.1"
@@ -4500,9 +4497,9 @@
             }
         },
         "node_modules/caniuse-lite": {
-            "version": "1.0.30001739",
+            "version": "1.0.30001741",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001739.tgz",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001741.tgz",
-            "integrity": "sha512-y+j60d6ulelrNSwpPyrHdl+9mJnQzHBr08xm48Qno0nSk4h3Qojh+ziv2qE6rXf4k3tadF4o1J/1tAbVm1NtnA==",
+            "integrity": "sha512-QGUGitqsc8ARjLdgAfxETDhRbJ0REsP6O3I96TAth/mVjh2cYzN2u+3AzPP3aVSm2FehEItaJw1xd+IGBXWeSw==",
             "dev": true,
             "funding": [
                 {
@@ -5714,9 +5711,9 @@
             "license": "MIT"
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.5.211",
+            "version": "1.5.214",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.211.tgz",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.214.tgz",
-            "integrity": "sha512-IGBvimJkotaLzFnwIVgW9/UD/AOJ2tByUmeOrtqBfACSbAw5b1G0XpvdaieKyc7ULmbwXVx+4e4Be8pOPBrYkw==",
+            "integrity": "sha512-TpvUNdha+X3ybfU78NoQatKvQEm1oq3lf2QbnmCEdw+Bd9RuIAY+hJTvq1avzHM0f7EJfnH3vbCnbzKzisc/9Q==",
             "dev": true,
             "license": "ISC"
         },
@@ -7066,9 +7063,9 @@
             }
         },
         "node_modules/i18next": {
-            "version": "25.4.2",
+            "version": "25.5.2",
-            "resolved": "https://registry.npmjs.org/i18next/-/i18next-25.4.2.tgz",
+            "resolved": "https://registry.npmjs.org/i18next/-/i18next-25.5.2.tgz",
-            "integrity": "sha512-gD4T25a6ovNXsfXY1TwHXXXLnD/K2t99jyYMCSimSCBnBRJVQr5j+VAaU83RJCPzrTGhVQ6dqIga66xO2rtd5g==",
+            "integrity": "sha512-lW8Zeh37i/o0zVr+NoCHfNnfvVw+M6FQbRp36ZZ/NyHDJ3NJVpp2HhAUyU9WafL5AssymNoOjMRB48mmx2P6Hw==",
             "funding": [
                 {
                     "type": "individual",
@@ -8442,9 +8439,9 @@
             }
         },
         "node_modules/node-releases": {
-            "version": "2.0.19",
+            "version": "2.0.20",
-            "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz",
+            "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.20.tgz",
-            "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==",
+            "integrity": "sha512-7gK6zSXEH6neM212JgfYFXe+GmZQM+fia5SsusuBIUgnPheLFBmIPhtFoAQRj8/7wASYQnbDlHPVwY0BefoFgA==",
             "dev": true,
             "license": "MIT"
         },
@@ -10229,9 +10226,9 @@
             "license": "MIT"
         },
         "node_modules/sass": {
-            "version": "1.91.0",
+            "version": "1.92.1",
-            "resolved": "https://registry.npmjs.org/sass/-/sass-1.91.0.tgz",
+            "resolved": "https://registry.npmjs.org/sass/-/sass-1.92.1.tgz",
-            "integrity": "sha512-aFOZHGf+ur+bp1bCHZ+u8otKGh77ZtmFyXDo4tlYvT7PWql41Kwd8wdkPqhhT+h2879IVblcHFglIMofsFd1EA==",
+            "integrity": "sha512-ffmsdbwqb3XeyR8jJR6KelIXARM9bFQe8A6Q3W4Klmwy5Ckd5gz7jgUNHo4UOqutU5Sk1DtKLbpDP0nLCg1xqQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -11034,14 +11031,14 @@
             }
         },
         "node_modules/terser": {
-            "version": "5.43.1",
+            "version": "5.44.0",
-            "resolved": "https://registry.npmjs.org/terser/-/terser-5.43.1.tgz",
+            "resolved": "https://registry.npmjs.org/terser/-/terser-5.44.0.tgz",
-            "integrity": "sha512-+6erLbBm0+LROX2sPXlUYx/ux5PyE9K/a92Wrt6oA+WDAoFTdpHE5tCYCI5PNzq2y8df4rA+QgHLJuR4jNymsg==",
+            "integrity": "sha512-nIVck8DK+GM/0Frwd+nIhZ84pR/BX7rmXMfYwyg+Sri5oGVE99/E3KvXqpC2xHFxyqXyGHTKBSioxxplrO4I4w==",
             "dev": true,
             "license": "BSD-2-Clause",
             "dependencies": {
                 "@jridgewell/source-map": "^0.3.3",
-                "acorn": "^8.14.0",
+                "acorn": "^8.15.0",
                 "commander": "^2.20.0",
                 "source-map-support": "~0.5.20"
             },
@@ -11172,14 +11169,14 @@
             }
         },
         "node_modules/tinyglobby": {
-            "version": "0.2.14",
+            "version": "0.2.15",
-            "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.14.tgz",
+            "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.15.tgz",
-            "integrity": "sha512-tX5e7OM1HnYr2+a2C/4V0htOcSQcoSTH9KgJnVvNm5zm/cyEWKJ7j7YutsH9CxMdtOkkLFy2AHrMci9IM8IPZQ==",
+            "integrity": "sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "fdir": "^6.4.4",
+                "fdir": "^6.5.0",
-                "picomatch": "^4.0.2"
+                "picomatch": "^4.0.3"
             },
             "engines": {
                 "node": ">=12.0.0"