Merge pull request #10345 from firefly-iii/develop

🤖 Automatically merge the PR into the main branch.

.ci/rector.php

@@ -1,21 +1,69 @@
 <?php
 
+
+/*
+ * rector.php
+ * Copyright (c) 2025 james@firefly-iii.org.
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see https://www.gnu.org/licenses/.
+ */
+
 declare(strict_types=1);
 
 use Rector\Config\RectorConfig;
+use Rector\EarlyReturn\Rector\If_\ChangeOrIfContinueToMultiContinueRector;
 
 return RectorConfig::configure()
+    ->withSkip([
+                   ChangeOrIfContinueToMultiContinueRector::class,
+               ])
                    ->withPaths([
-                                   __DIR__ . '/../app',
-                                   __DIR__ . '/../bootstrap',
-                                   __DIR__ . '/../config',
-                                   __DIR__ . '/../public',
-                                   __DIR__ . '/../resources',
-                                   __DIR__ . '/../routes',
-                                   __DIR__ . '/../tests',
+//                                   __DIR__ . '/../app',
+__DIR__ . '/../app/Http',
+//                                   __DIR__ . '/../bootstrap',
+//                                   __DIR__ . '/../config',
+//                                   __DIR__ . '/../public',
+//                                   __DIR__ . '/../resources',
+//                                   __DIR__ . '/../routes',
+// __DIR__ . '/../tests',
                                ])
-    // uncomment to reach your current PHP version
+                                                   // uncomment to reach your current PHP version
                    ->withPhpSets()
+                   ->withPreparedSets(
+                       codingStyle        : false, // leave false
+                       privatization: false, // leave false.
+                       naming             : false, // leave false
+                       instanceOf         : true,
+                       earlyReturn        : true,
+                       strictBooleans     : true,
+                       carbon             : true,
+                       rectorPreset       : true,
+                       phpunitCodeQuality : true,
+                       doctrineCodeQuality: true,
+                       symfonyCodeQuality : true,
+                       symfonyConfigs     : true
+
+                   )
+                   ->withComposerBased(
+                       twig: true,
+                       doctrine: true,
+                       phpunit: true,
+                       symfony: true)
                    ->withTypeCoverageLevel(0)
                    ->withDeadCodeLevel(0)
-                   ->withCodeQualityLevel(0);
+                   ->withCodeQualityLevel(0)
+
+                   ->withImportNames(removeUnusedImports: true);// import statements instead of full classes.

.env.example

@@ -289,7 +289,7 @@ ALLOW_WEBHOOKS=false
 #
 # You can set this variable from a file by appending it with _FILE
 #
-STATIC_CRON_TOKEN=
+STATIC_CRON_TOKEN=PLEASE_REPLACE_WITH_32_CHAR_CODE
 
 # You can fine tune the start-up of a Docker container by editing these environment variables.
 # Use this at your own risk. Disabling certain checks and features may result in lots of inconsistent data.

.github/workflows/close-duplicates.yml

@@ -13,7 +13,7 @@ jobs:
   close_duplicates:
     runs-on: ubuntu-latest
     steps:
-      - uses: github/command@v2.0.0
+      - uses: github/command@v2.0.1
         id: command
         with:
           allowed_contexts: "issue"

app/Console/Commands/Correction/CorrectsUnevenAmount.php

@@ -163,7 +163,7 @@ class CorrectsUnevenAmount extends Command
                 Log::error($e->getTraceAsString());
             }
             if (0 !== $res) {
-                $this->fixJournal($entry->transaction_journal_id);
+                $this->fixJournal((int) $entry->transaction_journal_id);
             }
         }
     }

app/Console/Commands/Export/ExportsData.php

@@ -273,7 +273,7 @@ class ExportsData extends Command
      */
     private function exportData(array $options, array $data): void
     {
-        $date = \Safe\date('Y_m_d');
+        $date = date('Y_m_d');
         foreach ($data as $key => $content) {
             $file = sprintf('%s%s_%s.csv', $options['directory'], $date, $key);
             if (false === $options['force'] && file_exists($file)) {

app/Console/Commands/System/OutputsInstructions.php

@@ -111,8 +111,8 @@ class OutputsInstructions extends Command
      */
     private function showLogo(): void
     {
-        $today  = \Safe\date('m-d');
-        $month  = \Safe\date('m');
+        $today  = date('m-d');
+        $month  = date('m');
         // variation in colors and effects just because I can!
         // default is Ukraine flag:
         $colors = ['blue', 'blue', 'blue', 'yellow', 'yellow', 'yellow', 'default', 'default'];

app/Console/Commands/Upgrade/UpgradesDatabase.php

@@ -28,7 +28,7 @@ use Illuminate\Support\Facades\Log;
 use Safe\Exceptions\InfoException;
 
 try {
-    set_time_limit(0);
+    \Safe\set_time_limit(0);
 } catch (InfoException) {
     Log::warning('set_time_limit returned false. This could be an issue, unless you also run XDebug.');
 }

app/Console/Commands/Upgrade/UpgradesToGroups.php

@@ -366,8 +366,8 @@ class UpgradesToGroups extends Command
     {
         $groupId = DB::table('transaction_groups')->insertGetId(
             [
-                'created_at' => \Safe\date('Y-m-d H:i:s'),
-                'updated_at' => \Safe\date('Y-m-d H:i:s'),
+                'created_at' => date('Y-m-d H:i:s'),
+                'updated_at' => date('Y-m-d H:i:s'),
                 'title'      => null,
                 'user_id'    => $array['user_id'],
             ]

app/Exceptions/Handler.php

@@ -45,10 +45,7 @@ use Symfony\Component\HttpKernel\Exception\HttpException;
 use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
-use function Safe\date;
-use function Safe\json_encode;
-use function Safe\parse_url;
-
+// temp
 /**
  * Class Handler
  */
@@ -242,7 +239,7 @@ class Handler extends ExceptionHandler
             'json'         => request()->acceptsJson(),
             'method'       => request()->method(),
             'headers'      => $headers,
-            'post'         => 'POST' === request()->method() ? json_encode(request()->all()) : '',
+            'post'         => 'POST' === request()->method() ? \Safe\json_encode(request()->all()) : '',
         ];
 
         // create job that will mail.
@@ -289,8 +286,8 @@ class Handler extends ExceptionHandler
         }
         $safe         = route('index');
         $previous     = $exception->redirectTo;
-        $previousHost = parse_url($previous, PHP_URL_HOST);
-        $safeHost     = parse_url($safe, PHP_URL_HOST);
+        $previousHost = \Safe\parse_url($previous, PHP_URL_HOST);
+        $safeHost     = \Safe\parse_url($safe, PHP_URL_HOST);
 
         return null !== $previousHost && $previousHost === $safeHost ? $previous : $safe;
     }

app/Factory/TransactionJournalFactory.php

@@ -476,7 +476,7 @@ class TransactionJournalFactory
      */
     private function getCurrency(?TransactionCurrency $currency, Account $account): TransactionCurrency
     {
-        Log::debug(sprintf('Now in getCurrency(#%d, "%s")', $currency->id, $account->name));
+        Log::debug(sprintf('Now in getCurrency(#%d, "%s")', $currency?->id, $account->name));
 
         /** @var null|TransactionCurrency $preference */
         $preference = $this->accountRepository->getAccountCurrency($account);

app/Handlers/Events/VersionCheckEventHandler.php

@@ -73,7 +73,7 @@ class VersionCheckEventHandler
         $diff          = $now - $lastCheckTime->data;
         Log::debug(sprintf('Last check time is %d, current time is %d, difference is %d', $lastCheckTime->data, $now, $diff));
         if ($diff < 604800) {
-            Log::debug(sprintf('Checked for updates less than a week ago (on %s).', \Safe\date('Y-m-d H:i:s', $lastCheckTime->data)));
+            Log::debug(sprintf('Checked for updates less than a week ago (on %s).', date('Y-m-d H:i:s', $lastCheckTime->data)));
 
             return;
         }
@@ -105,7 +105,7 @@ class VersionCheckEventHandler
         $diff          = $now - $lastCheckTime->data;
         Log::debug(sprintf('Last warning time is %d, current time is %d, difference is %d', $lastCheckTime->data, $now, $diff));
         if ($diff < 604800 * 4) {
-            Log::debug(sprintf('Warned about updates less than four weeks ago (on %s).', \Safe\date('Y-m-d H:i:s', $lastCheckTime->data)));
+            Log::debug(sprintf('Warned about updates less than four weeks ago (on %s).', date('Y-m-d H:i:s', $lastCheckTime->data)));
 
             return;
         }

app/Http/Controllers/Account/EditController.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Account;
 
+use FireflyIII\Models\Location;
 use FireflyIII\Helpers\Attachments\AttachmentHelperInterface;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Http\Requests\AccountFormRequest;
@@ -87,11 +88,11 @@ class EditController extends Controller
         $roles                = $this->getRoles();
         $liabilityTypes       = $this->getLiabilityTypes();
         $location             = $repository->getLocation($account);
-        $latitude             = null !== $location ? $location->latitude : config('firefly.default_location.latitude');
-        $longitude            = null !== $location ? $location->longitude : config('firefly.default_location.longitude');
-        $zoomLevel            = null !== $location ? $location->zoom_level : config('firefly.default_location.zoom_level');
+        $latitude             = $location instanceof Location ? $location->latitude : config('firefly.default_location.latitude');
+        $longitude            = $location instanceof Location ? $location->longitude : config('firefly.default_location.longitude');
+        $zoomLevel            = $location instanceof Location ? $location->zoom_level : config('firefly.default_location.zoom_level');
         $canEditCurrency      = 0 === $account->piggyBanks()->count();
-        $hasLocation          = null !== $location;
+        $hasLocation          = $location instanceof Location;
         $locations            = [
             'location' => [
                 'latitude'     => old('location_latitude') ?? $latitude,

app/Http/Controllers/Account/ReconcileController.php

@@ -94,7 +94,7 @@ class ReconcileController extends Controller
 
         // get start and end
 
-        if (null === $start && null === $end) {
+        if (!$start instanceof Carbon && !$end instanceof Carbon) {
             /** @var Carbon $start */
             $start = clone session('start', app('navigation')->startOfPeriod(new Carbon(), $range));
 

app/Http/Controllers/Admin/UpdateController.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Admin;
 
+use Carbon\Carbon;
 use FireflyIII\Helpers\Update\UpdateTrait;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Http\Middleware\IsDemoUser;
@@ -96,7 +97,7 @@ class UpdateController extends Controller
         $channel         = in_array($channel, ['stable', 'beta', 'alpha'], true) ? $channel : 'stable';
 
         app('fireflyconfig')->set('permission_update_check', $checkForUpdates);
-        app('fireflyconfig')->set('last_update_check', time());
+        app('fireflyconfig')->set('last_update_check', Carbon::now()->getTimestamp());
         app('fireflyconfig')->set('update_channel', $channel);
         session()->flash('success', (string) trans('firefly.configuration_updated'));
 

app/Http/Controllers/Auth/ForgotPasswordController.php

@@ -34,6 +34,8 @@ use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Log;
 use Illuminate\View\View;
 
+use function Safe\parse_url;
+
 /**
  * Class ForgotPasswordController
  */
@@ -101,7 +103,7 @@ class ForgotPasswordController extends Controller
      */
     private function validateHost(): void
     {
-        $configuredHost = \Safe\parse_url((string) config('app.url'), PHP_URL_HOST);
+        $configuredHost = parse_url((string) config('app.url'), PHP_URL_HOST);
         if (false === $configuredHost || null === $configuredHost) {
             throw new FireflyException('Please set a valid and correct Firefly III URL in the APP_URL environment variable.');
         }

app/Http/Controllers/Auth/LoginController.php

@@ -23,7 +23,9 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Auth;
 
-use Cookie;
+use Carbon\Carbon;
+use FireflyIII\User;
+use Illuminate\Support\Facades\Cookie;
 use FireflyIII\Events\ActuallyLoggedIn;
 use FireflyIII\Events\Security\UnknownUserAttemptedLogin;
 use FireflyIII\Events\Security\UserAttemptedLogin;
@@ -44,6 +46,7 @@ use Illuminate\Routing\Redirector;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Validation\ValidationException;
+use Symfony\Component\HttpFoundation\Response as ResponseAlias;
 
 /**
  * Class LoginController
@@ -130,11 +133,11 @@ class LoginController extends Controller
         app('log')->warning('Login attempt failed.');
         $username = (string) $request->get($this->username());
         $user     = $this->repository->findByEmail($username);
-        if (null === $user) {
+        if (!$user instanceof User) {
             // send event to owner.
             event(new UnknownUserAttemptedLogin($username));
         }
-        if (null !== $user) {
+        if ($user instanceof User) {
             event(new UserAttemptedLogin($user));
         }
 
@@ -198,7 +201,7 @@ class LoginController extends Controller
 
         // also logout current 2FA tokens.
         $cookieName = config('google2fa.cookie_name', 'google2fa_token');
-        \Cookie::forget($cookieName);
+        Cookie::forget($cookieName);
 
         $this->guard()->logout();
 
@@ -209,7 +212,7 @@ class LoginController extends Controller
         $this->loggedOut($request);
 
         return $request->wantsJson()
-            ? new Response('', 204)
+            ? new Response('', ResponseAlias::HTTP_NO_CONTENT)
             : redirect('/');
     }
 
@@ -220,7 +223,7 @@ class LoginController extends Controller
      *
      * @throws FireflyException
      */
-    public function showLoginForm(Request $request)
+    public function showLoginForm(?Request $request = null)
     {
         Log::channel('audit')->info('Show login form (1.1).');
 
@@ -246,13 +249,13 @@ class LoginController extends Controller
             $allowReset        = false;
         }
 
-        $email             = $request->old('email');
-        $remember          = $request->old('remember');
+        $email             = $request?->old('email');
+        $remember          = $request?->old('remember');
 
         $storeInCookie     = config('google2fa.store_in_cookie', false);
         if (false !== $storeInCookie) {
             $cookieName = config('google2fa.cookie_name', 'google2fa_token');
-            \Cookie::queue(\Cookie::make($cookieName, 'invalid-'.time()));
+            Cookie::queue(Cookie::make($cookieName, 'invalid-'.Carbon::now()->getTimestamp()));
         }
         $usernameField     = $this->username();
 

app/Http/Controllers/Auth/RegisterController.php

@@ -130,7 +130,7 @@ class RegisterController extends Controller
             $allowRegistration = false;
         }
         if ('web' !== $guard) {
-            $allowRegistration = false;
+            return false;
         }
 
         return $allowRegistration;
@@ -175,7 +175,7 @@ class RegisterController extends Controller
      *
      * @throws FireflyException
      */
-    public function showRegistrationForm(Request $request)
+    public function showRegistrationForm(?Request $request = null)
     {
         $isDemoSite        = app('fireflyconfig')->get('is_demo_site', config('firefly.configuration.is_demo_site'))->data;
         $pageTitle         = (string) trans('firefly.register_page_title');
@@ -187,7 +187,7 @@ class RegisterController extends Controller
             return view('error', compact('message'));
         }
 
-        $email             = $request->old('email');
+        $email             = $request?->old('email');
 
         return view('auth.register', compact('isDemoSite', 'email', 'pageTitle'));
     }

app/Http/Controllers/Auth/TwoFactorController.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Auth;
 
+use Carbon\Carbon;
 use FireflyIII\Events\Security\MFABackupFewLeft;
 use FireflyIII\Events\Security\MFABackupNoLeft;
 use FireflyIII\Events\Security\MFAManyFailedAttempts;
@@ -129,7 +130,7 @@ class TwoFactorController extends Controller
      */
     private function inMFAHistory(string $mfaCode, array $mfaHistory): bool
     {
-        $now = time();
+        $now = Carbon::now()->getTimestamp();
         foreach ($mfaHistory as $entry) {
             $time = $entry['time'];
             $code = $entry['code'];
@@ -149,7 +150,7 @@ class TwoFactorController extends Controller
         /** @var array $mfaHistory */
         $mfaHistory = app('preferences')->get('mfa_history', [])->data;
         $newHistory = [];
-        $now        = time();
+        $now        = Carbon::now()->getTimestamp();
         foreach ($mfaHistory as $entry) {
             $time = $entry['time'];
             $code = $entry['code'];
@@ -184,7 +185,7 @@ class TwoFactorController extends Controller
         /** @var array $mfaHistory */
         $mfaHistory   = app('preferences')->get('mfa_history', [])->data;
         $entry        = [
-            'time' => time(),
+            'time' => Carbon::now()->getTimestamp(),
             'code' => $mfaCode,
         ];
         $mfaHistory[] = $entry;

app/Http/Controllers/Budget/BudgetLimitController.php

@@ -143,13 +143,13 @@ class BudgetLimitController extends Controller
         // first search for existing one and update it if necessary.
         $currency = $this->currencyRepos->find((int) $request->get('transaction_currency_id'));
         $budget   = $this->repository->find((int) $request->get('budget_id'));
-        if (null === $currency || null === $budget) {
+        if (!$currency instanceof TransactionCurrency || !$budget instanceof Budget) {
             throw new FireflyException('No valid currency or budget.');
         }
         $start    = Carbon::createFromFormat('Y-m-d', $request->get('start'));
         $end      = Carbon::createFromFormat('Y-m-d', $request->get('end'));
 
-        if (null === $start || null === $end) {
+        if (!$start instanceof Carbon || !$end instanceof Carbon) {
             return response()->json([]);
         }
 
@@ -167,7 +167,7 @@ class BudgetLimitController extends Controller
 
         // sanity check on amount:
         if (0 === bccomp($amount, '0')) {
-            if (null !== $limit) {
+            if ($limit instanceof BudgetLimit) {
                 $this->blRepository->destroyBudgetLimit($limit);
             }
 
@@ -181,11 +181,11 @@ class BudgetLimitController extends Controller
             $amount = bcmul($amount, '-1');
         }
 
-        if (null !== $limit) {
+        if ($limit instanceof BudgetLimit) {
             $limit->amount = $amount;
             $limit->save();
         }
-        if (null === $limit) {
+        if (!$limit instanceof BudgetLimit) {
             $limit = $this->blRepository->store(
                 [
                     'budget_id'   => $request->get('budget_id'),

app/Http/Controllers/Budget/EditController.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Budget;
 
+use FireflyIII\Models\AutoBudget;
 use FireflyIII\Enums\AutoBudgetType;
 use FireflyIII\Helpers\Attachments\AttachmentHelperInterface;
 use FireflyIII\Http\Controllers\Controller;
@@ -95,7 +96,7 @@ class EditController extends Controller
             'active'                  => $hasOldInput ? (bool) $request->old('active') : $budget->active,
             'auto_budget_currency_id' => $hasOldInput ? (int) $request->old('auto_budget_currency_id') : $this->defaultCurrency->id,
         ];
-        if (null !== $autoBudget) {
+        if ($autoBudget instanceof AutoBudget) {
             $amount                          = $hasOldInput ? $request->old('auto_budget_amount') : $autoBudget->amount;
             if (is_array($amount)) {
                 $amount = '0';

app/Http/Controllers/Budget/IndexController.php

@@ -316,7 +316,7 @@ class IndexController extends Controller
         foreach ($budgetIds as $index => $budgetId) {
             $budgetId = (int) $budgetId;
             $budget   = $repository->find($budgetId);
-            if (null !== $budget) {
+            if ($budget instanceof Budget) {
                 app('log')->debug(sprintf('Set budget #%d ("%s") to position %d', $budget->id, $budget->name, $index + 1));
                 $repository->setBudgetOrder($budget, $index + 1);
             }

app/Http/Controllers/Budget/ShowController.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Budget;
 
+use FireflyIII\Models\TransactionJournal;
 use Carbon\Carbon;
 use FireflyIII\Enums\TransactionTypeEnum;
 use FireflyIII\Exceptions\FireflyException;
@@ -90,7 +91,7 @@ class ShowController extends Controller
 
         // get first journal ever to set off the budget period overview.
         $first     = $this->journalRepos->firstNull();
-        $firstDate = null !== $first ? $first->date : $start;
+        $firstDate = $first instanceof TransactionJournal ? $first->date : $start;
         $periods   = $this->getNoBudgetPeriodOverview($firstDate, $end);
         $page      = (int) $request->get('page');
         $pageSize  = (int) app('preferences')->get('listPageSize', 50)->data;
@@ -115,7 +116,7 @@ class ShowController extends Controller
     {
         $subTitle  = (string) trans('firefly.all_journals_without_budget');
         $first     = $this->journalRepos->firstNull();
-        $start     = null === $first ? new Carbon() : $first->date;
+        $start     = $first instanceof TransactionJournal ? $first->date : new Carbon();
         $end       = today(config('app.timezone'));
         $page      = (int) $request->get('page');
         $pageSize  = (int) app('preferences')->get('listPageSize', 50)->data;

app/Http/Controllers/Category/NoCategoryController.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Category;
 
+use FireflyIII\Models\TransactionJournal;
 use Carbon\Carbon;
 use FireflyIII\Enums\TransactionTypeEnum;
 use FireflyIII\Exceptions\FireflyException;
@@ -119,7 +120,7 @@ class NoCategoryController extends Controller
         app('log')->debug('Start of noCategory()');
         $subTitle  = (string) trans('firefly.all_journals_without_category');
         $first     = $this->journalRepos->firstNull();
-        $start     = null === $first ? new Carbon() : $first->date;
+        $start     = $first instanceof TransactionJournal ? $first->date : new Carbon();
         $end       = today(config('app.timezone'));
         app('log')->debug(sprintf('Start for noCategory() is %s', $start->format('Y-m-d')));
         app('log')->debug(sprintf('End for noCategory() is %s', $end->format('Y-m-d')));

app/Http/Controllers/Chart/AccountController.php

@@ -43,6 +43,8 @@ use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Log;
 
+use function Safe\json_encode;
+
 /**
  * Class AccountController.
  */
@@ -468,14 +470,14 @@ class AccountController extends Controller
         Log::debug('Balances exist at:');
         foreach ($range as $key => $value) {
             $newRange[] = ['date' => $key, 'info' => $value];
-            Log::debug(sprintf('%d - %s (%s)', count($newRange) - 1, $key, \Safe\json_encode($value)));
+            Log::debug(sprintf('%d - %s (%s)', count($newRange) - 1, $key, json_encode($value)));
         }
         $carbon          = Carbon::createFromFormat('Y-m-d', $newRange[0]['date'])->endOfDay();
         Log::debug(sprintf('Start of loop, $carbon is %s', $carbon->format('Y-m-d H:i:s')));
         while ($end->gte($current)) {
             $momentBalance = $previous;
             // $theDate       = $current->format('Y-m-d');
-            Log::debug(sprintf('Now at %s, with momentBalance %s', $current->format('Y-m-d H:i:s'), \Safe\json_encode($momentBalance)));
+            Log::debug(sprintf('Now at %s, with momentBalance %s', $current->format('Y-m-d H:i:s'), json_encode($momentBalance)));
 
             // loop over the array with balances, find one that is earlier or on the same day.
             while ($carbon->lte($current) && array_key_exists($expectedIndex, $newRange)) {
@@ -490,7 +492,7 @@ class AccountController extends Controller
                     $carbon = Carbon::createFromFormat('Y-m-d', $newRange[$expectedIndex]['date'])->endOfDay();
                 }
             }
-            Log::debug(sprintf('momentBalance is now %s', \Safe\json_encode($momentBalance)));
+            Log::debug(sprintf('momentBalance is now %s', json_encode($momentBalance)));
             $return        = $this->updateChartKeys($return, $momentBalance);
             $previous      = $momentBalance;
 

app/Http/Controllers/Chart/BudgetController.php

@@ -202,7 +202,7 @@ class BudgetController extends Controller
     {
         /** @var GroupCollectorInterface $collector */
         $collector     = app(GroupCollectorInterface::class);
-        $budgetLimitId = null === $budgetLimit ? 0 : $budgetLimit->id;
+        $budgetLimitId = $budgetLimit instanceof BudgetLimit ? $budgetLimit->id : 0;
         $cache         = new CacheProperties();
         $cache->addProperty($budget->id);
         $cache->addProperty($this->convertToNative);
@@ -211,7 +211,7 @@ class BudgetController extends Controller
         $start         = session('first', today(config('app.timezone'))->startOfYear());
         $end           = today();
 
-        if (null !== $budgetLimit) {
+        if ($budgetLimit instanceof BudgetLimit) {
             $start = $budgetLimit->start_date;
             $end   = $budgetLimit->end_date;
             $collector->setRange($budgetLimit->start_date, $budgetLimit->end_date)->setNormalCurrency($budgetLimit->transactionCurrency);
@@ -285,7 +285,7 @@ class BudgetController extends Controller
     {
         /** @var GroupCollectorInterface $collector */
         $collector     = app(GroupCollectorInterface::class);
-        $budgetLimitId = null === $budgetLimit ? 0 : $budgetLimit->id;
+        $budgetLimitId = $budgetLimit instanceof BudgetLimit ? $budgetLimit->id : 0;
         $cache         = new CacheProperties();
         $cache->addProperty($budget->id);
         $cache->addProperty($this->convertToNative);
@@ -293,7 +293,7 @@ class BudgetController extends Controller
         $cache->addProperty('chart.budget.expense-category');
         $start         = session('first', today(config('app.timezone'))->startOfYear());
         $end           = today();
-        if (null !== $budgetLimit) {
+        if ($budgetLimit instanceof BudgetLimit) {
             $start = $budgetLimit->start_date;
             $end   = $budgetLimit->end_date;
             $collector->setNormalCurrency($budgetLimit->transactionCurrency);
@@ -367,7 +367,7 @@ class BudgetController extends Controller
     {
         /** @var GroupCollectorInterface $collector */
         $collector     = app(GroupCollectorInterface::class);
-        $budgetLimitId = null === $budgetLimit ? 0 : $budgetLimit->id;
+        $budgetLimitId = $budgetLimit instanceof BudgetLimit ? $budgetLimit->id : 0;
         $cache         = new CacheProperties();
         $cache->addProperty($budget->id);
         $cache->addProperty($budgetLimitId);
@@ -375,7 +375,7 @@ class BudgetController extends Controller
         $cache->addProperty('chart.budget.expense-expense');
         $start         = session('first', today(config('app.timezone'))->startOfYear());
         $end           = today();
-        if (null !== $budgetLimit) {
+        if ($budgetLimit instanceof BudgetLimit) {
             $start = $budgetLimit->start_date;
             $end   = $budgetLimit->end_date;
             $collector->setRange($budgetLimit->start_date, $budgetLimit->end_date)->setNormalCurrency($budgetLimit->transactionCurrency);
@@ -529,7 +529,7 @@ class BudgetController extends Controller
 
             // get budget limit in this period for this currency.
             $limit                           = $this->blRepository->find($budget, $currency, $currentStart, $currentEnd);
-            if (null !== $limit) {
+            if ($limit instanceof BudgetLimit) {
                 $chartData[1]['entries'][$title] = app('steam')->bcround($limit->amount, $currency->decimal_places);
             }
 

app/Http/Controllers/Chart/CategoryController.php

@@ -159,7 +159,7 @@ class CategoryController extends Controller
         $income     = [];
         $expenses   = [];
         $categoryId = 0;
-        if (null === $category) {
+        if (!$category instanceof Category) {
             /** @var NoCategoryRepositoryInterface $noCatRepository */
             $noCatRepository = app(NoCategoryRepositoryInterface::class);
 
@@ -168,7 +168,7 @@ class CategoryController extends Controller
             $income          = $noCatRepository->listIncome($start, $end, $accounts);
         }
 
-        if (null !== $category) {
+        if ($category instanceof Category) {
             /** @var OperationsRepositoryInterface $opsRepository */
             $opsRepository = app(OperationsRepositoryInterface::class);
             $categoryId    = $category->id;

app/Http/Controllers/Controller.php

@@ -23,6 +23,8 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers;
 
+use function Safe\realpath;
+use function Safe\ini_get;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Support\Facades\Amount;
 use FireflyIII\Support\Facades\Steam;
@@ -83,15 +85,15 @@ abstract class Controller extends BaseController
         if ('true' === request()->get('force_default_layout') && 'v2' === config('view.layout')) {
             //config('view.layout','v1');
             Config::set('view.layout', 'v1');
-            View::getFinder()->setPaths([\Safe\realpath(base_path('resources/views'))]); // @phpstan-ignore-line
+            View::getFinder()->setPaths([realpath(base_path('resources/views'))]); // @phpstan-ignore-line
         }
 
         View::share('authGuard', $authGuard);
         View::share('logoutUrl', $logoutUrl);
 
         // upload size
-        $maxFileSize = Steam::phpBytes((string) \Safe\ini_get('upload_max_filesize'));
-        $maxPostSize = Steam::phpBytes((string) \Safe\ini_get('post_max_size'));
+        $maxFileSize = Steam::phpBytes((string) ini_get('upload_max_filesize'));
+        $maxPostSize = Steam::phpBytes((string) ini_get('post_max_size'));
         $uploadSize  = min($maxFileSize, $maxPostSize);
         View::share('uploadSize', $uploadSize);
 

app/Http/Controllers/DebugController.php

@@ -50,6 +50,9 @@ use Illuminate\View\View;
 use Monolog\Handler\RotatingFileHandler;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
+use function Safe\file_get_contents;
+use function Safe\ini_get;
+
 /**
  * Class DebugController
  */
@@ -139,7 +142,7 @@ class DebugController extends Controller
             if ($handler instanceof RotatingFileHandler) {
                 $logFile = $handler->getUrl();
                 if (null !== $logFile && file_exists($logFile)) {
-                    $logContent = \Safe\file_get_contents($logFile);
+                    $logContent = file_get_contents($logFile);
                 }
             }
         }
@@ -164,8 +167,8 @@ class DebugController extends Controller
 
     private function getSystemInformation(): array
     {
-        $maxFileSize   = Steam::phpBytes((string) \Safe\ini_get('upload_max_filesize'));
-        $maxPostSize   = Steam::phpBytes((string) \Safe\ini_get('post_max_size'));
+        $maxFileSize   = Steam::phpBytes((string) ini_get('upload_max_filesize'));
+        $maxPostSize   = Steam::phpBytes((string) ini_get('post_max_size'));
         $drivers       = DB::availableDrivers();
         $currentDriver = DB::getDriverName();
 
@@ -177,8 +180,8 @@ class DebugController extends Controller
             'interface'       => \PHP_SAPI,
             'bits'            => \PHP_INT_SIZE * 8,
             'bcscale'         => bcscale(),
-            'display_errors'  => \Safe\ini_get('display_errors'),
-            'error_reporting' => $this->errorReporting((int) \Safe\ini_get('error_reporting')),
+            'display_errors'  => ini_get('display_errors'),
+            'error_reporting' => $this->errorReporting((int) ini_get('error_reporting')),
             'upload_size'     => min($maxFileSize, $maxPostSize),
             'all_drivers'     => $drivers,
             'current_driver'  => $currentDriver,
@@ -197,7 +200,7 @@ class DebugController extends Controller
 
         try {
             if (file_exists('/var/www/counter-main.txt')) {
-                $return['build'] = trim((string) \Safe\file_get_contents('/var/www/counter-main.txt'));
+                $return['build'] = trim((string) file_get_contents('/var/www/counter-main.txt'));
                 app('log')->debug(sprintf('build is now "%s"', $return['build']));
             }
         } catch (\Exception $e) {
@@ -207,7 +210,7 @@ class DebugController extends Controller
 
         try {
             if (file_exists('/var/www/build-date-main.txt')) {
-                $return['build_date'] = trim((string) \Safe\file_get_contents('/var/www/build-date-main.txt'));
+                $return['build_date'] = trim((string) 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/Export/IndexController.php

@@ -24,6 +24,8 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Export;
 
+use Carbon\Carbon;
+use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Http\Middleware\IsDemoUser;
@@ -84,14 +86,14 @@ class IndexController extends Controller
         $firstDate = today(config('app.timezone'));
         $firstDate->subYear();
         $journal   = $this->journalRepository->firstNull();
-        if (null !== $journal) {
+        if ($journal instanceof TransactionJournal) {
             Log::debug('First journal is NULL, using today() - 1 year.');
             $firstDate = clone $journal->date;
         }
         $generator->setStart($firstDate);
         $result    = $generator->export();
 
-        $name      = sprintf('%s_transaction_export.csv', \Safe\date('Y_m_d'));
+        $name      = sprintf('%s_transaction_export.csv', Carbon::now()->format('Y_m_d'));
         $quoted    = sprintf('"%s"', addcslashes($name, '"\\'));
 
         // headers for CSV file.

app/Http/Controllers/JavascriptController.php

@@ -96,7 +96,7 @@ class JavascriptController extends Controller
     {
         $account                   = $repository->find((int) $request->get('account'));
         $currency                  = $this->defaultCurrency;
-        if (null !== $account) {
+        if ($account instanceof Account) {
             $currency = $repository->getAccountCurrency($account) ?? $this->defaultCurrency;
         }
         $locale                    = app('steam')->getLocale();

app/Http/Controllers/Json/BudgetController.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Json;
 
+use FireflyIII\Models\AvailableBudget;
 use Carbon\Carbon;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\TransactionCurrency;
@@ -72,7 +73,7 @@ class BudgetController extends Controller
         $available       = '0';
         $percentage      = '0';
 
-        if (null !== $availableBudget) {
+        if ($availableBudget instanceof AvailableBudget) {
             $available = $availableBudget->amount;
             if (0 !== bccomp($available, '0')) {
                 $percentage = bcmul(bcdiv($budgeted, $available), '100');

app/Http/Controllers/Json/ReconcileController.php

@@ -77,7 +77,7 @@ class ReconcileController extends Controller
         $amount          = '0';
         $clearedAmount   = '0';
 
-        if (null === $start && null === $end) {
+        if (!$start instanceof Carbon && !$end instanceof Carbon) {
             throw new FireflyException('Invalid dates submitted.');
         }
         if ($end->lt($start)) {
@@ -183,7 +183,7 @@ class ReconcileController extends Controller
      */
     public function transactions(Account $account, ?Carbon $start = null, ?Carbon $end = null)
     {
-        if (null === $start || null === $end) {
+        if (!$start instanceof Carbon || !$end instanceof Carbon) {
             throw new FireflyException('Invalid dates submitted.');
         }
         if ($end->lt($start)) {

app/Http/Controllers/Json/RecurrenceController.php

@@ -82,12 +82,12 @@ class RecurrenceController extends Controller
         $skip                          = $skip < 0 || $skip > 31 ? 0 : $skip;
         $weekend                       = $weekend < 1 || $weekend > 4 ? 1 : $weekend;
 
-        if (null === $endDate) {
+        if (!$endDate instanceof Carbon) {
             // safety catch:
             $endDate = now()->addYear();
         }
 
-        if (null === $start || null === $end || null === $firstDate) {
+        if (!$start instanceof Carbon || !$end instanceof Carbon || !$firstDate instanceof Carbon) {
             return response()->json();
         }
 
@@ -153,7 +153,7 @@ class RecurrenceController extends Controller
      */
     public function suggest(Request $request): JsonResponse
     {
-        $string      = '' === (string) $request->get('date') ? \Safe\date('Y-m-d') : (string) $request->get('date');
+        $string      = '' === (string) $request->get('date') ? Carbon::now()->format('Y-m-d') : (string) $request->get('date');
         $today       = today(config('app.timezone'))->startOfDay();
 
         try {
@@ -161,7 +161,7 @@ class RecurrenceController extends Controller
         } catch (InvalidFormatException) {
             $date = Carbon::today(config('app.timezone'));
         }
-        if (null === $date) {
+        if (!$date instanceof Carbon) {
             return response()->json();
         }
         $date->startOfDay();

app/Http/Controllers/NewUserController.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers;
 
+use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Enums\AccountTypeEnum;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Http\Requests\NewUserFormRequest;
@@ -101,7 +102,7 @@ class NewUserController extends Controller
         $currency      = $currencyRepository->find((int) $request->input('amount_currency_id_bank_balance'));
 
         // if is null, set to EUR:
-        if (null === $currency) {
+        if (!$currency instanceof TransactionCurrency) {
             $currency = $currencyRepository->findByCode('EUR');
         }
         $currencyRepository->enable($currency);

app/Http/Controllers/PreferencesController.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers;
 
+use Carbon\Carbon;
 use FireflyIII\Enums\AccountTypeEnum;
 use FireflyIII\Events\Preferences\UserGroupChangedDefaultCurrency;
 use FireflyIII\Events\Test\UserTestNotificationChannel;
@@ -40,6 +41,10 @@ use Illuminate\Routing\Redirector;
 use Illuminate\Support\Facades\Log;
 use Illuminate\View\View;
 
+use function Safe\json_decode;
+use function Safe\file_get_contents;
+use function Safe\strtotime;
+
 /**
  * Class PreferencesController.
  */
@@ -110,7 +115,7 @@ class PreferencesController extends Controller
         if (is_array($fiscalYearStartStr)) {
             $fiscalYearStartStr = '01-01';
         }
-        $fiscalYearStart                = sprintf('%s-%s', \Safe\date('Y'), (string) $fiscalYearStartStr);
+        $fiscalYearStart                = sprintf('%s-%s', Carbon::now()->format('Y'), (string) $fiscalYearStartStr);
         $tjOptionalFields               = Preferences::get('transaction_journal_optional_fields', [])->data;
         $availableDarkModes             = config('firefly.available_dark_modes');
 
@@ -149,7 +154,7 @@ class PreferencesController extends Controller
         // list of locales also has "equal" which makes it equal to whatever the language is.
 
         try {
-            $locales = \Safe\json_decode((string) \Safe\file_get_contents(resource_path(sprintf('locales/%s/locales.json', $language))), true, 512, JSON_THROW_ON_ERROR);
+            $locales = json_decode((string) file_get_contents(resource_path(sprintf('locales/%s/locales.json', $language))), true, 512, JSON_THROW_ON_ERROR);
         } catch (\JsonException $e) {
             app('log')->error($e->getMessage());
             $locales = [];
@@ -271,9 +276,9 @@ class PreferencesController extends Controller
 
         // custom fiscal year
         $customFiscalYear  = 1 === (int) $request->get('customFiscalYear');
-        $string            = \Safe\strtotime((string) $request->get('fiscalYearStart'));
+        $string            = strtotime((string) $request->get('fiscalYearStart'));
         if (false !== $string) {
-            $fiscalYearStart = \Safe\date('m-d', $string);
+            $fiscalYearStart = Carbon::createFromTimestamp($string)->format('m-d');
             Preferences::set('customFiscalYear', $customFiscalYear);
             Preferences::set('fiscalYearStart', $fiscalYearStart);
         }

app/Http/Controllers/Profile/MfaController.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Profile;
 
+use Carbon\Carbon;
 use FireflyIII\Events\Security\DisabledMFA;
 use FireflyIII\Events\Security\EnabledMFA;
 use FireflyIII\Events\Security\MFANewBackupCodes;
@@ -294,7 +295,7 @@ class MfaController extends Controller
         /** @var array $mfaHistory */
         $mfaHistory   = app('preferences')->get('mfa_history', [])->data;
         $entry        = [
-            'time' => time(),
+            'time' => Carbon::now()->getTimestamp(),
             'code' => $mfaCode,
         ];
         $mfaHistory[] = $entry;
@@ -311,7 +312,7 @@ class MfaController extends Controller
         /** @var array $mfaHistory */
         $mfaHistory = app('preferences')->get('mfa_history', [])->data;
         $newHistory = [];
-        $now        = time();
+        $now        = Carbon::now()->getTimestamp();
         foreach ($mfaHistory as $entry) {
             $time = $entry['time'];
             $code = $entry['code'];

app/Http/Controllers/ProfileController.php

@@ -201,7 +201,7 @@ class ProfileController extends Controller
             return redirect(route('profile.change-email'))->withInput();
         }
         $existing = $repository->findByEmail($newEmail);
-        if (null !== $existing) {
+        if ($existing instanceof User) {
             // force user logout.
             \Auth::guard()->logout(); // @phpstan-ignore-line (does not recognize function)
             $request->session()->invalidate();

app/Http/Controllers/Rule/CreateController.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Rule;
 
+use FireflyIII\Models\Rule;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Http\Requests\RuleFormRequest;
@@ -128,7 +129,7 @@ class CreateController extends Controller
 
         // title depends on whether or not there is a rule group:
         $subTitle     = (string) trans('firefly.make_new_rule_no_group');
-        if (null !== $ruleGroup) {
+        if ($ruleGroup instanceof RuleGroup) {
             $subTitle = (string) trans('firefly.make_new_rule', ['title' => $ruleGroup->title]);
         }
 
@@ -252,7 +253,7 @@ class CreateController extends Controller
     {
         $ruleId = (int) $request->get('id');
         $rule   = $this->ruleRepos->find($ruleId);
-        if (null !== $rule) {
+        if ($rule instanceof Rule) {
             $this->ruleRepos->duplicate($rule);
         }
 

app/Http/Controllers/RuleGroup/EditController.php

@@ -91,7 +91,7 @@ class EditController extends Controller
     {
         $groupId   = (int) $request->get('id');
         $ruleGroup = $this->repository->find($groupId);
-        if (null !== $ruleGroup) {
+        if ($ruleGroup instanceof RuleGroup) {
             $direction = $request->get('direction');
             if ('down' === $direction) {
                 $maxOrder = $this->repository->maxOrder();

app/Http/Controllers/System/InstallController.php

@@ -36,6 +36,8 @@ use Illuminate\View\View;
 use Laravel\Passport\Passport;
 use phpseclib3\Crypt\RSA;
 
+use function Safe\file_put_contents;
+
 /**
  * Class InstallController
  */
@@ -169,7 +171,7 @@ class InstallController extends Controller
             return;
         }
 
-        \Safe\file_put_contents($publicKey, (string) $key->getPublicKey());
-        \Safe\file_put_contents($privateKey, $key->toString('PKCS1'));
+        file_put_contents($publicKey, (string) $key->getPublicKey());
+        file_put_contents($privateKey, $key->toString('PKCS1'));
     }
 }

app/Http/Controllers/TagController.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers;
 
+use FireflyIII\Models\Location;
 use Carbon\Carbon;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Helpers\Attachments\AttachmentHelperInterface;
@@ -124,10 +125,10 @@ class TagController extends Controller
         $subTitleIcon = 'fa-tag';
 
         $location     = $this->repository->getLocation($tag);
-        $latitude     = null !== $location ? $location->latitude : config('firefly.default_location.latitude');
-        $longitude    = null !== $location ? $location->longitude : config('firefly.default_location.longitude');
-        $zoomLevel    = null !== $location ? $location->zoom_level : config('firefly.default_location.zoom_level');
-        $hasLocation  = null !== $location;
+        $latitude     = $location instanceof Location ? $location->latitude : config('firefly.default_location.latitude');
+        $longitude    = $location instanceof Location ? $location->longitude : config('firefly.default_location.longitude');
+        $zoomLevel    = $location instanceof Location ? $location->zoom_level : config('firefly.default_location.zoom_level');
+        $hasLocation  = $location instanceof Location;
         $locations    = [
             'location' => [
                 'latitude'     => old('location_latitude') ?? $latitude,
@@ -155,8 +156,8 @@ class TagController extends Controller
     {
         // start with oldest tag
         $first           = session('first', today()) ?? today();
-        $oldestTagDate   = null === $repository->oldestTag() ? clone $first : $repository->oldestTag()->date;
-        $newestTagDate   = null === $repository->newestTag() ? today() : $repository->newestTag()->date;
+        $oldestTagDate   = $repository->oldestTag() instanceof Tag ? $repository->oldestTag()->date : clone $first;
+        $newestTagDate   = $repository->newestTag() instanceof Tag ? $repository->newestTag()->date : today();
         $oldestTagDate->startOfYear();
         $newestTagDate->endOfYear();
         $tags            = [];
@@ -184,7 +185,7 @@ class TagController extends Controller
         foreach ($tags as $tagId) {
             $tagId = (int) $tagId;
             $tag   = $this->repository->find($tagId);
-            if (null !== $tag) {
+            if ($tag instanceof Tag) {
                 $this->repository->destroy($tag);
                 ++$count;
             }

app/Http/Controllers/Transaction/ConvertController.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Transaction;
 
+use FireflyIII\Models\TransactionCurrency;
 use Exception;
 use FireflyIII\Enums\AccountTypeEnum;
 use FireflyIII\Enums\TransactionTypeEnum;
@@ -342,7 +343,7 @@ class ConvertController extends Controller
             $sourceCurrency = $this->accountRepository->getAccountCurrency($source);
             $dest           = $this->accountRepository->find((int) $destinationId);
             $destCurrency   = $this->accountRepository->getAccountCurrency($dest);
-            if (null !== $sourceCurrency && null !== $destCurrency && $sourceCurrency->code !== $destCurrency->code) {
+            if ($sourceCurrency instanceof TransactionCurrency && $destCurrency instanceof TransactionCurrency && $sourceCurrency->code !== $destCurrency->code) {
                 $update['currency_id']         = $sourceCurrency->id;
                 $update['foreign_currency_id'] = $destCurrency->id;
                 $update['foreign_amount']      = '1'; // not the best solution but at this point the amount is hard to get.

app/Http/Controllers/Transaction/CreateController.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Transaction;
 
+use FireflyIII\Models\TransactionGroup;
 use FireflyIII\Events\StoredTransactionGroup;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Http\Controllers\Controller;
@@ -35,6 +36,8 @@ use Illuminate\Contracts\View\View;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
+use function Safe\parse_url;
+
 /**
  * Class CreateController
  */
@@ -65,7 +68,7 @@ class CreateController extends Controller
         $groupId = (int) $request->get('id');
         if (0 !== $groupId) {
             $group = $this->repository->find($groupId);
-            if (null !== $group) {
+            if ($group instanceof TransactionGroup) {
                 /** @var GroupCloneService $service */
                 $service  = app(GroupCloneService::class);
                 $newGroup = $service->cloneGroup($group);
@@ -116,7 +119,7 @@ class CreateController extends Controller
         $accountToTypes             = config('firefly.account_to_transaction');
         $defaultCurrency            = $this->defaultCurrency;
         $previousUrl                = $this->rememberPreviousUrl('transactions.create.url');
-        $parts                      = \Safe\parse_url($previousUrl);
+        $parts                      = parse_url((string) $previousUrl);
         $search                     = sprintf('?%s', $parts['query'] ?? '');
         $previousUrl                = str_replace($search, '', $previousUrl);
         if (!is_array($optionalFields)) {

app/Http/Controllers/Transaction/EditController.php

@@ -35,6 +35,8 @@ use Illuminate\Http\RedirectResponse;
 use Illuminate\Routing\Redirector;
 use Illuminate\View\View;
 
+use function Safe\parse_url;
+
 /**
  * Class EditController
  */
@@ -85,7 +87,7 @@ class EditController extends Controller
         $defaultCurrency            = $this->defaultCurrency;
         $cash                       = $repository->getCashAccount();
         $previousUrl                = $this->rememberPreviousUrl('transactions.edit.url');
-        $parts                      = \Safe\parse_url($previousUrl);
+        $parts                      = parse_url((string) $previousUrl);
         $search                     = sprintf('?%s', $parts['query'] ?? '');
         $previousUrl                = str_replace($search, '', $previousUrl);
 

app/Http/Controllers/Transaction/IndexController.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Transaction;
 
+use FireflyIII\Models\TransactionJournal;
 use Carbon\Carbon;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
@@ -81,14 +82,14 @@ class IndexController extends Controller
         $page          = (int) $request->get('page');
         $pageSize      = (int) app('preferences')->get('listPageSize', 50)->data;
 
-        if (null === $start) {
+        if (!$start instanceof Carbon) {
             $start = session('start');
             $end   = session('end');
         }
         if (null === $end) {
             // get last transaction ever?
             $last = $this->repository->getLast();
-            $end  = null !== $last ? $last->date : session('end');
+            $end  = $last instanceof TransactionJournal ? $last->date : session('end');
         }
 
         [$start, $end] = $end < $start ? [$end, $start] : [$start, $end];
@@ -97,7 +98,7 @@ class IndexController extends Controller
         $subTitle      = (string) trans(sprintf('firefly.title_%s_between', $objectType), ['start' => $startStr, 'end' => $endStr]);
         $path          = route('transactions.index', [$objectType, $start->format('Y-m-d'), $end->format('Y-m-d')]);
         $firstJournal  = $this->repository->firstNull();
-        $startPeriod   = null === $firstJournal ? new Carbon() : $firstJournal->date;
+        $startPeriod   = $firstJournal instanceof TransactionJournal ? $firstJournal->date : new Carbon();
         $endPeriod     = clone $end;
         $periods       = $this->getTransactionPeriodOverview($objectType, $startPeriod, $endPeriod);
 
@@ -132,9 +133,9 @@ class IndexController extends Controller
         $pageSize     = (int) app('preferences')->get('listPageSize', 50)->data;
         $path         = route('transactions.index.all', [$objectType]);
         $first        = $this->repository->firstNull();
-        $start        = null === $first ? new Carbon() : $first->date;
+        $start        = $first instanceof TransactionJournal ? $first->date : new Carbon();
         $last         = $this->repository->getLast();
-        $end          = null !== $last ? $last->date : today(config('app.timezone'));
+        $end          = $last instanceof TransactionJournal ? $last->date : today(config('app.timezone'));
         $subTitle     = (string) trans('firefly.all_'.$objectType);
 
         /** @var GroupCollectorInterface $collector */

app/Http/Controllers/Transaction/LinkController.php

@@ -113,7 +113,7 @@ class LinkController extends Controller
 
         app('log')->debug('We are here (store)');
         $other         = $this->journalRepository->find($linkInfo['transaction_journal_id']);
-        if (null === $other) {
+        if (!$other instanceof TransactionJournal) {
             session()->flash('error', (string) trans('firefly.invalid_link_selection'));
 
             return redirect(route('transactions.show', [$journal->transaction_group_id]));

app/Http/Controllers/Transaction/MassController.php

@@ -191,7 +191,7 @@ class MassController extends Controller
     private function updateJournal(int $journalId, MassEditJournalRequest $request): void
     {
         $journal = $this->repository->find($journalId);
-        if (null === $journal) {
+        if (!$journal instanceof TransactionJournal) {
             throw new FireflyException(sprintf('Trying to edit non-existent or deleted journal #%d', $journalId));
         }
         $service = app(JournalUpdateService::class);

app/Http/Controllers/TransactionCurrency/CreateController.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\TransactionCurrency;
 
+use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Http\Requests\CurrencyFormRequest;
@@ -122,7 +123,7 @@ class CreateController extends Controller
         }
         $redirect        = redirect($this->getPreviousUrl('currencies.create.url'));
 
-        if (null !== $currency) {
+        if ($currency instanceof TransactionCurrency) {
             $request->session()->flash('success', (string) trans('firefly.created_currency', ['name' => $currency->name]));
             Log::channel('audit')->info('Created (POST) currency.', $data);
             if (1 === (int) $request->get('create_another')) {

app/Http/Kernel.php

@@ -177,7 +177,7 @@ class Kernel extends HttpKernel
             // full API authentication
             'api'                   => [
                 AcceptHeaders::class,
-                //                EnsureFrontendRequestsAreStateful::class,
+                EnsureFrontendRequestsAreStateful::class,
                 'auth:api,sanctum',
                 'bindings',
             ],

app/Http/Middleware/AcceptHeaders.php

@@ -29,6 +29,8 @@ use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 
+use function Safe\preg_match;
+
 class AcceptHeaders
 {
     /**
@@ -71,7 +73,7 @@ class AcceptHeaders
 
         // throw bad request if trace id is not a UUID
         $uuid         = $request->header('X-Trace-Id');
-        if (is_string($uuid) && '' !== trim($uuid) && (1 !== \Safe\preg_match('/^[a-f\d]{8}(-[a-f\d]{4}){4}[a-f\d]{8}$/i', trim($uuid)))) {
+        if (is_string($uuid) && '' !== trim($uuid) && (1 !== preg_match('/^[a-f\d]{8}(-[a-f\d]{4}){4}[a-f\d]{8}$/i', trim($uuid)))) {
             throw new BadRequestHttpException('Bad X-Trace-Id header.');
         }
 

app/Http/Middleware/Authenticate.php

@@ -114,10 +114,10 @@ class Authenticate
      */
     private function validateBlockedUser(?User $user, array $guards): void
     {
-        if (null === $user) {
+        if (!$user instanceof User) {
             app('log')->warning('User is null, throw exception?');
         }
-        if (null !== $user) {
+        if ($user instanceof User) {
             // app('log')->debug(get_class($user));
             if (1 === (int) $user->blocked) {
                 $message = (string) trans('firefly.block_account_logout');

app/Http/Requests/CurrencyFormRequest.php

@@ -70,7 +70,7 @@ class CurrencyFormRequest extends FormRequest
         $currency = $this->route()->parameter('currency');
 
         if (null !== $currency) {
-            $rules = [
+            return [
                 'name'           => 'required|max:48|min:1',
                 'code'           => 'required|min:3|max:51',
                 'symbol'         => 'required|min:1|max:51',

app/Http/Requests/ReportFormRequest.php

@@ -36,6 +36,8 @@ use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Validation\Validator;
 
+use function Safe\preg_match;
+
 /**
  * Class CategoryFormRequest.
  */
@@ -143,7 +145,7 @@ class ReportFormRequest extends FormRequest
             // validate as date
             // if regex for YYYY-MM-DD:
             $pattern = '/^(19|20)\d\d-(0[1-9]|1[012])-(0[1-9]|[12][\d]|3[01])$/';
-            $result  = \Safe\preg_match($pattern, $string);
+            $result  = preg_match($pattern, $string);
             if (false !== $result && 0 !== $result) {
                 try {
                     $date = new Carbon($parts[1]);
@@ -181,7 +183,7 @@ class ReportFormRequest extends FormRequest
             // validate as date
             // if regex for YYYY-MM-DD:
             $pattern = '/^(19|20)\d\d-(0[1-9]|1[012])-(0[1-9]|[12][\d]|3[01])$/';
-            $result  = \Safe\preg_match($pattern, $string);
+            $result  = preg_match($pattern, $string);
             if (false !== $result && 0 !== $result) {
                 try {
                     $date = new Carbon($parts[0]);

app/Providers/AppServiceProvider.php

@@ -41,6 +41,7 @@ class AppServiceProvider extends ServiceProvider
     public function boot(): void
     {
         Schema::defaultStringLength(191);
+        Passport::$clientUuids = false;
         Response::macro('api', function (array $value) {
             $headers = [
                 'Cache-Control' => 'no-store',

app/Repositories/User/UserRepository.php

@@ -54,7 +54,7 @@ class UserRepository implements UserRepositoryInterface
 
         // save old email as pref
         app('preferences')->setForUser($user, 'previous_email_latest', $oldEmail);
-        app('preferences')->setForUser($user, 'previous_email_'.\Safe\date('Y-m-d-H-i-s'), $oldEmail);
+        app('preferences')->setForUser($user, 'previous_email_'.date('Y-m-d-H-i-s'), $oldEmail);
 
         // set undo and confirm token:
         app('preferences')->setForUser($user, 'email_change_undo_token', bin2hex(random_bytes(16)));
@@ -389,7 +389,7 @@ class UserRepository implements UserRepositoryInterface
 
         // save old email as pref
         app('preferences')->setForUser($user, 'admin_previous_email_latest', $oldEmail);
-        app('preferences')->setForUser($user, 'admin_previous_email_'.\Safe\date('Y-m-d-H-i-s'), $oldEmail);
+        app('preferences')->setForUser($user, 'admin_previous_email_'.date('Y-m-d-H-i-s'), $oldEmail);
 
         $user->email = $newEmail;
         $user->save();

app/Services/Internal/Update/JournalUpdateService.php

@@ -27,6 +27,7 @@ namespace FireflyIII\Services\Internal\Update;
 use Carbon\Carbon;
 use Carbon\Exceptions\InvalidDateException;
 use Carbon\Exceptions\InvalidFormatException;
+use FireflyIII\Enums\AccountTypeEnum;
 use FireflyIII\Enums\TransactionTypeEnum;
 use FireflyIII\Events\TriggeredAuditLog;
 use FireflyIII\Exceptions\FireflyException;
@@ -723,14 +724,17 @@ class JournalUpdateService
             // the correct fields to update in the destination transaction are NOT the foreign amount and currency
             // but rather the normal amount and currency. This is new behavior.
             $isTransfer                  = TransactionTypeEnum::TRANSFER->value === $this->transactionJournal->transactionType->type;
-            if ($isTransfer) {
+            // also check if it is not between an asset account and a liability, because then the same rule applies.
+            $isBetween                   = $this->isBetweenAssetAndLiability();
+
+            if ($isTransfer || $isBetween) {
                 Log::debug('Switch amounts, store in amount and not foreign_amount');
                 $dest->transaction_currency_id = $foreignCurrency->id;
                 $dest->amount                  = app('steam')->positive($foreignAmount);
                 $dest->foreign_amount          = app('steam')->positive($source->amount);
                 $dest->foreign_currency_id     = $source->transaction_currency_id;
             }
-            if (!$isTransfer) {
+            if (!$isTransfer && !$isBetween) {
                 $dest->foreign_currency_id = $foreignCurrency->id;
                 $dest->foreign_amount      = app('steam')->positive($foreignAmount);
             }
@@ -768,4 +772,48 @@ class JournalUpdateService
         $this->sourceTransaction->refresh();
         $this->destinationTransaction->refresh();
     }
+
+    private function isBetweenAssetAndLiability(): bool
+    {
+        /** @var Transaction $sourceTransaction */
+        $sourceTransaction      = $this->transactionJournal->transactions()->where('amount', '<', 0)->first();
+
+        /** @var Transaction $destinationTransaction */
+        $destinationTransaction = $this->transactionJournal->transactions()->where('amount', '>', 0)->first();
+        if (null === $sourceTransaction || null === $destinationTransaction) {
+            Log::warning('Either transaction is false, stop.');
+
+            return false;
+        }
+        if (null === $sourceTransaction->foreign_amount || null === $destinationTransaction->foreign_amount) {
+            Log::warning('Either foreign amount is false, stop.');
+
+            return false;
+        }
+
+        $source                 = $sourceTransaction->account;
+        $destination            = $destinationTransaction->account;
+
+        if (null === $source || null === $destination) {
+            Log::warning('Either is false, stop.');
+
+            return false;
+        }
+        $sourceTypes            = [AccountTypeEnum::LOAN->value, AccountTypeEnum::DEBT->value, AccountTypeEnum::MORTGAGE->value];
+
+        // source is liability, destination is asset
+        if (in_array($source->accountType->type, $sourceTypes, true) && AccountTypeEnum::ASSET->value === $destination->accountType->type) {
+            Log::debug('Source is a liability account, destination is an asset account, return TRUE.');
+
+            return true;
+        }
+        // source is asset, destination is liability
+        if (in_array($destination->accountType->type, $sourceTypes, true) && AccountTypeEnum::ASSET->value === $source->accountType->type) {
+            Log::debug('Destination is a liability account, source is an asset account, return TRUE.');
+
+            return true;
+        }
+
+        return false;
+    }
 }

app/Support/Authentication/RemoteUserGuard.php

@@ -67,7 +67,7 @@ class RemoteUserGuard implements Guard
 
         if (function_exists('apache_request_headers')) {
             Log::debug('Use apache_request_headers to find user ID.');
-            $userID = request()->server($header) ?? \Safe\apache_request_headers()[$header] ?? null;
+            $userID = request()->server($header) ?? apache_request_headers()[$header] ?? null;
         }
 
         if (null === $userID || '' === $userID) {
@@ -85,7 +85,7 @@ class RemoteUserGuard implements Guard
         $header        = config('auth.guard_email');
 
         if (null !== $header) {
-            $emailAddress = (string) (request()->server($header) ?? \Safe\apache_request_headers()[$header] ?? null);
+            $emailAddress = (string) (request()->server($header) ?? apache_request_headers()[$header] ?? null);
             $preference   = app('preferences')->getForUser($retrievedUser, 'remote_guard_alt_email');
 
             if ('' !== $emailAddress && null === $preference && $emailAddress !== $userID) {

app/Support/Cronjobs/UpdateCheckCronjob.php

@@ -63,7 +63,7 @@ class UpdateCheckCronjob extends AbstractCronjob
             $this->jobFired     = false;
             $this->jobErrored   = false;
             $this->jobSucceeded = true;
-            $this->message      = sprintf('Checked for updates less than a week ago (on %s).', \Safe\date('Y-m-d H:i:s', $lastCheckTime->data));
+            $this->message      = sprintf('Checked for updates less than a week ago (on %s).', date('Y-m-d H:i:s', $lastCheckTime->data));
 
             return;
         }

app/Support/Twig/General.php

@@ -211,7 +211,7 @@ class General extends AbstractExtension
     {
         return new TwigFunction(
             'phpdate',
-            static fn (string $str): string => \Safe\date($str)
+            static fn (string $str): string => date($str)
         );
     }
 

app/TransactionRules/Actions/SetDestinationAccount.php

@@ -116,6 +116,18 @@ class SetDestinationAccount implements ActionInterface
         if (TransactionTypeEnum::WITHDRAWAL->value === $type) {
             $newAccount = $this->findWithdrawalDestinationAccount($accountName);
         }
+        if (null === $newAccount) {
+            app('log')->error(
+                sprintf(
+                    'No destination account found for name "%s".',
+                    $accountName
+                )
+            );
+
+            event(new RuleActionFailedOnArray($this->action, $journal, trans('rules.no_destination', ['name' => $accountName])));
+
+            return false;
+        }
 
         app('log')->debug(sprintf('New destination account is #%d ("%s").', $newAccount->id, $newAccount->name));
 

changelog.md

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 6.2.13 - 2025-05-25
+
+### Fixed
+
+- [Issue 10114](https://github.com/firefly-iii/firefly-iii/issues/10114) (Budget for foreign currency not getting updated when a transaction refers to it) reported by @srikakulamts
+- [Issue 10180](https://github.com/firefly-iii/firefly-iii/issues/10180) (missing SPENT info) reported by @frank-bg
+- [Issue 10197](https://github.com/firefly-iii/firefly-iii/issues/10197) (Add rule number) reported by @gogoizzy
+- [PR 10203](https://github.com/firefly-iii/firefly-iii/pull/10203) (Fix Ukrainian language names) reported by @den-is
+- [Issue 10265](https://github.com/firefly-iii/firefly-iii/issues/10265) (Liabilities, foreign currencies have some issues (payment/exchange with native currency)) reported by @jgmm81
+- [Issue 10290](https://github.com/firefly-iii/firefly-iii/issues/10290) (edit multiple transactions individually ignores reconciled state) reported by @goebeler
+- [Issue 10302](https://github.com/firefly-iii/firefly-iii/issues/10302) (Attempt to read property "id" on null Error) reported by @XBadPlayerX
+- [Issue 10305](https://github.com/firefly-iii/firefly-iii/issues/10305) (The info icon used to display transactions is not clickable in the default financial reports "budgets by accounts"-section's sum column) reported by @goebeler
+- [Issue 10308](https://github.com/firefly-iii/firefly-iii/issues/10308) (Liabilities, with some details (payment/exchange with native currency)) reported by @jgmm81
+- [Issue 10320](https://github.com/firefly-iii/firefly-iii/issues/10320) (Button to update transaction keeps being disabled after correcting form errors) reported by @Astro1247
+- [Issue 10336](https://github.com/firefly-iii/firefly-iii/issues/10336) (New install recovering backup from 5.7.18 fails to run.  ($param) must be of type int, string given in orrectsUnevenAmount.php) reported by @perezalvarezhi
+
 ## 6.2.12 - 2025-04-21
 
 ### Fixed

composer.json

@@ -89,7 +89,8 @@
         "jc5/recovery": "^2",
         "laravel-notification-channels/pushover": "^4.0",
         "laravel/framework": "^12",
-        "laravel/passport": "^12",
+        "laravel/passport": "^13.0",
+        "laravel/sanctum": "^4.1",
         "laravel/slack-notification-channel": "^3.3",
         "laravel/ui": "^4.2",
         "league/commonmark": "^2",
@@ -107,7 +108,8 @@
         "spatie/period": "^2.4",
         "symfony/expression-language": "^7.0",
         "symfony/http-client": "^7.1",
-        "symfony/mailgun-mailer": "^7.1"
+        "symfony/mailgun-mailer": "^7.1",
+        "thecodingmachine/safe": "^3.1"
     },
     "require-dev": {
         "barryvdh/laravel-debugbar": "^3.9",

config/firefly.php

@@ -78,7 +78,7 @@ return [
         'running_balance_column' => env('USE_RUNNING_BALANCE', false),
         // see cer.php for exchange rates feature flag.
     ],
-    'version'                      => 'develop/2025-05-11',
+    'version'                      => '6.2.13',
     'api_version'                  => '2.1.0', // field is no longer used.
     'db_version'                   => 25,
 

package-lock.json

@@ -2552,9 +2552,9 @@
             }
         },
         "node_modules/@rollup/rollup-android-arm-eabi": {
-            "version": "4.40.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.40.2.tgz",
-            "integrity": "sha512-JkdNEq+DFxZfUwxvB58tHMHBHVgX23ew41g1OQinthJ+ryhdRk67O31S7sYw8u2lTjHUPFxwar07BBt1KHp/hg==",
+            "version": "4.41.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.41.0.tgz",
+            "integrity": "sha512-KxN+zCjOYHGwCl4UCtSfZ6jrq/qi88JDUtiEFk8LELEHq2Egfc/FgW+jItZiOLRuQfb/3xJSgFuNPC9jzggX+A==",
             "cpu": [
                 "arm"
             ],
@@ -2566,9 +2566,9 @@
             ]
         },
         "node_modules/@rollup/rollup-android-arm64": {
-            "version": "4.40.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.40.2.tgz",
-            "integrity": "sha512-13unNoZ8NzUmnndhPTkWPWbX3vtHodYmy+I9kuLxN+F+l+x3LdVF7UCu8TWVMt1POHLh6oDHhnOA04n8oJZhBw==",
+            "version": "4.41.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.41.0.tgz",
+            "integrity": "sha512-yDvqx3lWlcugozax3DItKJI5j05B0d4Kvnjx+5mwiUpWramVvmAByYigMplaoAQ3pvdprGCTCE03eduqE/8mPQ==",
             "cpu": [
                 "arm64"
             ],
@@ -2580,9 +2580,9 @@
             ]
         },
         "node_modules/@rollup/rollup-darwin-arm64": {
-            "version": "4.40.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.40.2.tgz",
-            "integrity": "sha512-Gzf1Hn2Aoe8VZzevHostPX23U7N5+4D36WJNHK88NZHCJr7aVMG4fadqkIf72eqVPGjGc0HJHNuUaUcxiR+N/w==",
+            "version": "4.41.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.41.0.tgz",
+            "integrity": "sha512-2KOU574vD3gzcPSjxO0eyR5iWlnxxtmW1F5CkNOHmMlueKNCQkxR6+ekgWyVnz6zaZihpUNkGxjsYrkTJKhkaw==",
             "cpu": [
                 "arm64"
             ],
@@ -2594,9 +2594,9 @@
             ]
         },
         "node_modules/@rollup/rollup-darwin-x64": {
-            "version": "4.40.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.40.2.tgz",
-            "integrity": "sha512-47N4hxa01a4x6XnJoskMKTS8XZ0CZMd8YTbINbi+w03A2w4j1RTlnGHOz/P0+Bg1LaVL6ufZyNprSg+fW5nYQQ==",
+            "version": "4.41.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.41.0.tgz",
+            "integrity": "sha512-gE5ACNSxHcEZyP2BA9TuTakfZvULEW4YAOtxl/A/YDbIir/wPKukde0BNPlnBiP88ecaN4BJI2TtAd+HKuZPQQ==",
             "cpu": [
                 "x64"
             ],
@@ -2608,9 +2608,9 @@
             ]
         },
         "node_modules/@rollup/rollup-freebsd-arm64": {
-            "version": "4.40.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.40.2.tgz",
-            "integrity": "sha512-8t6aL4MD+rXSHHZUR1z19+9OFJ2rl1wGKvckN47XFRVO+QL/dUSpKA2SLRo4vMg7ELA8pzGpC+W9OEd1Z/ZqoQ==",
+            "version": "4.41.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.41.0.tgz",
+            "integrity": "sha512-GSxU6r5HnWij7FoSo7cZg3l5GPg4HFLkzsFFh0N/b16q5buW1NAWuCJ+HMtIdUEi6XF0qH+hN0TEd78laRp7Dg==",
             "cpu": [
                 "arm64"
             ],
@@ -2622,9 +2622,9 @@
             ]
         },
         "node_modules/@rollup/rollup-freebsd-x64": {
-            "version": "4.40.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.40.2.tgz",
-            "integrity": "sha512-C+AyHBzfpsOEYRFjztcYUFsH4S7UsE9cDtHCtma5BK8+ydOZYgMmWg1d/4KBytQspJCld8ZIujFMAdKG1xyr4Q==",
+            "version": "4.41.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.41.0.tgz",
+            "integrity": "sha512-KGiGKGDg8qLRyOWmk6IeiHJzsN/OYxO6nSbT0Vj4MwjS2XQy/5emsmtoqLAabqrohbgLWJ5GV3s/ljdrIr8Qjg==",
             "cpu": [
                 "x64"
             ],
@@ -2636,9 +2636,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-            "version": "4.40.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.40.2.tgz",
-            "integrity": "sha512-de6TFZYIvJwRNjmW3+gaXiZ2DaWL5D5yGmSYzkdzjBDS3W+B9JQ48oZEsmMvemqjtAFzE16DIBLqd6IQQRuG9Q==",
+            "version": "4.41.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.41.0.tgz",
+            "integrity": "sha512-46OzWeqEVQyX3N2/QdiU/CMXYDH/lSHpgfBkuhl3igpZiaB3ZIfSjKuOnybFVBQzjsLwkus2mjaESy8H41SzvA==",
             "cpu": [
                 "arm"
             ],
@@ -2650,9 +2650,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-            "version": "4.40.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.40.2.tgz",
-            "integrity": "sha512-urjaEZubdIkacKc930hUDOfQPysezKla/O9qV+O89enqsqUmQm8Xj8O/vh0gHg4LYfv7Y7UsE3QjzLQzDYN1qg==",
+            "version": "4.41.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.41.0.tgz",
+            "integrity": "sha512-lfgW3KtQP4YauqdPpcUZHPcqQXmTmH4nYU0cplNeW583CMkAGjtImw4PKli09NFi2iQgChk4e9erkwlfYem6Lg==",
             "cpu": [
                 "arm"
             ],
@@ -2664,9 +2664,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm64-gnu": {
-            "version": "4.40.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.40.2.tgz",
-            "integrity": "sha512-KlE8IC0HFOC33taNt1zR8qNlBYHj31qGT1UqWqtvR/+NuCVhfufAq9fxO8BMFC22Wu0rxOwGVWxtCMvZVLmhQg==",
+            "version": "4.41.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.41.0.tgz",
+            "integrity": "sha512-nn8mEyzMbdEJzT7cwxgObuwviMx6kPRxzYiOl6o/o+ChQq23gfdlZcUNnt89lPhhz3BYsZ72rp0rxNqBSfqlqw==",
             "cpu": [
                 "arm64"
             ],
@@ -2678,9 +2678,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm64-musl": {
-            "version": "4.40.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.40.2.tgz",
-            "integrity": "sha512-j8CgxvfM0kbnhu4XgjnCWJQyyBOeBI1Zq91Z850aUddUmPeQvuAy6OiMdPS46gNFgy8gN1xkYyLgwLYZG3rBOg==",
+            "version": "4.41.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.41.0.tgz",
+            "integrity": "sha512-l+QK99je2zUKGd31Gh+45c4pGDAqZSuWQiuRFCdHYC2CSiO47qUWsCcenrI6p22hvHZrDje9QjwSMAFL3iwXwQ==",
             "cpu": [
                 "arm64"
             ],
@@ -2692,9 +2692,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-loongarch64-gnu": {
-            "version": "4.40.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.40.2.tgz",
-            "integrity": "sha512-Ybc/1qUampKuRF4tQXc7G7QY9YRyeVSykfK36Y5Qc5dmrIxwFhrOzqaVTNoZygqZ1ZieSWTibfFhQ5qK8jpWxw==",
+            "version": "4.41.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.41.0.tgz",
+            "integrity": "sha512-WbnJaxPv1gPIm6S8O/Wg+wfE/OzGSXlBMbOe4ie+zMyykMOeqmgD1BhPxZQuDqwUN+0T/xOFtL2RUWBspnZj3w==",
             "cpu": [
                 "loong64"
             ],
@@ -2706,9 +2706,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-            "version": "4.40.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.40.2.tgz",
-            "integrity": "sha512-3FCIrnrt03CCsZqSYAOW/k9n625pjpuMzVfeI+ZBUSDT3MVIFDSPfSUgIl9FqUftxcUXInvFah79hE1c9abD+Q==",
+            "version": "4.41.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.41.0.tgz",
+            "integrity": "sha512-eRDWR5t67/b2g8Q/S8XPi0YdbKcCs4WQ8vklNnUYLaSWF+Cbv2axZsp4jni6/j7eKvMLYCYdcsv8dcU+a6QNFg==",
             "cpu": [
                 "ppc64"
             ],
@@ -2720,9 +2720,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-            "version": "4.40.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.40.2.tgz",
-            "integrity": "sha512-QNU7BFHEvHMp2ESSY3SozIkBPaPBDTsfVNGx3Xhv+TdvWXFGOSH2NJvhD1zKAT6AyuuErJgbdvaJhYVhVqrWTg==",
+            "version": "4.41.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.41.0.tgz",
+            "integrity": "sha512-TWrZb6GF5jsEKG7T1IHwlLMDRy2f3DPqYldmIhnA2DVqvvhY2Ai184vZGgahRrg8k9UBWoSlHv+suRfTN7Ua4A==",
             "cpu": [
                 "riscv64"
             ],
@@ -2734,9 +2734,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-riscv64-musl": {
-            "version": "4.40.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.40.2.tgz",
-            "integrity": "sha512-5W6vNYkhgfh7URiXTO1E9a0cy4fSgfE4+Hl5agb/U1sa0kjOLMLC1wObxwKxecE17j0URxuTrYZZME4/VH57Hg==",
+            "version": "4.41.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.41.0.tgz",
+            "integrity": "sha512-ieQljaZKuJpmWvd8gW87ZmSFwid6AxMDk5bhONJ57U8zT77zpZ/TPKkU9HpnnFrM4zsgr4kiGuzbIbZTGi7u9A==",
             "cpu": [
                 "riscv64"
             ],
@@ -2748,9 +2748,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-s390x-gnu": {
-            "version": "4.40.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.40.2.tgz",
-            "integrity": "sha512-B7LKIz+0+p348JoAL4X/YxGx9zOx3sR+o6Hj15Y3aaApNfAshK8+mWZEf759DXfRLeL2vg5LYJBB7DdcleYCoQ==",
+            "version": "4.41.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.41.0.tgz",
+            "integrity": "sha512-/L3pW48SxrWAlVsKCN0dGLB2bi8Nv8pr5S5ocSM+S0XCn5RCVCXqi8GVtHFsOBBCSeR+u9brV2zno5+mg3S4Aw==",
             "cpu": [
                 "s390x"
             ],
@@ -2762,9 +2762,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-x64-gnu": {
-            "version": "4.40.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.40.2.tgz",
-            "integrity": "sha512-lG7Xa+BmBNwpjmVUbmyKxdQJ3Q6whHjMjzQplOs5Z+Gj7mxPtWakGHqzMqNER68G67kmCX9qX57aRsW5V0VOng==",
+            "version": "4.41.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.41.0.tgz",
+            "integrity": "sha512-XMLeKjyH8NsEDCRptf6LO8lJk23o9wvB+dJwcXMaH6ZQbbkHu2dbGIUindbMtRN6ux1xKi16iXWu6q9mu7gDhQ==",
             "cpu": [
                 "x64"
             ],
@@ -2776,9 +2776,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-x64-musl": {
-            "version": "4.40.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.40.2.tgz",
-            "integrity": "sha512-tD46wKHd+KJvsmije4bUskNuvWKFcTOIM9tZ/RrmIvcXnbi0YK/cKS9FzFtAm7Oxi2EhV5N2OpfFB348vSQRXA==",
+            "version": "4.41.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.41.0.tgz",
+            "integrity": "sha512-m/P7LycHZTvSQeXhFmgmdqEiTqSV80zn6xHaQ1JSqwCtD1YGtwEK515Qmy9DcB2HK4dOUVypQxvhVSy06cJPEg==",
             "cpu": [
                 "x64"
             ],
@@ -2790,9 +2790,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-arm64-msvc": {
-            "version": "4.40.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.40.2.tgz",
-            "integrity": "sha512-Bjv/HG8RRWLNkXwQQemdsWw4Mg+IJ29LK+bJPW2SCzPKOUaMmPEppQlu/Fqk1d7+DX3V7JbFdbkh/NMmurT6Pg==",
+            "version": "4.41.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.41.0.tgz",
+            "integrity": "sha512-4yodtcOrFHpbomJGVEqZ8fzD4kfBeCbpsUy5Pqk4RluXOdsWdjLnjhiKy2w3qzcASWd04fp52Xz7JKarVJ5BTg==",
             "cpu": [
                 "arm64"
             ],
@@ -2804,9 +2804,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-ia32-msvc": {
-            "version": "4.40.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.40.2.tgz",
-            "integrity": "sha512-dt1llVSGEsGKvzeIO76HToiYPNPYPkmjhMHhP00T9S4rDern8P2ZWvWAQUEJ+R1UdMWJ/42i/QqJ2WV765GZcA==",
+            "version": "4.41.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.41.0.tgz",
+            "integrity": "sha512-tmazCrAsKzdkXssEc65zIE1oC6xPHwfy9d5Ta25SRCDOZS+I6RypVVShWALNuU9bxIfGA0aqrmzlzoM5wO5SPQ==",
             "cpu": [
                 "ia32"
             ],
@@ -2818,9 +2818,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-x64-msvc": {
-            "version": "4.40.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.40.2.tgz",
-            "integrity": "sha512-bwspbWB04XJpeElvsp+DCylKfF4trJDa2Y9Go8O6A7YLX2LIKGcNK/CYImJN6ZP4DcuOHB4Utl3iCbnR62DudA==",
+            "version": "4.41.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.41.0.tgz",
+            "integrity": "sha512-h1J+Yzjo/X+0EAvR2kIXJDuTuyT7drc+t2ALY0nIcGPbTatNOf0VWdhEA2Z4AAjv6X1NJV7SYo5oCTYRJhSlVA==",
             "cpu": [
                 "x64"
             ],
@@ -2969,9 +2969,9 @@
             "license": "MIT"
         },
         "node_modules/@types/express": {
-            "version": "4.17.21",
-            "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.21.tgz",
-            "integrity": "sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==",
+            "version": "4.17.22",
+            "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.22.tgz",
+            "integrity": "sha512-eZUmSnhRX9YRSkplpz0N+k6NljUUn5l3EWZIKZvYzhvMphEuNiyyy1viH/ejgt66JWgALwC/gtSUAeQKtSwW/w==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -3108,9 +3108,9 @@
             "license": "MIT"
         },
         "node_modules/@types/node": {
-            "version": "22.15.17",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.17.tgz",
-            "integrity": "sha512-wIX2aSZL5FE+MR0JlvF87BNVrtFWf6AE6rxSE9X7OwnVvoyCQjpzSRJ+M87se/4QCkCiebQAqrJ0y6fwIyi7nw==",
+            "version": "22.15.21",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.21.tgz",
+            "integrity": "sha512-EV/37Td6c+MgKAbkcLG6vqZ2zEYHD7bvSrzqqs2RIhbA6w3x+Dqz8MZM3sP6kGTeLrdoOgKZe+Xja7tUB2DNkQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -3135,9 +3135,9 @@
             "license": "MIT"
         },
         "node_modules/@types/qs": {
-            "version": "6.9.18",
-            "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.18.tgz",
-            "integrity": "sha512-kK7dgTYDyGqS+e2Q4aK9X3D7q234CIZ1Bv0q/7Z5IwRDoADNU81xXJK/YVyLbLTZCoIwUoDoffFeF+p/eIklAA==",
+            "version": "6.14.0",
+            "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.14.0.tgz",
+            "integrity": "sha512-eOunJqu0K1923aExK6y8p6fsihYEn/BYuQ4g0CxAAgFc4b/ZLN4CrsRZ55srTdqoiLzU2B2evC+apEIxprEzkQ==",
             "dev": true,
             "license": "MIT"
         },
@@ -3216,57 +3216,57 @@
             }
         },
         "node_modules/@vue/compiler-core": {
-            "version": "3.5.13",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.13.tgz",
-            "integrity": "sha512-oOdAkwqUfW1WqpwSYJce06wvt6HljgY3fGeM9NcVA1HaYOij3mZG9Rkysn0OHuyUAGMbEbARIpsG+LPVlBJ5/Q==",
+            "version": "3.5.14",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.14.tgz",
+            "integrity": "sha512-k7qMHMbKvoCXIxPhquKQVw3Twid3Kg4s7+oYURxLGRd56LiuHJVrvFKI4fm2AM3c8apqODPfVJGoh8nePbXMRA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@babel/parser": "^7.25.3",
-                "@vue/shared": "3.5.13",
+                "@babel/parser": "^7.27.2",
+                "@vue/shared": "3.5.14",
                 "entities": "^4.5.0",
                 "estree-walker": "^2.0.2",
-                "source-map-js": "^1.2.0"
+                "source-map-js": "^1.2.1"
             }
         },
         "node_modules/@vue/compiler-dom": {
-            "version": "3.5.13",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.13.tgz",
-            "integrity": "sha512-ZOJ46sMOKUjO3e94wPdCzQ6P1Lx/vhp2RSvfaab88Ajexs0AHeV0uasYhi99WPaogmBlRHNRuly8xV75cNTMDA==",
+            "version": "3.5.14",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.14.tgz",
+            "integrity": "sha512-1aOCSqxGOea5I80U2hQJvXYpPm/aXo95xL/m/mMhgyPUsKe9jhjwWpziNAw7tYRnbz1I61rd9Mld4W9KmmRoug==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@vue/compiler-core": "3.5.13",
-                "@vue/shared": "3.5.13"
+                "@vue/compiler-core": "3.5.14",
+                "@vue/shared": "3.5.14"
             }
         },
         "node_modules/@vue/compiler-sfc": {
-            "version": "3.5.13",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.13.tgz",
-            "integrity": "sha512-6VdaljMpD82w6c2749Zhf5T9u5uLBWKnVue6XWxprDobftnletJ8+oel7sexFfM3qIxNmVE7LSFGTpv6obNyaQ==",
+            "version": "3.5.14",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.14.tgz",
+            "integrity": "sha512-9T6m/9mMr81Lj58JpzsiSIjBgv2LiVoWjIVa7kuXHICUi8LiDSIotMpPRXYJsXKqyARrzjT24NAwttrMnMaCXA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@babel/parser": "^7.25.3",
-                "@vue/compiler-core": "3.5.13",
-                "@vue/compiler-dom": "3.5.13",
-                "@vue/compiler-ssr": "3.5.13",
-                "@vue/shared": "3.5.13",
+                "@babel/parser": "^7.27.2",
+                "@vue/compiler-core": "3.5.14",
+                "@vue/compiler-dom": "3.5.14",
+                "@vue/compiler-ssr": "3.5.14",
+                "@vue/shared": "3.5.14",
                 "estree-walker": "^2.0.2",
-                "magic-string": "^0.30.11",
-                "postcss": "^8.4.48",
-                "source-map-js": "^1.2.0"
+                "magic-string": "^0.30.17",
+                "postcss": "^8.5.3",
+                "source-map-js": "^1.2.1"
             }
         },
         "node_modules/@vue/compiler-ssr": {
-            "version": "3.5.13",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.13.tgz",
-            "integrity": "sha512-wMH6vrYHxQl/IybKJagqbquvxpWCuVYpoUJfCqFZwa/JY1GdATAQ+TgVtgrwwMZ0D07QhA99rs/EAAWfvG6KpA==",
+            "version": "3.5.14",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.14.tgz",
+            "integrity": "sha512-Y0G7PcBxr1yllnHuS/NxNCSPWnRGH4Ogrp0tsLA5QemDZuJLs99YjAKQ7KqkHE0vCg4QTKlQzXLKCMF7WPSl7Q==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@vue/compiler-dom": "3.5.13",
-                "@vue/shared": "3.5.13"
+                "@vue/compiler-dom": "3.5.14",
+                "@vue/shared": "3.5.14"
             }
         },
         "node_modules/@vue/component-compiler-utils": {
@@ -3348,9 +3348,9 @@
             "license": "MIT"
         },
         "node_modules/@vue/shared": {
-            "version": "3.5.13",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.13.tgz",
-            "integrity": "sha512-/hnE/qP5ZoGpol0a5mDi45bOd7t3tjYJBjsgCsivow7D48cJeV5l05RD82lPqi7gRiphZM37rnhW1l6ZoCNNnQ==",
+            "version": "3.5.14",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.14.tgz",
+            "integrity": "sha512-oXTwNxVfc9EtP1zzXAlSlgARLXNC84frFYkS0HHz0h3E4WZSP9sywqjqzGCP9Y34M8ipNmd380pVgmMuwELDyQ==",
             "dev": true,
             "license": "MIT"
         },
@@ -4133,9 +4133,9 @@
             "license": "MIT"
         },
         "node_modules/bootstrap5-tags": {
-            "version": "1.7.13",
-            "resolved": "https://registry.npmjs.org/bootstrap5-tags/-/bootstrap5-tags-1.7.13.tgz",
-            "integrity": "sha512-b9N7yVTSz8zzDMLONPcB9oesF9JtxXlksFOc7BtX/3P1iMlIAXHWnSQ5Qm/5mzuCWEvY43hLpdilySpPf7rvOQ==",
+            "version": "1.7.15",
+            "resolved": "https://registry.npmjs.org/bootstrap5-tags/-/bootstrap5-tags-1.7.15.tgz",
+            "integrity": "sha512-UnHmJC9p0ei5rZG1/5qOFBoKFJ+ZyXiVTi1+fJnN/+6d/htZZ9M4cALxsjxQR53K2PrOSApMBOR2QZDbIkdK+g==",
             "license": "MIT"
         },
         "node_modules/brace-expansion": {
@@ -4417,9 +4417,9 @@
             }
         },
         "node_modules/caniuse-lite": {
-            "version": "1.0.30001717",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001717.tgz",
-            "integrity": "sha512-auPpttCq6BDEG8ZAuHJIplGw6GODhjw+/11e7IjpnYCxZcW/ONgPs0KVBJ0d1bY3e2+7PRe5RCLyP+PfwVgkYw==",
+            "version": "1.0.30001718",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001718.tgz",
+            "integrity": "sha512-AflseV1ahcSunK53NfEs9gFWgOEmzr0f+kaMFA4xiLZlr9Hzt7HxcSpIFcnNCUkz6R6dWKa54rUz3HUmI3nVcw==",
             "dev": true,
             "funding": [
                 {
@@ -5285,9 +5285,9 @@
             "license": "MIT"
         },
         "node_modules/debug": {
-            "version": "4.4.0",
-            "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
-            "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
+            "version": "4.4.1",
+            "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
+            "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -5632,9 +5632,9 @@
             "license": "MIT"
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.5.151",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.151.tgz",
-            "integrity": "sha512-Rl6uugut2l9sLojjS4H4SAr3A4IgACMLgpuEMPYCVcKydzfyPrn5absNRju38IhQOf/NwjJY8OGWjlteqYeBCA==",
+            "version": "1.5.157",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.157.tgz",
+            "integrity": "sha512-/0ybgsQd1muo8QlnuTpKwtl0oX5YMlUGbm8xyqgDU00motRkKFFbUJySAQBWcY79rVqNLWIWa87BGVGClwAB2w==",
             "dev": true,
             "license": "ISC"
         },
@@ -6976,9 +6976,9 @@
             }
         },
         "node_modules/i18next": {
-            "version": "25.1.2",
-            "resolved": "https://registry.npmjs.org/i18next/-/i18next-25.1.2.tgz",
-            "integrity": "sha512-SP63m8LzdjkrAjruH7SCI3ndPSgjt4/wX7ouUUOzCW/eY+HzlIo19IQSfYA9X3qRiRP1SYtaTsg/Oz/PGsfD8w==",
+            "version": "25.2.0",
+            "resolved": "https://registry.npmjs.org/i18next/-/i18next-25.2.0.tgz",
+            "integrity": "sha512-ERhJICsxkw1vE7G0lhCUYv4ZxdBEs03qblt1myJs94rYRK9loJF3xDj8mgQz3LmCyp0yYrNjbN/1/GWZTZDGCA==",
             "funding": [
                 {
                     "type": "individual",
@@ -6995,7 +6995,7 @@
             ],
             "license": "MIT",
             "dependencies": {
-                "@babel/runtime": "^7.26.10"
+                "@babel/runtime": "^7.27.1"
             },
             "peerDependencies": {
                 "typescript": "^5"
@@ -9973,9 +9973,9 @@
             }
         },
         "node_modules/rollup": {
-            "version": "4.40.2",
-            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.40.2.tgz",
-            "integrity": "sha512-tfUOg6DTP4rhQ3VjOO6B4wyrJnGOX85requAXvqYTHsOgb2TFJdZ3aWpT8W2kPoypSGP7dZUyzxJ9ee4buM5Fg==",
+            "version": "4.41.0",
+            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.41.0.tgz",
+            "integrity": "sha512-HqMFpUbWlf/tvcxBFNKnJyzc7Lk+XO3FGc3pbNBLqEbOz0gPLRgcrlS3UF4MfUrVlstOaP/q0kM6GVvi+LrLRg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -9989,26 +9989,26 @@
                 "npm": ">=8.0.0"
             },
             "optionalDependencies": {
-                "@rollup/rollup-android-arm-eabi": "4.40.2",
-                "@rollup/rollup-android-arm64": "4.40.2",
-                "@rollup/rollup-darwin-arm64": "4.40.2",
-                "@rollup/rollup-darwin-x64": "4.40.2",
-                "@rollup/rollup-freebsd-arm64": "4.40.2",
-                "@rollup/rollup-freebsd-x64": "4.40.2",
-                "@rollup/rollup-linux-arm-gnueabihf": "4.40.2",
-                "@rollup/rollup-linux-arm-musleabihf": "4.40.2",
-                "@rollup/rollup-linux-arm64-gnu": "4.40.2",
-                "@rollup/rollup-linux-arm64-musl": "4.40.2",
-                "@rollup/rollup-linux-loongarch64-gnu": "4.40.2",
-                "@rollup/rollup-linux-powerpc64le-gnu": "4.40.2",
-                "@rollup/rollup-linux-riscv64-gnu": "4.40.2",
-                "@rollup/rollup-linux-riscv64-musl": "4.40.2",
-                "@rollup/rollup-linux-s390x-gnu": "4.40.2",
-                "@rollup/rollup-linux-x64-gnu": "4.40.2",
-                "@rollup/rollup-linux-x64-musl": "4.40.2",
-                "@rollup/rollup-win32-arm64-msvc": "4.40.2",
-                "@rollup/rollup-win32-ia32-msvc": "4.40.2",
-                "@rollup/rollup-win32-x64-msvc": "4.40.2",
+                "@rollup/rollup-android-arm-eabi": "4.41.0",
+                "@rollup/rollup-android-arm64": "4.41.0",
+                "@rollup/rollup-darwin-arm64": "4.41.0",
+                "@rollup/rollup-darwin-x64": "4.41.0",
+                "@rollup/rollup-freebsd-arm64": "4.41.0",
+                "@rollup/rollup-freebsd-x64": "4.41.0",
+                "@rollup/rollup-linux-arm-gnueabihf": "4.41.0",
+                "@rollup/rollup-linux-arm-musleabihf": "4.41.0",
+                "@rollup/rollup-linux-arm64-gnu": "4.41.0",
+                "@rollup/rollup-linux-arm64-musl": "4.41.0",
+                "@rollup/rollup-linux-loongarch64-gnu": "4.41.0",
+                "@rollup/rollup-linux-powerpc64le-gnu": "4.41.0",
+                "@rollup/rollup-linux-riscv64-gnu": "4.41.0",
+                "@rollup/rollup-linux-riscv64-musl": "4.41.0",
+                "@rollup/rollup-linux-s390x-gnu": "4.41.0",
+                "@rollup/rollup-linux-x64-gnu": "4.41.0",
+                "@rollup/rollup-linux-x64-musl": "4.41.0",
+                "@rollup/rollup-win32-arm64-msvc": "4.41.0",
+                "@rollup/rollup-win32-ia32-msvc": "4.41.0",
+                "@rollup/rollup-win32-x64-msvc": "4.41.0",
                 "fsevents": "~2.3.2"
             }
         },
@@ -10064,9 +10064,9 @@
             "license": "MIT"
         },
         "node_modules/sass": {
-            "version": "1.88.0",
-            "resolved": "https://registry.npmjs.org/sass/-/sass-1.88.0.tgz",
-            "integrity": "sha512-sF6TWQqjFvr4JILXzG4ucGOLELkESHL+I5QJhh7CNaE+Yge0SI+ehCatsXhJ7ymU1hAFcIS3/PBpjdIbXoyVbg==",
+            "version": "1.89.0",
+            "resolved": "https://registry.npmjs.org/sass/-/sass-1.89.0.tgz",
+            "integrity": "sha512-ld+kQU8YTdGNjOLfRWBzewJpU5cwEv/h5yyqlSeJcj6Yh8U4TDA9UA5FPicqDz/xgRPWRSYIQNiFks21TbA9KQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -10155,9 +10155,9 @@
             }
         },
         "node_modules/semver": {
-            "version": "7.7.1",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
-            "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
+            "version": "7.7.2",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
+            "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
             "dev": true,
             "license": "ISC",
             "bin": {
@@ -10848,9 +10848,9 @@
             }
         },
         "node_modules/tapable": {
-            "version": "2.2.1",
-            "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
-            "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
+            "version": "2.2.2",
+            "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.2.tgz",
+            "integrity": "sha512-Re10+NauLTMCudc7T5WLFLAwDhQ0JWdrMK+9B2M8zR5hRExKmsRDCBA7/aV/pNJFltmBFO5BAMlQFi/vq3nKOg==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -10858,14 +10858,14 @@
             }
         },
         "node_modules/terser": {
-            "version": "5.39.0",
-            "resolved": "https://registry.npmjs.org/terser/-/terser-5.39.0.tgz",
-            "integrity": "sha512-LBAhFyLho16harJoWMg/nZsQYgTrg5jXOn2nCYjRUcZZEdE3qa2zb8QEDRUGVZBW4rlazf2fxkg8tztybTaqWw==",
+            "version": "5.39.2",
+            "resolved": "https://registry.npmjs.org/terser/-/terser-5.39.2.tgz",
+            "integrity": "sha512-yEPUmWve+VA78bI71BW70Dh0TuV4HHd+I5SHOAfS1+QBOmvmCiiffgjR8ryyEd3KIfvPGFqoADt8LdQ6XpXIvg==",
             "dev": true,
             "license": "BSD-2-Clause",
             "dependencies": {
                 "@jridgewell/source-map": "^0.3.3",
-                "acorn": "^8.8.2",
+                "acorn": "^8.14.0",
                 "commander": "^2.20.0",
                 "source-map-support": "~0.5.20"
             },
@@ -11620,9 +11620,9 @@
             }
         },
         "node_modules/watchpack": {
-            "version": "2.4.2",
-            "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.2.tgz",
-            "integrity": "sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==",
+            "version": "2.4.4",
+            "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.4.tgz",
+            "integrity": "sha512-c5EGNOiyxxV5qmTtAB7rbiXxi1ooX1pQKMLX/MIabJjRA0SJBQOjKF+KSVfHkr9U1cADPon0mRiVe/riyaiDUA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -11650,9 +11650,9 @@
             "license": "BSD-2-Clause"
         },
         "node_modules/webpack": {
-            "version": "5.99.8",
-            "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.99.8.tgz",
-            "integrity": "sha512-lQ3CPiSTpfOnrEGeXDwoq5hIGzSjmwD72GdfVzF7CQAI7t47rJG9eDWvcEkEn3CUQymAElVvDg3YNTlCYj+qUQ==",
+            "version": "5.99.9",
+            "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.99.9.tgz",
+            "integrity": "sha512-brOPwM3JnmOa+7kd3NsmOUOwbDAj8FT9xDsG3IW0MgbN9yZV7Oi/s/+MNQ/EcSMqw7qfoRyXPoeEWT8zLVdVGg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -12081,9 +12081,9 @@
             }
         },
         "node_modules/webpack/node_modules/webpack-sources": {
-            "version": "3.2.3",
-            "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
-            "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
+            "version": "3.3.0",
+            "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.3.0.tgz",
+            "integrity": "sha512-77R0RDmJfj9dyv5p3bM5pOHa+X8/ZkO9c7kpDstigkC4nIDobadsfSGCwB4bKhMVxqAok8tajaoR8rirM7+VFQ==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -12242,16 +12242,16 @@
             "license": "ISC"
         },
         "node_modules/yaml": {
-            "version": "2.7.1",
-            "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.7.1.tgz",
-            "integrity": "sha512-10ULxpnOCQXxJvBgxsn9ptjq6uviG/htZKk9veJGhlqn3w/DxQ631zFF+nlQXLwmImeS5amR2dl2U8sg6U9jsQ==",
+            "version": "2.8.0",
+            "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.0.tgz",
+            "integrity": "sha512-4lLa/EcQCB0cJkyts+FpIRx5G/llPxfP6VQU5KByHEhLxY3IJCH0f0Hy1MHI8sClTvsIb8qwRJ6R/ZdlDJ/leQ==",
             "dev": true,
             "license": "ISC",
             "bin": {
                 "yaml": "bin.mjs"
             },
             "engines": {
-                "node": ">= 14"
+                "node": ">= 14.6"
             }
         },
         "node_modules/yargs": {

resources/assets/v1/src/components/transactions/EditTransaction.vue

@@ -244,7 +244,7 @@
                     </div>
                     <div class="box-footer">
                         <div class="btn-group">
-                            <button id="submitButton" class="btn btn-success" @click="submit">{{
+                            <button id="submitButton" ref="submitButtonRef" class="btn btn-success" @click="submit">{{
                                     $t('firefly.update_transaction')
                                 }}
                             </button>
@@ -337,6 +337,7 @@ export default {
                 this.transactions[index].destination_account.name = model;
                 return;
             }
+            // console.log('selectedDestinationAccount');
             this.transactions[index].destination_account = {
                 id: model.id,
                 name: model.name,
@@ -353,6 +354,7 @@ export default {
                 this.transactions[index].destination_account.currency_code = model.account_currency_code;
                 this.transactions[index].destination_account.currency_decimal_places = model.account_currency_decimal_places;
             }
+            // console.log('Selected destination account currency ID  = ' + this.transactions[index].destination_account.currency_id);
         },
         clearSource(index) {
             // reset source account:
@@ -540,7 +542,9 @@ export default {
                     allowed_types: window.expectedSourceTypes.destination[this.ucFirst(transaction.type)]
                 }
             };
+            // console.log('Source currency id is      ' + result.source_account.currency_id);
             // console.log('Destination currency id is ' + result.destination_account.currency_id);
+
             // if transaction type is transfer, the destination currency_id etc. MUST match the actual account currency info.
             // OR if the transaction type is a withdrawal, and the destination account is a liability account, same as above.
             if (
@@ -553,6 +557,16 @@ export default {
                 result.destination_account.currency_decimal_places = transaction.foreign_currency_decimal_places;
                 // console.log('Set destination currency_id to ' + result.destination_account.currency_id);
             }
+            // if the transaction type is a deposit, but the source account is a liability, the source
+            // account currency must not be overruled.
+
+            if('deposit' === transaction.type && ['Loan', 'Debt', 'Mortgage'].includes(transaction.source_type)) {
+                // console.log('Overrule for deposit from liability to ' + transaction.foreign_currency_id);
+                result.destination_account.currency_id = transaction.foreign_currency_id;
+                result.destination_account.currency_name = transaction.foreign_currency_name;
+                result.destination_account.currency_code = transaction.foreign_currency_code;
+                result.destination_account.currency_decimal_places = transaction.foreign_currency_decimal_places;
+            }
 
 
             if (null === transaction.foreign_amount) {
@@ -611,7 +625,12 @@ export default {
             if ('deposit' === transactionType) {
                 currencyId = this.transactions[0].destination_account.currency_id;
             }
-            // console.log('Overruled currency ID to ' + currencyId);
+            // if transaction type is deposit BUT the source account is a liability, the currency ID must be the SOURCE account ID.
+            if ('deposit' === transactionType && ['Loan', 'Debt', 'Mortgage'].includes(firstSource)) {
+                // console.log('Overruled currency ID to ' + this.transactions[0].source_account.currency_id);
+                currencyId = this.transactions[0].source_account.currency_id;
+            }
+            // console.log('Final currency ID = ' + currencyId);
 
             for (let key in this.transactions) {
                 if (this.transactions.hasOwnProperty(key) && /^0$|^[1-9]\d*$/.test(key) && key <= 4294967294) {
@@ -691,6 +710,7 @@ export default {
                 foreignCurrency = row.foreign_amount.currency_id;
             }
             if (foreignCurrency === row.currency_id) {
+                // console.log('reset foreign currencyto NULL because ' + foreignCurrency + ' = ' + row.currency_id);
                 foreignAmount = null;
                 foreignCurrency = null;
             }
@@ -783,7 +803,7 @@ export default {
         },
         submit: function (e) {
             // console.log('Submit!');
-            let button = $(e.currentTarget);
+            let button = $('#submitButton');
             button.prop("disabled", true);
 
             const page = window.location.href.split('/');
@@ -815,6 +835,7 @@ export default {
                 // something something render errors.
                 this.parseErrors(error.response.data);
                 // something.
+                button.removeAttr('disabled');
             });
             if (e) {
                 e.preventDefault();

resources/assets/v1/src/locales/es.json

@@ -31,7 +31,7 @@
         "apply_rules_checkbox": "Aplicar reglas",
         "fire_webhooks_checkbox": "Disparar webhooks",
         "no_budget_pointer": "Parece que a\u00fan no tienes presupuestos. Debes crear algunos en la p\u00e1gina <a href=\"budgets\">presupuestos<\/a>. Los presupuestos pueden ayudarle a realizar un seguimiento de los gastos.",
-        "no_bill_pointer": "You seem to have no subscription yet. You should create some on the <a href=\"subscriptions\">subscription<\/a>-page. Subscriptions can help you keep track of expenses.",
+        "no_bill_pointer": "Parece que a\u00fan no tienes suscripci\u00f3n. Deber\u00edas crear algunas en la p\u00e1gina <a href=\"subscriptions\">suscripci\u00f3n<\/a>. Las suscripciones pueden ayudarte a llevar un seguimiento de los gastos.",
         "source_account": "Cuenta origen",
         "hidden_fields_preferences": "Puede habilitar m\u00e1s opciones de transacci\u00f3n en sus <a href=\"preferences\">ajustes <\/a>.",
         "destination_account": "Cuenta destino",
@@ -169,7 +169,7 @@
         "webhook_delivery": "Entrega",
         "from_currency_to_currency": "{from} &rarr; {to}",
         "to_currency_from_currency": "{to} &rarr; {from}",
-        "rate": "Rate"
+        "rate": "Denos su evaluaci\u00f3n"
     },
     "list": {
         "title": "T\u00edtulo",

resources/assets/v1/src/locales/zh-tw.json

@@ -183,6 +183,6 @@
     },
     "config": {
         "html_language": "zh-tw",
-        "date_time_fns": "YYYY\u5e74 M\u6708 D\u65e5 dddd \u65bc HH:mm:ss"
+        "date_time_fns": "yyyy\u5e74 M\u6708 D\u65e5 dddd \u65bc HH:mm:ss"
     }
 }

resources/lang/en_US/firefly.php

@@ -2131,7 +2131,7 @@ return [
     'bulk_edit'                                               => 'Edit selected in bulk',
     'mass_delete'                                             => 'Delete selected',
     'cannot_edit_other_fields'                                => 'You cannot mass-edit other fields than the ones here, because there is no room to show them. Please follow the link and edit them by one-by-one, if you need to edit these fields.',
-    'cannot_change_amount_reconciled'                         => 'You can\'t change the amount of reconciled transactions.',
+    'cannot_change_amount_reconciled'                         => 'You can\'t change the amount or account(s) of reconciled transactions.',
     'no_budget'                                               => '(no budget)',
     'no_bill'                                                 => '(no subscription)',
     'account_per_budget'                                      => 'Account per budget',

resources/lang/en_US/rules.php

@@ -38,6 +38,7 @@ return [
     'is_already_withdrawal'                         => 'This transaction is already a withdrawal',
     'is_already_deposit'                            => 'This transaction is already a deposit',
     'is_already_transfer'                           => 'This transaction is already a transfer',
+    'no_destination'                                => 'Could not find or create destination account ":name"',
     'is_not_transfer'                               => 'This transaction is not a transfer',
     'complex_error'                                 => 'Something complicated went wrong. Sorry about that. Please inspect the logs of Firefly III',
     'no_valid_opposing'                             => 'Conversion failed because there is no valid account named ":account"',

resources/views/javascript/variables.twig

@@ -55,9 +55,9 @@ var edit_selected_txt = "{{ trans('firefly.mass_edit')|escape('js') }}";
 var edit_bulk_selected_txt = "{{ trans('firefly.bulk_edit')|escape('js') }}";
 var delete_selected_txt = "{{ trans('firefly.mass_delete')|escape('js') }}";
 
-var mass_edit_url   = '{{ route('transactions.mass.edit', ['0']) }}';
-var bulk_edit_url   = '{{ route('transactions.bulk.edit', ['0']) }}';
-var mass_delete_url = '{{ route('transactions.mass.delete', ['0']) }}';
+var mass_edit_url   = '{{ route('transactions.mass.edit', ['']) }}';
+var bulk_edit_url   = '{{ route('transactions.bulk.edit', ['']) }}';
+var mass_delete_url = '{{ route('transactions.mass.delete', ['']) }}';
 
 // for demo:
 var nextLabel = "{{ trans('firefly.intro_next_label')|escape('js') }}";

resources/views/reports/partials/balance.twig

@@ -38,7 +38,7 @@
                 {% endfor %}
                 <td style="text-align: right;">
                     {% for sum in report.sums[budget.budget_id] %}
-                        {{ formatAmountBySymbol(sum.sum, sum.currency_symbol, sum.currency_decimal_places) }} <span class="fa fa-fw fa-info-circle text-muted"></span>
+                        {{ formatAmountBySymbol(sum.sum, sum.currency_symbol, sum.currency_decimal_places) }}
                         <br/>
                     {% endfor %}
                 </td>

resources/views/transactions/mass/edit.twig

@@ -98,7 +98,10 @@
                                     <!-- Source: {{ journal.source_account_name }} ({{ journal.source_account_id }}) -->
                                     <!-- Destination: {{ journal.destination_account_name }} ({{ journal.destination_account_id }}) -->
                                     <td style="position: relative;">
-
+                                        {% if journal.reconciled == true %}
+                                            <a href="{{ route('accounts.show', [journal.source_account_id]) }}">{{ journal.source_account_name }}</a>
+                                        {% endif %}
+                                        {% if journal.reconciled == false %}
                                         {# SOURCE ACCOUNT ID FOR TRANSFER OR WITHDRAWAL #}
                                         {% if journal.transaction_type_type == 'Transfer' or journal.transaction_type_type == 'Withdrawal' %}
                                             <select class="form-control input-sm" name="source_id[{{ journal.transaction_journal_id }}]">
@@ -117,9 +120,13 @@
                                                    name="source_name[{{ journal.transaction_journal_id }}]" type="text"
                                                    value="{% if journal.source_type != 'Cash account' %}{{ journal.source_account_name }}{% endif %}">
                                         {% endif %}
+                                        {% endif %}
                                     </td>
                                     <td style="position: relative;">
-
+                                        {% if journal.reconciled == true %}
+                                            <a href="{{ route('accounts.show', [journal.destination_account_id]) }}">{{ journal.destination_account_name }}</a>
+                                        {% endif %}
+                                        {% if journal.reconciled == false %}
                                         {# DESTINATION ACCOUNT NAME FOR TRANSFER AND DEPOSIT #}
                                         {% if journal.transaction_type_type == 'Transfer' or journal.transaction_type_type == 'Deposit' %}
 
@@ -138,6 +145,7 @@
                                                    name="destination_name[{{ journal.transaction_journal_id }}]" type="text" autocomplete="off"
                                                    value="{% if journal.destination_type != 'Cash account' %}{{ journal.destination_account_name }}{% endif %}">
                                         {% endif %}
+                                        {% endif %}
                                     </td>
                                     {# category #}
                                     <td style="position: relative;">

routes/api.php

@@ -840,7 +840,7 @@ Route::group(
         Route::get('default', ['uses' => 'ShowController@showDefault', 'as' => 'show.default']);
         Route::get('native', ['uses' => 'ShowController@showDefault', 'as' => 'show.native']);
         Route::get('{currency_code}', ['uses' => 'ShowController@show', 'as' => 'show']);
-        Route::put('{currency_code}', ['uses' => 'UpdateController@update', 'as' => 'update']);
+        Route::put('{currency_code?}', ['uses' => 'UpdateController@update', 'as' => 'update']);
         Route::delete('{currency_code}', ['uses' => 'DestroyController@destroy', 'as' => 'delete']);
 
         Route::post('{currency_code}/enable', ['uses' => 'UpdateController@enable', 'as' => 'enable']);

routes/web.php

@@ -1303,8 +1303,8 @@ Route::group(
 Route::group(
     ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers\Transaction', 'prefix' => 'transactions/mass', 'as' => 'transactions.mass.'],
     static function (): void {
-        Route::get('edit/{journalList}', ['uses' => 'MassController@edit', 'as' => 'edit']);
-        Route::get('delete/{journalList}', ['uses' => 'MassController@delete', 'as' => 'delete']);
+        Route::get('edit/{journalList?}', ['uses' => 'MassController@edit', 'as' => 'edit']);
+        Route::get('delete/{journalList?}', ['uses' => 'MassController@delete', 'as' => 'delete']);
         Route::post('update', ['uses' => 'MassController@update', 'as' => 'update']);
         Route::post('destroy', ['uses' => 'MassController@destroy', 'as' => 'destroy']);
     }
@@ -1314,7 +1314,7 @@ Route::group(
 Route::group(
     ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers\Transaction', 'prefix' => 'transactions/bulk', 'as' => 'transactions.bulk.'],
     static function (): void {
-        Route::get('edit/{journalList}', ['uses' => 'BulkController@edit', 'as' => 'edit']);
+        Route::get('edit/{journalList?}', ['uses' => 'BulkController@edit', 'as' => 'edit']);
         Route::post('update', ['uses' => 'BulkController@update', 'as' => 'update']);
     }
 );

tests/integration/Support/Models/BillDateCalculatorTest.php

@@ -26,6 +26,7 @@ namespace Tests\integration\Support\Models;
 
 use Carbon\Carbon;
 use FireflyIII\Support\Models\BillDateCalculator;
+use PHPUnit\Framework\Attributes\DataProvider;
 use Tests\integration\TestCase;
 
 /**
@@ -37,19 +38,18 @@ use Tests\integration\TestCase;
  */
 final class BillDateCalculatorTest extends TestCase
 {
-    private readonly BillDateCalculator $calculator;
+    private BillDateCalculator $calculator;
 
-    public function __construct(string $name)
+    protected function setUp(): void
     {
-        parent::__construct($name);
+        parent::setUp();
         $this->calculator = new BillDateCalculator();
     }
 
     /**
      * Stupid long method names I'm not going to do that.
-     *
-     * @dataProvider provideDates
      */
+    #[DataProvider('provideDates')]
     public function testGivenSomeDataItWorks(Carbon $earliest, Carbon $latest, Carbon $billStart, string $period, int $skip, ?Carbon $lastPaid, array $expected): void
     {
         $result = $this->calculator->getPayDates($earliest, $latest, $billStart, $period, $skip, $lastPaid);

tests/integration/Support/NavigationCustomEndOfPeriodTest.php

@@ -35,11 +35,6 @@ use Tests\integration\TestCase;
  */
 final class NavigationCustomEndOfPeriodTest extends TestCase
 {
-    public function __construct(string $name)
-    {
-        parent::__construct($name);
-    }
-
     /**
      * @preserveGlobalState disabled
      */

tests/unit/Support/Calendar/CalculatorTest.php

@@ -27,6 +27,7 @@ namespace Tests\unit\Support\Calendar;
 use FireflyIII\Exceptions\IntervalException;
 use FireflyIII\Support\Calendar\Calculator;
 use FireflyIII\Support\Calendar\Periodicity;
+use PHPUnit\Framework\Attributes\DataProvider;
 use Tests\integration\TestCase;
 use Tests\unit\Support\Calendar\Periodicity\BimonthlyTest;
 use Tests\unit\Support\Calendar\Periodicity\DailyTest;
@@ -65,10 +66,9 @@ final class CalculatorTest extends TestCase
     }
 
     /**
-     * @dataProvider provideAllPeriodicity
-     *
      * @throws IntervalException
      */
+    #[DataProvider('provideAllPeriodicity')]
     public function testGivenADailyPeriodicityWhenCallTheNextDateByIntervalMethodThenReturnsTheExpectedDateSuccessful(CalculatorProvider $provider): void
     {
         $calculator = new Calculator();
@@ -95,10 +95,9 @@ final class CalculatorTest extends TestCase
     }
 
     /**
-     * @dataProvider provideSkippedIntervals
-     *
      * @throws IntervalException
      */
+    #[DataProvider('provideSkippedIntervals')]
     public function testGivenAnEpochWithSkipIntervalNumberWhenCallTheNextDateBySkippedIntervalMethodThenReturnsTheExpectedDateSuccessful(CalculatorProvider $provider): void
     {
         $calculator = new Calculator();

tests/unit/Support/Calendar/Periodicity/IntervalTestCase.php

@@ -25,15 +25,14 @@ declare(strict_types=1);
 namespace Tests\unit\Support\Calendar\Periodicity;
 
 use FireflyIII\Support\Calendar\Periodicity\Interval;
+use PHPUnit\Framework\Attributes\DataProvider;
 use Tests\integration\TestCase;
 
 abstract class IntervalTestCase extends TestCase
 {
     abstract public static function provideIntervals(): array;
 
-    /**
-     * @dataProvider provider
-     */
+    #[DataProvider('provider')]
     public function testGivenAnEpochWhenCallTheNextDateThenReturnsTheExpectedDateSuccessful(IntervalProvider $provider): void
     {
         $period = static::factory()->nextDate($provider->epoch);

tests/unit/Support/NavigationAddPeriodTest.php

@@ -27,6 +27,7 @@ namespace Tests\unit\Support;
 use Carbon\Carbon;
 use FireflyIII\Support\Calendar\Periodicity;
 use FireflyIII\Support\Navigation;
+use PHPUnit\Framework\Attributes\DataProvider;
 use Tests\integration\TestCase;
 
 /**
@@ -40,17 +41,15 @@ use Tests\integration\TestCase;
  */
 final class NavigationAddPeriodTest extends TestCase
 {
-    private readonly Navigation $navigation;
+    private Navigation $navigation;
 
-    public function __construct(string $name)
+    protected function setUp(): void
     {
-        parent::__construct($name);
+        parent::setUp();
         $this->navigation = new Navigation();
     }
 
-    /**
-     * @dataProvider providePeriodsWithSkippingParam
-     */
+    #[DataProvider('providePeriodsWithSkippingParam')]
     public function testGivenAFrequencyAndSkipIntervalWhenCalculateTheDateThenReturnsTheSkippedDateSuccessful(int $skip, string $frequency, Carbon $from, Carbon $expected): void
     {
         $period = $this->navigation->addPeriod($from, $frequency, $skip);
@@ -102,9 +101,7 @@ final class NavigationAddPeriodTest extends TestCase
         }
     }
 
-    /**
-     * @dataProvider providePeriods
-     */
+    #[DataProvider('providePeriods')]
     public function testGivenAFrequencyWhenCalculateTheDateThenReturnsTheExpectedDateSuccessful(string $frequency, Carbon $from, Carbon $expected): void
     {
         $period = $this->navigation->addPeriod($from, $frequency, 0);
@@ -137,9 +134,7 @@ final class NavigationAddPeriodTest extends TestCase
         ];
     }
 
-    /**
-     * @dataProvider provideFrequencies
-     */
+    #[DataProvider('provideFrequencies')]
     public function testGivenAIntervalWhenCallTheNextDateByIntervalMethodThenReturnsTheExpectedDateSuccessful(Periodicity $periodicity, Carbon $from, Carbon $expected): void
     {
         $period = $this->navigation->nextDateByInterval($from, $periodicity);
@@ -174,9 +169,7 @@ final class NavigationAddPeriodTest extends TestCase
         ];
     }
 
-    /**
-     * @dataProvider provideMonthPeriods
-     */
+    #[DataProvider('provideMonthPeriods')]
     public function testGivenAMonthFrequencyWhenCalculateTheDateThenReturnsTheLastDayOfMonthSuccessful(string $frequency, Carbon $from, Carbon $expected): void
     {
         $period = $this->navigation->addPeriod($from, $frequency, 0);

tests/unit/Support/NavigationEndOfPeriodTest.php

@@ -26,6 +26,7 @@ namespace Tests\unit\Support;
 use Carbon\Carbon;
 use FireflyIII\Support\Navigation;
 use Illuminate\Support\Facades\Log;
+use PHPUnit\Framework\Attributes\DataProvider;
 use Tests\integration\TestCase;
 
 /**
@@ -39,17 +40,15 @@ use Tests\integration\TestCase;
  */
 final class NavigationEndOfPeriodTest extends TestCase
 {
-    private readonly Navigation $navigation;
+    private Navigation $navigation;
 
-    public function __construct(string $name)
+    protected function setUp(): void
     {
-        parent::__construct($name);
+        parent::setUp();
         $this->navigation = new Navigation();
     }
 
-    /**
-     * @dataProvider        provideDates
-     */
+    #[DataProvider('provideDates')]
     public function testGivenADateAndFrequencyWhenCalculateTheDateThenReturnsTheExpectedDateSuccessful(string $frequency, Carbon $from, Carbon $expected): void
     {
         $period = clone $this->navigation->endOfPeriod($from, $frequency);
@@ -87,9 +86,7 @@ final class NavigationEndOfPeriodTest extends TestCase
         ];
     }
 
-    /**
-     * @dataProvider provideUnknownFrequencies
-     */
+    #[DataProvider('provideUnknownFrequencies')]
     public function testGivenADateAndUnknownFrequencyWhenCalculateTheDateThenReturnsTheSameDateSuccessful(string $frequency, Carbon $from, Carbon $expected): void
     {
         Log::spy();

tests/unit/Support/NavigationPreferredCarbonFormatByPeriodTest.php

@@ -25,6 +25,7 @@ declare(strict_types=1);
 namespace Tests\unit\Support;
 
 use FireflyIII\Support\Navigation;
+use PHPUnit\Framework\Attributes\DataProvider;
 use Tests\integration\TestCase;
 
 /**
@@ -38,17 +39,15 @@ use Tests\integration\TestCase;
  */
 final class NavigationPreferredCarbonFormatByPeriodTest extends TestCase
 {
-    private readonly Navigation $navigation;
+    private Navigation $navigation;
 
-    public function __construct(string $name)
+    protected function setUp(): void
     {
-        parent::__construct($name);
+        parent::setUp();
         $this->navigation = new Navigation();
     }
 
-    /**
-     * @dataProvider providePeriods
-     */
+    #[DataProvider('providePeriods')]
     public function testGivenAPeriodWhenCallPreferredCarbonFormatByPeriodThenReturnsExpectedFormat(string $period, string $expected): void
     {
         $formatPeriod = $this->navigation->preferredCarbonFormatByPeriod($period);

tests/unit/Support/NavigationPreferredCarbonFormatTest.php

@@ -26,6 +26,7 @@ namespace Tests\unit\Support;
 
 use Carbon\Carbon;
 use FireflyIII\Support\Navigation;
+use PHPUnit\Framework\Attributes\DataProvider;
 use Tests\integration\TestCase;
 
 /**
@@ -39,17 +40,15 @@ use Tests\integration\TestCase;
  */
 final class NavigationPreferredCarbonFormatTest extends TestCase
 {
-    private readonly Navigation $navigation;
+    private Navigation $navigation;
 
-    public function __construct(string $name)
+    protected function setUp(): void
     {
-        parent::__construct($name);
+        parent::setUp();
         $this->navigation = new Navigation();
     }
 
-    /**
-     * @dataProvider providePeriods
-     */
+    #[DataProvider('providePeriods')]
     public function testGivenStartAndEndDatesWhenCallPreferredCarbonFormatThenReturnsTheExpectedFormatSuccessful(Carbon $start, Carbon $end, string $expected): void
     {
         $carbonFormat = $this->navigation->preferredCarbonFormat($start, $end);

tests/unit/Support/NavigationPreferredEndOfPeriodTest.php

@@ -26,6 +26,7 @@ namespace Tests\unit\Support;
 
 use Carbon\Carbon;
 use FireflyIII\Support\Navigation;
+use PHPUnit\Framework\Attributes\DataProvider;
 use Tests\integration\TestCase;
 
 /**
@@ -39,17 +40,15 @@ use Tests\integration\TestCase;
  */
 final class NavigationPreferredEndOfPeriodTest extends TestCase
 {
-    private readonly Navigation $navigation;
+    private Navigation $navigation;
 
-    public function __construct(string $name)
+    protected function setUp(): void
     {
-        parent::__construct($name);
+        parent::setUp();
         $this->navigation = new Navigation();
     }
 
-    /**
-     * @dataProvider providePeriods
-     */
+    #[DataProvider('providePeriods')]
     public function testGivenStartAndEndDatesWhenCallPreferredEndOfPeriodThenReturnsTheExpectedFormatSuccessful(Carbon $start, Carbon $end, string $expected): void
     {
         $formatPeriod = $this->navigation->preferredEndOfPeriod($start, $end);

tests/unit/Support/NavigationPreferredRangeFormatTest.php

@@ -26,6 +26,7 @@ namespace Tests\unit\Support;
 
 use Carbon\Carbon;
 use FireflyIII\Support\Navigation;
+use PHPUnit\Framework\Attributes\DataProvider;
 use Tests\integration\TestCase;
 
 /**
@@ -39,17 +40,15 @@ use Tests\integration\TestCase;
  */
 final class NavigationPreferredRangeFormatTest extends TestCase
 {
-    private readonly Navigation $navigation;
+    private Navigation $navigation;
 
-    public function __construct(string $name)
+    protected function setUp(): void
     {
-        parent::__construct($name);
+        parent::setUp();
         $this->navigation = new Navigation();
     }
 
-    /**
-     * @dataProvider providePeriods
-     */
+    #[DataProvider('providePeriods')]
     public function testGivenStartAndEndDatesWhenCallPreferredRangeFormatThenReturnsTheExpectedFormatSuccessful(Carbon $start, Carbon $end, string $expected): void
     {
         $formatPeriod = $this->navigation->preferredRangeFormat($start, $end);

tests/unit/Support/NavigationPreferredSqlFormatTest.php

@@ -26,6 +26,7 @@ namespace Tests\unit\Support;
 
 use Carbon\Carbon;
 use FireflyIII\Support\Navigation;
+use PHPUnit\Framework\Attributes\DataProvider;
 use Tests\integration\TestCase;
 
 /**
@@ -39,17 +40,15 @@ use Tests\integration\TestCase;
  */
 final class NavigationPreferredSqlFormatTest extends TestCase
 {
-    private readonly Navigation $navigation;
+    private Navigation $navigation;
 
-    public function __construct(string $name)
+    protected function setUp(): void
     {
-        parent::__construct($name);
+        parent::setUp();
         $this->navigation = new Navigation();
     }
 
-    /**
-     * @dataProvider provideDates
-     */
+    #[DataProvider('provideDates')]
     public function testGivenStartAndEndDatesWhenCallPreferredSqlFormatThenReturnsTheExpectedFormatSuccessful(Carbon $start, Carbon $end, string $expected): void
     {
         $formatPeriod = $this->navigation->preferredSqlFormat($start, $end);

tests/unit/Support/NavigationStartOfPeriodTest.php

@@ -27,6 +27,7 @@ namespace Tests\unit\Support;
 use Carbon\Carbon;
 use FireflyIII\Support\Navigation;
 use Illuminate\Support\Facades\Log;
+use PHPUnit\Framework\Attributes\DataProvider;
 use Tests\integration\TestCase;
 
 /**
@@ -40,17 +41,15 @@ use Tests\integration\TestCase;
  */
 final class NavigationStartOfPeriodTest extends TestCase
 {
-    private readonly Navigation $navigation;
+    private Navigation $navigation;
 
-    public function __construct(string $name)
+    protected function setUp(): void
     {
-        parent::__construct($name);
+        parent::setUp();
         $this->navigation = new Navigation();
     }
 
-    /**
-     * @dataProvider provideDates
-     */
+    #[DataProvider('provideDates')]
     public function testGivenADateAndFrequencyWhenCalculateTheDateThenReturnsTheExpectedDateSuccessful(string $frequency, Carbon $from, Carbon $expected): void
     {
         $period = $this->navigation->startOfPeriod($from, $frequency);
@@ -87,9 +86,7 @@ final class NavigationStartOfPeriodTest extends TestCase
         ];
     }
 
-    /**
-     * @dataProvider provideUnknownFrequencies
-     */
+    #[DataProvider('provideUnknownFrequencies')]
     public function testGivenADateAndUnknownFrequencyWhenCalculateTheDateThenReturnsTheSameDateSuccessful(string $frequency, Carbon $from, Carbon $expected): void
     {
         Log::spy();

tests/unit/Support/Search/QueryParser/AbstractQueryParserInterfaceParseQueryTester.php

@@ -9,6 +9,7 @@ use FireflyIII\Support\Search\QueryParser\QueryParserInterface;
 use FireflyIII\Support\Search\QueryParser\StringNode;
 use FireflyIII\Support\Search\QueryParser\NodeGroup;
 use FireflyIII\Support\Search\QueryParser\Node;
+use PHPUnit\Framework\Attributes\DataProvider;
 use Tests\integration\TestCase;
 
 abstract class AbstractQueryParserInterfaceParseQueryTester extends TestCase
@@ -16,11 +17,10 @@ abstract class AbstractQueryParserInterfaceParseQueryTester extends TestCase
     abstract protected function createParser(): QueryParserInterface;
 
     /**
-     * @dataProvider queryDataProvider
-     *
      * @param string $query    The query string to parse
      * @param Node   $expected The expected parse result
      */
+    #[DataProvider('queryDataProvider')]
     public function testQueryParsing(string $query, Node $expected): void
     {
         $actual = $this->createParser()->parse($query);