Merge pull request #11680 from firefly-iii/dependabot/composer/develop/mailersend/laravel-driver-3.0.0

Merge pull request #11681 from firefly-iii/release-1770609440
🤖 Automatically merge the PR into the develop branch.
2026-02-09 05:21:18 +00:00 · 2026-02-09 05:57:03 +01:00 · 2026-02-09 04:57:28 +01:00 · 2026-02-09 04:57:20 +01:00 · 2026-02-09 03:52:32 +00:00 · 2026-02-08 21:07:50 +01:00
40 changed files with 494 additions and 158 deletions
--- a/.github/assets/img/testmu.png
+++ b/.github/assets/img/testmu.png
--- a/app/Console/Commands/Correction/RollbacksSingleMigration.php
+++ b/app/Console/Commands/Correction/RollbacksSingleMigration.php
@@ -0,0 +1,90 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * RollbackSingleMigration.php
+ * Copyright (c) 2026 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/>.
+ */
+
+namespace FireflyIII\Console\Commands\Correction;
+
+use FireflyIII\Console\Commands\ShowsFriendlyMessages;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\DB;
+
+class RollbacksSingleMigration extends Command
+{
+    use ShowsFriendlyMessages;
+
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature   = 'correction:rollback-single-migration {--force}';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Removes the last entry from the migration table. ';
+
+    /**
+     * Execute the console command.
+     */
+    public function handle(): int
+    {
+        $entry = DB::table('migrations')->orderBy('id', 'DESC')->first();
+
+        if (null === $entry) {
+            $this->friendlyError('There are no more database migrations to rollback.');
+
+            return Command::FAILURE;
+        }
+
+        $this->friendlyLine(sprintf('This command will remove the database migration entry called "%s" from your database.', $entry->migration));
+        $this->friendlyLine('This does not change the database in anyway. It makes Firefly III forget it made the changes in this particular migration.');
+        $this->friendlyLine('');
+        $this->friendlyLine('If you run "php artisan migrate" after doing this, Firefly III will try to run the database migration again.');
+        $this->friendlyLine('Missing tables or indices will be created.');
+        $this->friendlyLine('This may not work, or give you warnings, but if you have a botched database it may restore it again.');
+        $this->friendlyLine('');
+        $this->friendlyLine('If this doesn\'t work, run the command a few times to remove more rows and try "php artisan migrate" again.');
+        $this->friendlyLine('');
+        $res   = true;
+        if (!$this->option('force')) {
+            $this->friendlyWarning('Use this command at your own risk.');
+            $res = $this->confirm('Are you sure you want to continue?');
+        }
+
+        if ($res) {
+            DB::table('migrations')->where('id', (int) $entry->id)->delete();
+            $this->friendlyInfo(sprintf('Database migration #%d ("%s") is deleted.', $entry->id, $entry->migration));
+            $this->friendlyLine('');
+            $this->friendlyLine('Try running "php artisan migrate" now.');
+            $this->friendlyLine('');
+        }
+        if (!$res) {
+            $this->friendlyError('User cancelled, will not delete anything.');
+        }
+
+        return Command::SUCCESS;
+    }
+}
--- a/app/Events/Model/Account/UpdatedExistingAccount.php
+++ b/app/Events/Model/Account/UpdatedExistingAccount.php
@@ -36,6 +36,7 @@ class UpdatedExistingAccount extends Event
     * Create a new event instance.
     */
    public function __construct(
-        public Account $account
+        public Account $account,
+        public array $oldData
    ) {}
 }
--- a/app/Helpers/Collector/GroupCollector.php
+++ b/app/Helpers/Collector/GroupCollector.php
@@ -433,7 +433,7 @@ class GroupCollector implements GroupCollectorInterface
     */
    public function getGroups(): Collection
    {
-        Log::debug('Now in getGroups()');
+        // Log::debug('Now in getGroups()');
        if ($this->expandGroupSearch) {
            // get group ID's for the query:
            $groupIds = $this->getCollectedGroupIds();
@@ -556,7 +556,7 @@ class GroupCollector implements GroupCollectorInterface
        if (0 !== count($journalIds)) {
            // make all integers.
            $integerIDs = array_map(intval(...), $journalIds);
-            Log::debug(sprintf('GroupCollector: setJournalIds: %s', implode(', ', $integerIDs)));
+            // Log::debug(sprintf('GroupCollector: setJournalIds: %s', implode(', ', $integerIDs)));

            $this->query->whereIn('transaction_journals.id', $integerIDs);
        }
--- a/app/Http/Controllers/Bill/IndexController.php
+++ b/app/Http/Controllers/Bill/IndexController.php
@@ -74,15 +74,15 @@ class IndexController extends Controller
        $this->cleanupObjectGroups();
        $this->repository->correctOrder();
        $this->repository->correctTransfers();
-        $start       = session('start');
-        $end         = session('end');
+        $start       = session('start')->clone();
+        $end         = session('end')->clone();
        $viewRange   = Preferences::get('viewRange', '1M')->data;

        // give the end some extra space when the user has last7, last30 or last90.
        if ('last7' === $viewRange || 'last30' === $viewRange) {
            $end->addDays(30);
        }
-        if ('last90') {
+        if ('last90' === $viewRange) {
            $end->addDays(90);
        }

--- a/app/Jobs/CreateAutoBudgetLimits.php
+++ b/app/Jobs/CreateAutoBudgetLimits.php
@@ -167,7 +167,7 @@ class CreateAutoBudgetLimits implements ShouldQueue

        /** @var BudgetLimitRepositoryInterface $repository */
        $repository  = app(BudgetLimitRepositoryInterface::class);
-        $repository->setUserGroup($autoBudget->budget->user->userGroup);
+        $repository->setUser($autoBudget->budget->user);

        $budgetLimit = $repository->store([
            'currency_id' => $autoBudget->transaction_currency_id,
--- a/app/Listeners/Model/Account/UpdatesAccountInformation.php
+++ b/app/Listeners/Model/Account/UpdatesAccountInformation.php
@@ -29,7 +29,11 @@ use FireflyIII\Events\Model\Account\UpdatedExistingAccount;
 use FireflyIII\Handlers\ExchangeRate\ConversionParameters;
 use FireflyIII\Handlers\ExchangeRate\ConvertsAmountToPrimaryAmount;
 use FireflyIII\Models\Account;
+use FireflyIII\Models\Rule;
+use FireflyIII\Models\RuleAction;
+use FireflyIII\Models\RuleTrigger;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\Repositories\Rule\RuleRepositoryInterface;
 use FireflyIII\Services\Internal\Support\CreditRecalculateService;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Support\Facades\Log;
@@ -40,6 +44,89 @@ class UpdatesAccountInformation implements ShouldQueue
    {
        $this->recalculateCredit($event->account);
        $this->updateVirtualBalance($event->account);
+        if ($event instanceof UpdatedExistingAccount) {
+            $this->renameRules($event->account, $event->oldData);
+        }
+    }
+
+    private function correctRuleActions(Account $account, array $oldData, Rule $rule): void
+    {
+        $fields = ['set_source_account', 'set_destination_account'];
+
+        Log::debug(sprintf('Check if rule #%d actions reference account #%d "%s"', $rule->id, $account->id, $account->name));
+        $fixed  = 0;
+
+        /** @var RuleAction $action */
+        foreach ($rule->ruleActions as $action) {
+            // fix name:
+            if ($oldData['name'] === $action->action_value && in_array($action->action_type, $fields, true)) {
+                Log::debug(sprintf('Rule action #%d "%s" has old account name, replace with new.', $action->id, $action->action_type));
+                $action->action_value = $account->name;
+                $action->save();
+                ++$fixed;
+            }
+        }
+        Log::debug(sprintf('Corrected %d action(s) for rule #%d', $fixed, $rule->id));
+    }
+
+    private function correctRuleTriggers(Account $account, array $oldData, Rule $rule): void
+    {
+        $nameFields   = [
+            'source_account_is',
+            'source_account_contains',
+            'source_account_ends',
+            'source_account_starts',
+            'destination_account_is',
+            'destination_account_contains',
+            'destination_account_ends',
+            'destination_account_starts',
+            'account_is',
+            'account_contains',
+            'account_ends',
+            'account_starts',
+        ];
+        $numberFields = [
+            'source_account_nr_is',
+            'source_account_nr_contains',
+            'source_account_nr_ends',
+            'source_account_nr_starts',
+            'destination_account_nr_is',
+            'destination_account_nr_contains',
+            'destination_account_nr_starts',
+            'account_nr_is',
+            'account_nr_contains',
+            'account_nr_ends',
+            'account_nr_starts',
+        ];
+
+        Log::debug(sprintf('Check if rule #%d triggers reference account #%d "%s"', $rule->id, $account->id, $account->name));
+        $fixed        = 0;
+
+        /** @var RuleTrigger $trigger */
+        foreach ($rule->ruleTriggers as $trigger) {
+            // fix name:
+            if ($oldData['name'] === $trigger->trigger_value && in_array($trigger->trigger_type, $nameFields, true)) {
+                Log::debug(sprintf('Rule trigger #%d "%s" has old account name, replace with new.', $trigger->id, $trigger->trigger_type));
+                $trigger->trigger_value = $account->name;
+                $trigger->save();
+                ++$fixed;
+            }
+            // fix IBAN:
+            if ($oldData['iban'] === $trigger->trigger_value && in_array($trigger->trigger_type, $numberFields, true)) {
+                Log::debug(sprintf('Rule trigger #%d "%s" has old account IBAN, replace with new.', $trigger->id, $trigger->trigger_type));
+                $trigger->trigger_value = $account->iban;
+                $trigger->save();
+                ++$fixed;
+            }
+            // fix account number: // account_number
+            if ($oldData['account_number'] === $trigger->trigger_value && in_array($trigger->trigger_type, $numberFields, true)) {
+                Log::debug(sprintf('Rule trigger #%d "%s" has old account account_number, replace with new.', $trigger->id, $trigger->trigger_type));
+                $trigger->trigger_value = $account->iban;
+                $trigger->save();
+                ++$fixed;
+            }
+        }
+        Log::debug(sprintf('Corrected %d trigger(s) for rule #%d', $fixed, $rule->id));
    }

    private function recalculateCredit(Account $account): void
@@ -52,6 +139,20 @@ class UpdatesAccountInformation implements ShouldQueue
        $object->recalculate();
    }

+    private function renameRules(Account $account, array $oldData): void
+    {
+        Log::debug('Updated account, will now correct rules.');
+        $repository = app(RuleRepositoryInterface::class);
+        $repository->setUser($account->user);
+        $rules      = $repository->getAll();
+
+        /** @var Rule $rule */
+        foreach ($rules as $rule) {
+            $this->correctRuleTriggers($account, $oldData, $rule);
+            $this->correctRuleActions($account, $oldData, $rule);
+        }
+    }
+
    private function updateVirtualBalance(Account $account): void
    {
        Log::debug('Will updateVirtualBalance');
--- a/app/Listeners/Model/TransactionGroup/SupportsGroupProcessingTrait.php
+++ b/app/Listeners/Model/TransactionGroup/SupportsGroupProcessingTrait.php
@@ -40,7 +40,7 @@ trait SupportsGroupProcessingTrait
        $first               = $set->first();
        $journalIds          = implode(',', $array);
        $user                = $first->user;
-        Log::debug(sprintf('Add local operator for journal(s): %s', $journalIds));
+        // Log::debug(sprintf('Add local operator for journal(s): %s', $journalIds));

        // collect rules:
        $ruleGroupRepository = app(RuleGroupRepositoryInterface::class);
--- a/app/Repositories/Budget/OperationsRepository.php
+++ b/app/Repositories/Budget/OperationsRepository.php
@@ -85,7 +85,7 @@ class OperationsRepository implements OperationsRepositoryInterface, UserGroupIn
        ?Collection $budgets = null,
        ?TransactionCurrency $currency = null
    ): array {
-        Log::debug(sprintf('Start of %s(%s, %s, array, array, "%s").', __METHOD__, $start->toW3cString(), $end->toW3cString(), $currency?->code));
+        // Log::debug(sprintf('Start of %s(%s, %s, array, array, "%s").', __METHOD__, $start->toW3cString(), $end->toW3cString(), $currency?->code));
        // this collector excludes all transfers TO liabilities (which are also withdrawals)
        // because those expenses only become expenses once they move from the liability to the friend.
        // 2024-12-24 disable the exclusion for now.
@@ -275,7 +275,7 @@ class OperationsRepository implements OperationsRepositoryInterface, UserGroupIn
        TransactionCurrency $transactionCurrency,
        bool $convertToPrimary = false
    ): array {
-        Log::debug(sprintf('Start of %s.', __METHOD__));
+        //        Log::debug(sprintf('Start of %s.', __METHOD__));
        $summarizer = new TransactionSummarizer($this->user);
        $summarizer->setConvertToPrimary($convertToPrimary);

@@ -290,7 +290,7 @@ class OperationsRepository implements OperationsRepositoryInterface, UserGroupIn

    public function sumCollectedExpensesByBudget(array $expenses, Budget $budget, bool $convertToPrimary = false): array
    {
-        Log::debug(sprintf('Start of %s.', __METHOD__));
+        // Log::debug(sprintf('Start of %s.', __METHOD__));
        $summarizer = new TransactionSummarizer($this->user);
        $summarizer->setConvertToPrimary($convertToPrimary);

@@ -311,7 +311,7 @@ class OperationsRepository implements OperationsRepositoryInterface, UserGroupIn
        ?TransactionCurrency $currency = null,
        bool $convertToPrimary = false
    ): array {
-        Log::debug(sprintf('Start of %s(date, date, array, array, "%s", %s).', __METHOD__, $currency?->code, var_export($convertToPrimary, true)));
+        //        Log::debug(sprintf('Start of %s(date, date, array, array, "%s", %s).', __METHOD__, $currency?->code, var_export($convertToPrimary, true)));
        // this collector excludes all transfers TO liabilities (which are also withdrawals)
        // because those expenses only become expenses once they move from the liability to the friend.
        // 2024-12-24 disable the exclusion for now.
--- a/app/Repositories/Category/OperationsRepository.php
+++ b/app/Repositories/Category/OperationsRepository.php
@@ -372,7 +372,7 @@ class OperationsRepository implements OperationsRepositoryInterface, UserGroupIn

    public function sumCollectedTransactionsByCategory(array $expenses, Category $category, string $method, bool $convertToPrimary = false): array
    {
-        Log::debug(sprintf('Start of %s.', __METHOD__));
+        //        Log::debug(sprintf('Start of %s.', __METHOD__));
        $summarizer = new TransactionSummarizer($this->user);
        $summarizer->setConvertToPrimary($convertToPrimary);

--- a/app/Repositories/RuleGroup/RuleGroupRepository.php
+++ b/app/Repositories/RuleGroup/RuleGroupRepository.php
@@ -195,21 +195,21 @@ class RuleGroupRepository implements RuleGroupRepositoryInterface, UserGroupInte
        if (null === $filter) {
            return $groups;
        }
-        Log::debug(sprintf('Will filter getRuleGroupsWithRules on "%s".', $filter));
+        // Log::debug(sprintf('Will filter getRuleGroupsWithRules on "%s".', $filter));

        return $groups->map(static function (RuleGroup $group) use ($filter): RuleGroup { // @phpstan-ignore-line
-            Log::debug(sprintf('Now filtering group #%d', $group->id));
+            //            Log::debug(sprintf('Now filtering group #%d', $group->id));
            // filter the rules in the rule group:
-            $group->rules = $group->rules->filter(static function (Rule $rule) use ($filter, $group): bool {
-                Log::debug(sprintf('Now filtering rule #%d', $rule->id));
+            $group->rules = $group->rules->filter(static function (Rule $rule) use ($filter): bool {
+                // Log::debug(sprintf('Now filtering rule #%d', $rule->id));
                foreach ($rule->ruleTriggers as $trigger) {
                    if ('user_action' === $trigger->trigger_type && $filter === $trigger->trigger_value) {
-                        Log::debug(sprintf('Rule #%d triggers on %s, include it in rule group #%d.', $rule->id, $filter, $group->id));
+                        // Log::debug(sprintf('Rule #%d triggers on %s, include it in rule group #%d.', $rule->id, $filter, $group->id));

                        return true;
                    }
                }
-                Log::debug(sprintf('Rule #%d does not trigger on %s, do not include it.', $rule->id, $filter));
+                // Log::debug(sprintf('Rule #%d does not trigger on %s, do not include it.', $rule->id, $filter));

                return false;
            });
@@ -251,18 +251,18 @@ class RuleGroupRepository implements RuleGroupRepositoryInterface, UserGroupInte
        Log::debug(sprintf('Will filter getRuleGroupsWithRules on "%s".', $filter));

        return $groups->map(static function (RuleGroup $group) use ($filter): RuleGroup { // @phpstan-ignore-line
-            Log::debug(sprintf('Now filtering group #%d', $group->id));
+            //            Log::debug(sprintf('Now filtering group #%d', $group->id));
            // filter the rules in the rule group:
-            $group->rules = $group->rules->filter(static function (Rule $rule) use ($filter, $group): bool {
-                Log::debug(sprintf('Now filtering rule #%d', $rule->id));
+            $group->rules = $group->rules->filter(static function (Rule $rule) use ($filter): bool {
+                //                Log::debug(sprintf('Now filtering rule #%d', $rule->id));
                foreach ($rule->ruleTriggers as $trigger) {
                    if ('user_action' === $trigger->trigger_type && $filter === $trigger->trigger_value) {
-                        Log::debug(sprintf('Rule #%d triggers on %s, include it in rule group #%d.', $rule->id, $filter, $group->id));
+                        //                        Log::debug(sprintf('Rule #%d triggers on %s, include it in rule group #%d.', $rule->id, $filter, $group->id));

                        return true;
                    }
                }
-                Log::debug(sprintf('Rule #%d does not trigger on %s, do not include it.', $rule->id, $filter));
+                //                Log::debug(sprintf('Rule #%d does not trigger on %s, do not include it.', $rule->id, $filter));

                return false;
            });
--- a/app/Services/Internal/Update/AccountUpdateService.php
+++ b/app/Services/Internal/Update/AccountUpdateService.php
@@ -78,9 +78,11 @@ class AccountUpdateService
    {
        Log::debug(sprintf('Now in %s', __METHOD__));
        $this->accountRepository->setUser($account->user);
-        $this->user = $account->user;
-        $account    = $this->updateAccount($account, $data);
-        $account    = $this->updateAccountOrder($account, $data);
+        $this->user                = $account->user;
+        $oldData                   = $account->toArray();
+        $oldData['account_number'] = $this->accountRepository->getMetaValue($account, 'account_number');
+        $account                   = $this->updateAccount($account, $data);
+        $account                   = $this->updateAccountOrder($account, $data);

        // find currency, or use default currency instead.
        if (array_key_exists('currency_id', $data) || array_key_exists('currency_code', $data)) {
@@ -109,7 +111,7 @@ class AccountUpdateService
        // update preferences if inactive:
        $this->updatePreferences($account);

-        event(new UpdatedExistingAccount($account));
+        event(new UpdatedExistingAccount($account, $oldData));

        return $account;
    }
--- a/app/Support/Calendar/Calculator.php
+++ b/app/Support/Calendar/Calculator.php
@@ -41,6 +41,11 @@ class Calculator
    // @phpstan-ignore-line
    // @phpstan-ignore-line
    // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
    private static array $intervals               = [];

    public function isAvailablePeriodicity(Periodicity $periodicity): bool
--- a/app/Support/Export/ExportDataGenerator.php
+++ b/app/Support/Export/ExportDataGenerator.php
@@ -100,6 +100,16 @@ class ExportDataGenerator

    // @phpstan-ignore-line

+    // @phpstan-ignore-line
+
+    // @phpstan-ignore-line
+
+    // @phpstan-ignore-line
+
+    // @phpstan-ignore-line
+
+    // @phpstan-ignore-line
+
    public function __construct()
    {
        $this->accounts = new Collection();
--- a/app/Support/Http/Controllers/PeriodOverview.php
+++ b/app/Support/Http/Controllers/PeriodOverview.php
@@ -86,6 +86,11 @@ trait PeriodOverview
    // temp data holder
    // temp data holder
    // temp data holder
+    // temp data holder
+    // temp data holder
+    // temp data holder
+    // temp data holder
+    // temp data holder
    private array $transactions; // temp data holder

    // temp data holder
@@ -98,6 +103,16 @@ trait PeriodOverview

    // temp data holder

+    // temp data holder
+
+    // temp data holder
+
+    // temp data holder
+
+    // temp data holder
+
+    // temp data holder
+
    /**
     * This method returns "period entries", so nov-2015, dec-2015, etc. (this depends on the users session range)
     * and for each period, the amount of money spent and earned. This is a complex operation which is cached for
--- a/app/Support/JsonApi/Enrichments/AccountEnrichment.php
+++ b/app/Support/JsonApi/Enrichments/AccountEnrichment.php
@@ -92,7 +92,7 @@ class AccountEnrichment implements EnrichmentInterface
     */
    public function enrich(Collection $collection): Collection
    {
-        Log::debug(sprintf('Now doing account enrichment for %d account(s)', $collection->count()));
+        // Log::debug(sprintf('Now doing account enrichment for %d account(s)', $collection->count()));

        // prep local fields
        $this->collection = $collection;
--- a/app/Support/JsonApi/Enrichments/AvailableBudgetEnrichment.php
+++ b/app/Support/JsonApi/Enrichments/AvailableBudgetEnrichment.php
@@ -46,12 +46,22 @@ class AvailableBudgetEnrichment implements EnrichmentInterface
    // @phpstan-ignore-line
    // @phpstan-ignore-line
    // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
    private readonly bool $convertToPrimary; // @phpstan-ignore-line
    // @phpstan-ignore-line
    // @phpstan-ignore-line
    // @phpstan-ignore-line
    // @phpstan-ignore-line
    // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
    private array $currencies            = [];
    private array $currencyIds           = [];
    private array $ids                   = [];
--- a/app/Support/JsonApi/Enrichments/BudgetLimitEnrichment.php
+++ b/app/Support/JsonApi/Enrichments/BudgetLimitEnrichment.php
@@ -46,6 +46,11 @@ class BudgetLimitEnrichment implements EnrichmentInterface
    // @phpstan-ignore-line
    // @phpstan-ignore-line
    // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
    private array $currencies  = [];
    private array $currencyIds = [];
    private Carbon $end;
--- a/app/Support/JsonApi/Enrichments/CategoryEnrichment.php
+++ b/app/Support/JsonApi/Enrichments/CategoryEnrichment.php
@@ -63,7 +63,7 @@ class CategoryEnrichment implements EnrichmentInterface

    public function enrichSingle(array|Model $model): array|Model
    {
-        Log::debug(__METHOD__);
+        // Log::debug(__METHOD__);
        $collection = new Collection()->push($model);
        $collection = $this->enrich($collection);

--- a/app/Support/JsonApi/Enrichments/PiggyBankEnrichment.php
+++ b/app/Support/JsonApi/Enrichments/PiggyBankEnrichment.php
@@ -48,12 +48,22 @@ class PiggyBankEnrichment implements EnrichmentInterface
    // @phpstan-ignore-line
    // @phpstan-ignore-line
    // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
    private array $accounts      = []; // @phpstan-ignore-line
    // @phpstan-ignore-line
    // @phpstan-ignore-line
    // @phpstan-ignore-line
    // @phpstan-ignore-line
    // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
    private array $amounts       = [];
    private Collection $collection;
    private array $currencies    = [];
--- a/app/Support/JsonApi/Enrichments/PiggyBankEventEnrichment.php
+++ b/app/Support/JsonApi/Enrichments/PiggyBankEventEnrichment.php
@@ -43,12 +43,22 @@ class PiggyBankEventEnrichment implements EnrichmentInterface
    // @phpstan-ignore-line
    // @phpstan-ignore-line
    // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
    private array $accountIds        = []; // @phpstan-ignore-line
    // @phpstan-ignore-line
    // @phpstan-ignore-line
    // @phpstan-ignore-line
    // @phpstan-ignore-line
    // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
    private Collection $collection;
    private array $currencies        = [];
    private array $groupIds          = [];
--- a/app/Support/JsonApi/Enrichments/SubscriptionEnrichment.php
+++ b/app/Support/JsonApi/Enrichments/SubscriptionEnrichment.php
@@ -52,6 +52,11 @@ class SubscriptionEnrichment implements EnrichmentInterface
    // @phpstan-ignore-line
    // @phpstan-ignore-line
    // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
    private readonly bool $convertToPrimary;
    private ?Carbon $end             = null;
    private array   $mappedObjects   = [];
--- a/app/Support/JsonApi/Enrichments/TransactionGroupEnrichment.php
+++ b/app/Support/JsonApi/Enrichments/TransactionGroupEnrichment.php
@@ -65,6 +65,16 @@ class TransactionGroupEnrichment implements EnrichmentInterface

    // @phpstan-ignore-line

+    // @phpstan-ignore-line
+
+    // @phpstan-ignore-line
+
+    // @phpstan-ignore-line
+
+    // @phpstan-ignore-line
+
+    // @phpstan-ignore-line
+
    public function __construct()
    {
        $this->dateFields      = ['interest_date', 'book_date', 'process_date', 'due_date', 'payment_date', 'invoice_date'];
@@ -74,7 +84,7 @@ class TransactionGroupEnrichment implements EnrichmentInterface
    #[Override]
    public function enrich(Collection $collection): Collection
    {
-        Log::debug(sprintf('Now doing account enrichment for %d transaction group(s)', $collection->count()));
+        // Log::debug(sprintf('Now doing account enrichment for %d transaction group(s)', $collection->count()));
        // prep local fields
        $this->collection = $collection;
        $this->collectJournalIds();
--- a/app/Support/JsonApi/Enrichments/WebhookEnrichment.php
+++ b/app/Support/JsonApi/Enrichments/WebhookEnrichment.php
@@ -48,12 +48,22 @@ class WebhookEnrichment implements EnrichmentInterface
    // @phpstan-ignore-line
    // @phpstan-ignore-line
    // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
    private array $ids               = []; // @phpstan-ignore-line
    // @phpstan-ignore-line
    // @phpstan-ignore-line
    // @phpstan-ignore-line
    // @phpstan-ignore-line
    // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
+    // @phpstan-ignore-line
    private array $responses         = [];
    private array $triggers          = [];
    private array $webhookDeliveries = [];
--- a/app/Support/Models/AccountBalanceCalculator.php
+++ b/app/Support/Models/AccountBalanceCalculator.php
@@ -78,7 +78,7 @@ class AccountBalanceCalculator
        ]);

        if (null === $first) {
-            Log::debug(sprintf('Found no transactions for currency #%d and account #%d, return 0.', $currencyId, $accountId));
+            // Log::debug(sprintf('Found no transactions for currency #%d and account #%d, return 0.', $currencyId, $accountId));

            return '0';
        }
--- a/app/Support/Report/Summarizer/TransactionSummarizer.php
+++ b/app/Support/Report/Summarizer/TransactionSummarizer.php
@@ -45,7 +45,7 @@ class TransactionSummarizer

    public function groupByCurrencyId(array $journals, string $method = 'negative', bool $includeForeign = true): array
    {
-        Log::debug(sprintf('Now in groupByCurrencyId([%d journals], "%s", %s)', count($journals), $method, var_export($includeForeign, true)));
+        // Log::debug(sprintf('Now in groupByCurrencyId([%d journals], "%s", %s)', count($journals), $method, var_export($includeForeign, true)));
        $array = [];
        foreach ($journals as $journal) {
            $field                        = 'amount';
@@ -146,7 +146,7 @@ class TransactionSummarizer
            // $array[$currencyId]['sum'] = bcadd($array[$currencyId]['sum'], \FireflyIII\Support\Facades\Steam::{$method}($amount));
            // Log::debug(sprintf('Journal #%d adds amount %s %s', $journal['transaction_journal_id'], $currencyCode, $amount));
        }
-        Log::debug('End of sumExpenses.', $array);
+        //        Log::debug('End of sumExpenses.', $array);

        return $array;
    }
@@ -234,7 +234,7 @@ class TransactionSummarizer

    public function setConvertToPrimary(bool $convertToPrimary): void
    {
-        Log::debug(sprintf('Overrule convertToPrimary to become %s', var_export($convertToPrimary, true)));
+        // Log::debug(sprintf('Overrule convertToPrimary to become %s', var_export($convertToPrimary, true)));
        $this->convertToPrimary = $convertToPrimary;
    }

--- a/app/Support/Request/ChecksLogin.php
+++ b/app/Support/Request/ChecksLogin.php
@@ -39,14 +39,14 @@ trait ChecksLogin
     */
    public function authorize(): bool
    {
-        Log::debug(sprintf('Now in %s', __METHOD__));
+        // Log::debug(sprintf('Now in %s', __METHOD__));
        // Only allow logged-in users
        $check     = auth()->check();
        if (!$check) {
            return false;
        }
        if (!property_exists($this, 'acceptedRoles')) { // @phpstan-ignore-line
-            Log::debug('Request class has no acceptedRoles array');
+            Log::debug(sprintf('Request class %s has no acceptedRoles array', static::class));

            return true; // check for false already took place.
        }
@@ -81,15 +81,15 @@ trait ChecksLogin
    {
        /** @var User $user */
        $user      = auth()->user();
-        Log::debug('Now in getUserGroup()');
+        // Log::debug('Now in getUserGroup()');

        /** @var null|UserGroup $userGroup */
        $userGroup = $this->route()?->parameter('userGroup');
        if (null === $userGroup) {
-            Log::debug('Request class has no userGroup parameter, but perhaps there is a parameter.');
+            // Log::debug('Request class has no userGroup parameter, but perhaps there is a parameter.');
            $userGroupId = (int) $this->get('user_group_id');
            if (0 === $userGroupId) {
-                Log::debug(sprintf('Request class has no user_group_id parameter, grab default from user (group #%d).', $user->user_group_id));
+                // Log::debug(sprintf('Request class has no user_group_id parameter, grab default from user (group #%d).', $user->user_group_id));
                $userGroupId = (int) $user->user_group_id;
            }
            $userGroup   = UserGroup::find($userGroupId);
@@ -98,7 +98,8 @@ trait ChecksLogin

                return null;
            }
-            Log::debug('Request class has valid user_group_id.');
+
+            // Log::debug('Request class has valid user_group_id.');
        }

        return $userGroup;
--- a/app/Support/Search/OperatorQuerySearch.php
+++ b/app/Support/Search/OperatorQuerySearch.php
@@ -122,11 +122,11 @@ class OperatorQuerySearch implements SearchInterface
            if (str_starts_with($original, '-')) {
                $return = sprintf('-%s', $config['alias_for']);
            }
-            Log::debug(sprintf('"%s" is an alias for "%s", so return that instead.', $original, $return));
+            // Log::debug(sprintf('"%s" is an alias for "%s", so return that instead.', $original, $return));

            return $return;
        }
-        Log::debug(sprintf('"%s" is not an alias.', $operator));
+        // Log::debug(sprintf('"%s" is not an alias.', $operator));

        return $original;
    }
@@ -174,7 +174,7 @@ class OperatorQuerySearch implements SearchInterface
     */
    public function parseQuery(string $query): void
    {
-        Log::debug(sprintf('Now in parseQuery("%s")', $query));
+        // Log::debug(sprintf('Now in parseQuery("%s")', $query));

        /** @var QueryParserInterface $parser */
        $parser = app(QueryParserInterface::class);
--- a/app/Support/Search/QueryParser/QueryParser.php
+++ b/app/Support/Search/QueryParser/QueryParser.php
@@ -39,7 +39,7 @@ class QueryParser implements QueryParserInterface

    public function parse(string $query): NodeGroup
    {
-        Log::debug(sprintf('Parsing query in QueryParser: "%s"', $query));
+        // Log::debug(sprintf('Parsing query in QueryParser: "%s"', $query));
        $this->query    = $query;
        $this->position = 0;

@@ -78,7 +78,7 @@ class QueryParser implements QueryParserInterface
                }
                // char is "
                ++$this->position;
-                Log::debug(sprintf('Constructed token: %s', $tokenUnderConstruction));
+                // Log::debug(sprintf('Constructed token: %s', $tokenUnderConstruction));

                return new NodeResult($this->createNode($tokenUnderConstruction, $fieldName, $prohibited), false);
            }
@@ -200,11 +200,11 @@ class QueryParser implements QueryParserInterface
                $token = rtrim($token, '"');
            }
            $token = str_replace('\"', '"', $token);
-            Log::debug(sprintf('Create FieldNode %s:%s (%s)', $fieldName, $token, var_export($prohibited, true)));
+            // Log::debug(sprintf('Create FieldNode %s:%s (%s)', $fieldName, $token, var_export($prohibited, true)));

            return new FieldNode(trim($fieldName), trim($token), $prohibited);
        }
-        Log::debug(sprintf('Create StringNode "%s" (%s)', $token, var_export($prohibited, true)));
+        // F Now in handleSearchNodeLog::debug(sprintf('Create StringNode "%s" (%s)', $token, var_export($prohibited, true)));

        return new StringNode(trim($token), $prohibited);
    }
--- a/app/TransactionRules/Engine/SearchRuleEngine.php
+++ b/app/TransactionRules/Engine/SearchRuleEngine.php
@@ -60,7 +60,7 @@ class SearchRuleEngine implements RuleEngineInterface

    public function addOperator(array $operator): void
    {
-        Log::debug('Add extra operator: ', $operator);
+        // Log::debug('Add extra operator: ', $operator);
        $this->operators[] = $operator;
    }

--- a/changelog.md
+++ b/changelog.md
@@ -3,6 +3,13 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).

+## v6.4.18
+
+### Fixed
+- [Discussion 11671](https://github.com/orgs/firefly-iii/discussions/11671) (Subscriptions Next Expected Match) started by @idgaron
+- [Issue 11667](https://github.com/firefly-iii/firefly-iii/issues/11667) (Account names and numbers are not corrected in rules when the account is updated) reported by @Kage1
+- [Issue 11668](https://github.com/firefly-iii/firefly-iii/issues/11668) (Auto-budget cron crashes on develop: Call to a member function budgets() on null (BudgetLimitRepository.php:311)) reported by @sykmer
+
 ## v6.4.17 - 2026-02-06

 ### Added
--- a/composer.json
+++ b/composer.json
@@ -99,7 +99,7 @@
        "league/commonmark": "^2",
        "league/csv": "^9.10",
        "league/fractal": "0.*",
-        "mailersend/laravel-driver": "^2.12",
+        "mailersend/laravel-driver": "^3.0",
        "nunomaduro/collision": "^8",
        "pragmarx/google2fa": "^8.0",
        "predis/predis": "^3",
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
        "This file is @generated automatically"
    ],
-    "content-hash": "72404106289a876b0046dceacbaccf24",
+    "content-hash": "c4e7dd2df7bae96ea6e4df82530411b9",
    "packages": [
        {
            "name": "bacon/bacon-qr-code",
@@ -130,16 +130,16 @@
        },
        {
            "name": "brick/math",
-            "version": "0.14.6",
+            "version": "0.14.7",
            "source": {
                "type": "git",
                "url": "https://github.com/brick/math.git",
-                "reference": "32498d5e1897e7642c0b961ace2df6d7dc9a3bc3"
+                "reference": "07ff363b16ef8aca9692bba3be9e73fe63f34e50"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/brick/math/zipball/32498d5e1897e7642c0b961ace2df6d7dc9a3bc3",
-                "reference": "32498d5e1897e7642c0b961ace2df6d7dc9a3bc3",
+                "url": "https://api.github.com/repos/brick/math/zipball/07ff363b16ef8aca9692bba3be9e73fe63f34e50",
+                "reference": "07ff363b16ef8aca9692bba3be9e73fe63f34e50",
                "shasum": ""
            },
            "require": {
@@ -178,7 +178,7 @@
            ],
            "support": {
                "issues": "https://github.com/brick/math/issues",
-                "source": "https://github.com/brick/math/tree/0.14.6"
+                "source": "https://github.com/brick/math/tree/0.14.7"
            },
            "funding": [
                {
@@ -186,7 +186,7 @@
                    "type": "github"
                }
            ],
-            "time": "2026-02-05T07:59:58+00:00"
+            "time": "2026-02-07T10:57:35+00:00"
        },
        {
            "name": "carbonphp/carbon-doctrine-types",
@@ -3486,29 +3486,29 @@
        },
        {
            "name": "mailersend/laravel-driver",
-            "version": "v2.12.0",
+            "version": "v3.0.0",
            "source": {
                "type": "git",
                "url": "https://github.com/mailersend/mailersend-laravel-driver.git",
-                "reference": "15e1ec41e29e65d3ca226929c65804190aaa93eb"
+                "reference": "cbda1bdcbd35e54f27a329df3c011389636eb783"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/mailersend/mailersend-laravel-driver/zipball/15e1ec41e29e65d3ca226929c65804190aaa93eb",
-                "reference": "15e1ec41e29e65d3ca226929c65804190aaa93eb",
+                "url": "https://api.github.com/repos/mailersend/mailersend-laravel-driver/zipball/cbda1bdcbd35e54f27a329df3c011389636eb783",
+                "reference": "cbda1bdcbd35e54f27a329df3c011389636eb783",
                "shasum": ""
            },
            "require": {
                "ext-json": "*",
-                "illuminate/support": "^9.0 || ^10.0  || ^11.0 || ^12.0",
-                "mailersend/mailersend": "^0.35.0",
+                "illuminate/support": "^10.0 || ^11.0 || ^12.0",
+                "mailersend/mailersend": "^0.36.0",
                "nyholm/psr7": "^1.5",
-                "php": ">=8.0",
+                "php": ">=8.2",
                "php-http/guzzle7-adapter": "^1.0",
                "symfony/mailer": "^6.0 || ^7.0"
            },
            "require-dev": {
-                "orchestra/testbench": "^7.0 || ^9.0 || ^10.0",
+                "orchestra/testbench": "^9.0 || ^10.0",
                "phpunit/phpunit": "^9.0 || ^10.5 || ^12.0"
            },
            "type": "library",
@@ -3549,28 +3549,28 @@
            ],
            "support": {
                "issues": "https://github.com/mailersend/mailersend-laravel-driver/issues",
-                "source": "https://github.com/mailersend/mailersend-laravel-driver/tree/v2.12.0"
+                "source": "https://github.com/mailersend/mailersend-laravel-driver/tree/v3.0.0"
            },
-            "time": "2025-10-28T14:59:16+00:00"
+            "time": "2026-02-05T12:32:37+00:00"
        },
        {
            "name": "mailersend/mailersend",
-            "version": "v0.35.0",
+            "version": "v0.36.0",
            "source": {
                "type": "git",
                "url": "https://github.com/mailersend/mailersend-php.git",
-                "reference": "f1696cf9e727e9503fbc5882d2a111bd966ad276"
+                "reference": "0a28852bba61f31c3668a2af6426dc0b2c866432"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/mailersend/mailersend-php/zipball/f1696cf9e727e9503fbc5882d2a111bd966ad276",
-                "reference": "f1696cf9e727e9503fbc5882d2a111bd966ad276",
+                "url": "https://api.github.com/repos/mailersend/mailersend-php/zipball/0a28852bba61f31c3668a2af6426dc0b2c866432",
+                "reference": "0a28852bba61f31c3668a2af6426dc0b2c866432",
                "shasum": ""
            },
            "require": {
                "beberlei/assert": "^3.2",
                "ext-json": "*",
-                "php": "^7.4 || ^8.0 <8.5",
+                "php": "^7.4 || ^8.0 <8.6",
                "php-http/client-common": "^2.2",
                "php-http/discovery": "^1.9",
                "php-http/httplug": "^2.1",
@@ -3615,9 +3615,9 @@
            ],
            "support": {
                "issues": "https://github.com/mailersend/mailersend-php/issues",
-                "source": "https://github.com/mailersend/mailersend-php/tree/v0.35.0"
+                "source": "https://github.com/mailersend/mailersend-php/tree/v0.36.0"
            },
-            "time": "2025-10-28T13:11:43+00:00"
+            "time": "2026-02-02T09:26:45+00:00"
        },
        {
            "name": "monolog/monolog",
@@ -3829,16 +3829,16 @@
        },
        {
            "name": "nette/schema",
-            "version": "v1.3.3",
+            "version": "v1.3.4",
            "source": {
                "type": "git",
                "url": "https://github.com/nette/schema.git",
-                "reference": "2befc2f42d7c715fd9d95efc31b1081e5d765004"
+                "reference": "086497a2f34b82fede9b5a41cc8e131d087cd8f7"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/nette/schema/zipball/2befc2f42d7c715fd9d95efc31b1081e5d765004",
-                "reference": "2befc2f42d7c715fd9d95efc31b1081e5d765004",
+                "url": "https://api.github.com/repos/nette/schema/zipball/086497a2f34b82fede9b5a41cc8e131d087cd8f7",
+                "reference": "086497a2f34b82fede9b5a41cc8e131d087cd8f7",
                "shasum": ""
            },
            "require": {
@@ -3846,8 +3846,8 @@
                "php": "8.1 - 8.5"
            },
            "require-dev": {
-                "nette/tester": "^2.5.2",
-                "phpstan/phpstan-nette": "^2.0@stable",
+                "nette/tester": "^2.6",
+                "phpstan/phpstan": "^2.0@stable",
                "tracy/tracy": "^2.8"
            },
            "type": "library",
@@ -3888,9 +3888,9 @@
            ],
            "support": {
                "issues": "https://github.com/nette/schema/issues",
-                "source": "https://github.com/nette/schema/tree/v1.3.3"
+                "source": "https://github.com/nette/schema/tree/v1.3.4"
            },
-            "time": "2025-10-30T22:57:59+00:00"
+            "time": "2026-02-08T02:54:00+00:00"
        },
        {
            "name": "nette/utils",
@@ -11908,16 +11908,16 @@
        },
        {
            "name": "phpunit/phpunit",
-            "version": "12.5.9",
+            "version": "12.5.10",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "83d4c158526c879b4c5cf7149d27958b6d912373"
+                "reference": "1686e30f6b32d35592f878a7f56fd0421d7d56c5"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/83d4c158526c879b4c5cf7149d27958b6d912373",
-                "reference": "83d4c158526c879b4c5cf7149d27958b6d912373",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/1686e30f6b32d35592f878a7f56fd0421d7d56c5",
+                "reference": "1686e30f6b32d35592f878a7f56fd0421d7d56c5",
                "shasum": ""
            },
            "require": {
@@ -11931,7 +11931,7 @@
                "phar-io/manifest": "^2.0.4",
                "phar-io/version": "^3.2.1",
                "php": ">=8.3",
-                "phpunit/php-code-coverage": "^12.5.2",
+                "phpunit/php-code-coverage": "^12.5.3",
                "phpunit/php-file-iterator": "^6.0.1",
                "phpunit/php-invoker": "^6.0.0",
                "phpunit/php-text-template": "^5.0.0",
@@ -11986,7 +11986,7 @@
            "support": {
                "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/12.5.9"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/12.5.10"
            },
            "funding": [
                {
@@ -12010,7 +12010,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2026-02-05T08:01:09+00:00"
+            "time": "2026-02-08T07:06:48+00:00"
        },
        {
            "name": "rector/rector",
@@ -13215,5 +13215,5 @@
    "platform-overrides": {
        "php": "8.4"
    },
-    "plugin-api-version": "2.9.0"
+    "plugin-api-version": "2.6.0"
 }
--- a/config/firefly.php
+++ b/config/firefly.php
@@ -78,8 +78,8 @@ return [
        'running_balance_column' => (bool)envNonEmpty('USE_RUNNING_BALANCE', true), // this is only the default value, is not used.
        // see cer.php for exchange rates feature flag.
    ],
-    'version'                              => 'develop/2026-02-07',
-    'build_time'                           => 1770445439,
+    'version'                              => 'develop/2026-02-09',
+    'build_time'                           => 1770609314,
    'api_version'                          => '2.1.0', // field is no longer used.
    'db_version'                           => 28, // field is no longer used.

--- a/database/migrations/2024_03_03_174645_add_indices.php
+++ b/database/migrations/2024_03_03_174645_add_indices.php
@@ -65,11 +65,19 @@ return new class() extends Migration {
        foreach ($set as $table => $fields) {
            foreach ($fields as $field) {
                try {
-                    Schema::table($table, static function (Blueprint $blueprint) use ($field): void {
-                        $blueprint->index($field);
+                    Schema::table($table, static function (Blueprint $blueprint) use ($table, $field): void {
+                        if (!Schema::hasIndex($table, $field)) {
+                            $blueprint->index($field);
+                        }
                    });
                } catch (QueryException $e) {
-                    app('log')->error(sprintf(self::QUERY_ERROR, $table, $field, $e->getMessage()));
+                    $message = $e->getMessage();
+
+                    // ignore duplicate key name as error.
+                    if (str_contains($message, ' Duplicate key name')) {
+                        continue;
+                    }
+                    app('log')->error(sprintf(self::QUERY_ERROR, $table, $field, $message));
                    app('log')->error(self::EXPL);
                }
            }
--- a/database/migrations/2024_11_30_075826_multi_piggy.php
+++ b/database/migrations/2024_11_30_075826_multi_piggy.php
@@ -23,6 +23,7 @@
 declare(strict_types=1);

 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\QueryException;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Schema;
@@ -97,10 +98,14 @@ return new class() extends Migration {
        } catch (RuntimeException $e) {
            Log::error('Could not drop foreign key "piggy_banks_account_id_foreign". Probably not an issue.');
        }
-        Schema::table('piggy_banks', static function (Blueprint $table): void {
-            // 2. make column nullable.
-            $table->unsignedInteger('account_id')->nullable()->change();
-        });
+        try {
+            Schema::table('piggy_banks', static function (Blueprint $table): void {
+                // 2. make column nullable.
+                $table->unsignedInteger('account_id')->nullable()->change();
+            });
+        } catch (QueryException $e) {
+            app('log')->error($e->getMessage());
+        }
        Schema::table('piggy_banks', static function (Blueprint $table): void {
            // 3. add currency
            if (!Schema::hasColumn('piggy_banks', 'transaction_currency_id')) {
--- a/database/migrations/2026_01_28_201901_migrations_01_2026.php
+++ b/database/migrations/2026_01_28_201901_migrations_01_2026.php
@@ -1,7 +1,9 @@
 <?php

 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\QueryException;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Schema;

 /**
@@ -18,15 +20,44 @@ return new class extends Migration {

    public function up(): void
    {
-        Schema::table('transactions', static function (Blueprint $blueprint): void {
-            $blueprint->index(['transaction_journal_id', 'amount'], 'idx_tx_journal_amount');
-        });
+        try {
+            Schema::table('transactions', static function (Blueprint $blueprint): void {
+                $blueprint->index(['transaction_journal_id', 'amount'], 'idx_tx_journal_amount');
+            });
+        } catch (QueryException $e) {
+            $message = $e->getMessage();

-        Schema::table('tag_transaction_journal', static function (Blueprint $blueprint): void {
-            $blueprint->index(['transaction_journal_id', 'tag_id'], 'idx_ttj_journal_tag');
-        });
-        Schema::table('transaction_journals', static function (Blueprint $blueprint): void {
-            $blueprint->index(['deleted_at'], 'idx_tj_deleted');
-        });
+            // ignore duplicate key name as error.
+            if (str_contains($message, ' Duplicate key name')) {
+                return;
+            }
+            Log::error(sprintf('Error when creating index: %s', $e->getMessage()));
+        }
+        try {
+            Schema::table('tag_transaction_journal', static function (Blueprint $blueprint): void {
+                $blueprint->index(['transaction_journal_id', 'tag_id'], 'idx_ttj_journal_tag');
+            });
+        } catch (QueryException $e) {
+            $message = $e->getMessage();
+
+            // ignore duplicate key name as error.
+            if (str_contains($message, ' Duplicate key name')) {
+                return;
+            }
+            Log::error(sprintf('Error when creating index: %s', $e->getMessage()));
+        }
+        try {
+            Schema::table('transaction_journals', static function (Blueprint $blueprint): void {
+                $blueprint->index(['deleted_at'], 'idx_tj_deleted');
+            });
+        } catch (QueryException $e) {
+            $message = $e->getMessage();
+
+            // ignore duplicate key name as error.
+            if (str_contains($message, ' Duplicate key name')) {
+                return;
+            }
+            Log::error(sprintf('Error when creating index: %s', $e->getMessage()));
+        }
    }
 };
--- a/package-lock.json
+++ b/package-lock.json
@@ -3246,9 +3246,9 @@
            "license": "MIT"
        },
        "node_modules/@types/node": {
-            "version": "25.2.1",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-25.2.1.tgz",
-            "integrity": "sha512-CPrnr8voK8vC6eEtyRzvMpgp3VyVRhgclonE7qYi6P9sXwYb59ucfrnmFBTaP0yUi8Gk4yZg/LlTJULGxvTNsg==",
+            "version": "25.2.2",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-25.2.2.tgz",
+            "integrity": "sha512-BkmoP5/FhRYek5izySdkOneRyXYN35I860MFAGupTdebyE66uZaR+bXLHq8k4DirE5DwQi3NuhvRU1jqTVwUrQ==",
            "dev": true,
            "license": "MIT",
            "dependencies": {
@@ -4033,14 +4033,14 @@
            }
        },
        "node_modules/axios": {
-            "version": "1.13.4",
-            "resolved": "https://registry.npmjs.org/axios/-/axios-1.13.4.tgz",
-            "integrity": "sha512-1wVkUaAO6WyaYtCkcYCOx12ZgpGf9Zif+qXa4n+oYzK558YryKqiL6UWwd5DqiH3VRW0GYhTZQ/vlgJrCoNQlg==",
+            "version": "1.13.5",
+            "resolved": "https://registry.npmjs.org/axios/-/axios-1.13.5.tgz",
+            "integrity": "sha512-cz4ur7Vb0xS4/KUN0tPWe44eqxrIu31me+fbang3ijiNscE129POzipJJA6zniq2C/Z6sJCjMimjS8Lc/GAs8Q==",
            "dev": true,
            "license": "MIT",
            "dependencies": {
-                "follow-redirects": "^1.15.6",
-                "form-data": "^4.0.4",
+                "follow-redirects": "^1.15.11",
+                "form-data": "^4.0.5",
                "proxy-from-env": "^1.1.0"
            }
        },
--- a/readme.md
+++ b/readme.md
@@ -149,13 +149,13 @@ OK, that was a joke. But for real, when you feel Firefly III made your life bett

 ### Sponsorships

-Firefly III is sponsored by LamdaTest. Their support allows me to test Firefly III more easily and introduce even fewer bugs with every release.
+Firefly III is sponsored by TestMu AI. Their support allows me to test Firefly III more easily and introduce even fewer bugs with every release.

-<p style="font-size:21px; color:black;">Browser testing via
-<a href="https://www.lambdatest.com/?utm_source=fireflyiii&utm_medium=sponsor" target="_blank">
-<img src="https://www.lambdatest.com/blue-logo.png" style="vertical-align: middle;" width="250" height="45" />
+Browser testing via:
+
+<a href="https://www.testmuai.com/?utm_source=fireflyiii&utm_medium=sponsor" target="_blank">
+<img src=".github/assets/img/testmu.png" alt="Testmu" style="vertical-align: middle;" width="250" />
 </a>
-</p>

 <!-- END OF SPONSOR TEXT -->

--- a/resources/assets/v1/src/locales/nb.json
+++ b/resources/assets/v1/src/locales/nb.json
@@ -1,26 +1,26 @@
 {
    "firefly": {
-        "administrations_page_title": "Financial administrations",
-        "administrations_index_menu": "Financial administrations",
-        "expires_at": "Expires at",
-        "temp_administrations_introduction": "Firefly III will soon get the ability to manage multiple financial administrations. Right now, you only have the one. You can set the title of this administration and its primary currency. This replaces the previous setting where you would set your \"default currency\". This setting is now tied to the financial administration and can be different per administration.",
-        "administration_currency_form_help": "It may take a long time for the page to load if you change the primary currency because transaction may need to be converted to your (new) primary currency.",
-        "administrations_page_edit_sub_title_js": "Edit financial administration \"{title}\"",
+        "administrations_page_title": "\u00d8konomisk administrasjon",
+        "administrations_index_menu": "\u00d8konomisk administrasjon",
+        "expires_at": "Utl\u00f8per den",
+        "temp_administrations_introduction": "Firefly III vil snart f\u00e5 muligheten til \u00e5 h\u00e5ndtere flere \u00f8konomiske administrasjoner. Akkurat n\u00e5 kan du kun ha en. Du kan angi navnet p\u00e5 denne administrasjonen og hovedvalutaen. Dette erstatter den tidligere innstillingen hvor du kunne sette din \"standardvaluta\". Innstillingen er n\u00e5 knyttet til din \u00f8konomiske administrasjon og den kan v\u00e6re forskjellig per administrasjon.",
+        "administration_currency_form_help": "Det kan ta lang tid for siden \u00e5 laste inn hvis du endrer prim\u00e6rvalutaen fordi det kan hende at transaksjonene m\u00e5 konverteres til din (nye) prim\u00e6rvaluta.",
+        "administrations_page_edit_sub_title_js": "Endre \u00f8konomisk administrasjon \"{title}\"",
        "table": "Tabell",
        "welcome_back": "Hvordan g\u00e5r det?",
        "flash_error": "Feil!",
        "flash_warning": "Advarsel!",
        "flash_success": "Suksess!",
        "close": "Lukk",
-        "select_dest_account": "Please select or type a valid destination account name",
-        "select_source_account": "Please select or type a valid source account name",
+        "select_dest_account": "Velg eller skriv inn et gyldig m\u00e5lkontonavn",
+        "select_source_account": "Vennligst velg eller skriv inn et gyldig kildekontonavn",
        "split_transaction_title": "Beskrivelse av den splittende transaksjon",
-        "errors_submission": "There was something wrong with your submission. Please check out the errors below.",
-        "is_reconciled": "Is reconciled",
+        "errors_submission": "Det oppsto en feil med innsendingen. Vennligst sjekk feilmeldingene nedenfor.",
+        "is_reconciled": "Er avstemt",
        "split": "Del opp",
        "single_split": "Del opp",
-        "not_enough_currencies": "Not enough currencies",
-        "not_enough_currencies_enabled": "If you have just one currency enabled, there is no need to add exchange rates.",
+        "not_enough_currencies": "Ikke nok valutaer",
+        "not_enough_currencies_enabled": "Hvis du bare har \u00e9n valuta aktivert, er det ikke n\u00f8dvendig \u00e5 legge til valutakurser.",
        "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">Transaksjon #{ID} (\"{title}\")<\/a> har blitt lagret.",
        "webhook_stored_link": "<a href=\"webhooks\/show\/{ID}\">Webhook #{ID} (\"{title}\")<\/a> er lagret.",
        "webhook_updated_link": "<a href=\"webhooks\/show\/{ID}\">Webhook #{ID}<\/a> (\"{title}\") er oppdatert.",
@@ -31,9 +31,9 @@
        "apply_rules_checkbox": "Bruk regler",
        "fire_webhooks_checkbox": "Fire webhooks",
        "no_budget_pointer": "Det ser ikke ut til at du har noen budsjetter enn\u00e5. Du b\u00f8r opprette noen p\u00e5 <a href=\"\/budgets\">budsjett<\/a>-siden. Budsjetter kan hjelpe deg med \u00e5 holde oversikt over utgifter.",
-        "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": "Det ser ut til at du ikke har noe abonnement enn\u00e5. Du b\u00f8r opprette noen p\u00e5 <a href=\"subscriptions\">abonnement<\/a>siden. Abonnementer kan hjelpe deg med \u00e5 holde oversikt over utgifter.",
        "source_account": "Kildekonto",
-        "hidden_fields_preferences": "You can enable more transaction options in your <a href=\"preferences\">preferences<\/a>.",
+        "hidden_fields_preferences": "Du kan aktivere flere transaksjonsalternativer i <a href=\"preferences\">preferansene<\/a>.",
        "destination_account": "Destinasjonskonto",
        "add_another_split": "Legg til en oppdeling til",
        "submission": "Innlevering",
@@ -43,10 +43,10 @@
        "submit": "Send inn",
        "amount": "Bel\u00f8p",
        "date": "Dato",
-        "is_reconciled_fields_dropped": "Because this transaction is reconciled, you will not be able to update the accounts, nor the amount(s) unless you remove the reconciliation flag.",
+        "is_reconciled_fields_dropped": "Fordi denne transaksjonen er avstemt, vil du ikke kunne oppdatere kontoene eller bel\u00f8p(ene) med mindre du fjerner avstemt-flagget.",
        "tags": "Tagger",
        "no_budget": "(ingen budsjett)",
-        "no_bill": "(no subscription)",
+        "no_bill": "(ingen abonnement)",
        "category": "Kategori",
        "attachments": "Vedlegg",
        "notes": "Notater",
@@ -62,7 +62,7 @@
        "destination_account_reconciliation": "Du kan ikke redigere kildekontoen for en avstemmingstransaksjon.",
        "source_account_reconciliation": "Du kan ikke redigere kildekontoen for en avstemmingstransaksjon.",
        "budget": "Budsjett",
-        "bill": "Subscription",
+        "bill": "Abonnement",
        "you_create_withdrawal": "Du lager et uttak.",
        "you_create_transfer": "Du lager en overf\u00f8ring.",
        "you_create_deposit": "Du lager en innskud.",
@@ -102,23 +102,23 @@
        "profile_oauth_client_secret_title": "Klient hemmilghet",
        "profile_oauth_client_secret_expl": "Her er din nye klient hemmelighet. Dette er den eneste tiden det blir vist s\u00e5 ikke mister den! Du kan n\u00e5 bruke denne hemmeligheten til \u00e5 lage API-foresp\u00f8rsler.",
        "profile_oauth_confidential": "Konfidensiell",
-        "profile_oauth_confidential_help": "Require the client to authenticate with a secret. Confidential clients can hold credentials in a secure way without exposing them to unauthorized parties. Public applications, such as native desktop or JavaScript SPA applications, are unable to hold secrets securely.",
+        "profile_oauth_confidential_help": "Krev at klienten godkjenner med en hemmelighet. Konfidensielle klienter kan holde legitimasjon p\u00e5 en sikker m\u00e5te uten \u00e5 utsette de for uautoriserte parter. Offentlige programmer, som skrivebord eller JavaScript SPA-applikasjoner, kan ikke holde hemmeligheter sikre.",
        "multi_account_warning_unknown": "Avhengig av hvilken type transaksjon du oppretter, Kilden og\/eller destinasjonskonto for etterf\u00f8lgende delinger kan overstyres av det som er definert i transaksjonens f\u00f8rste del.",
        "multi_account_warning_withdrawal": "Husk at kildekontoen for etterf\u00f8lgende oppsplitting skal overlates av hva som defineres i den f\u00f8rste delen av uttrekket.",
        "multi_account_warning_deposit": "Husk at mottakerkontoen for etterf\u00f8lgende oppsplitting skal overstyres av det som er definert i den f\u00f8rste delen av depositumet.",
        "multi_account_warning_transfer": "Husk at kildens pluss destinasjonskonto med etterf\u00f8lgende oppdeling overstyres av det som er definert i en f\u00f8rste del av overf\u00f8ringen.",
-        "webhook_trigger_ANY": "After any event",
+        "webhook_trigger_ANY": "Etter enhver hendelse",
        "webhook_trigger_STORE_TRANSACTION": "Etter transaksjons opprettelse",
        "webhook_trigger_UPDATE_TRANSACTION": "Etter transaksjons oppdatering",
        "webhook_trigger_DESTROY_TRANSACTION": "Etter transaksjons sletting",
-        "webhook_trigger_STORE_BUDGET": "After budget creation",
-        "webhook_trigger_UPDATE_BUDGET": "After budget update",
-        "webhook_trigger_DESTROY_BUDGET": "After budget delete",
-        "webhook_trigger_STORE_UPDATE_BUDGET_LIMIT": "After budgeted amount change",
+        "webhook_trigger_STORE_BUDGET": "Etter at nytt budsjett er laget",
+        "webhook_trigger_UPDATE_BUDGET": "Etter at et budsjett er oppdatert",
+        "webhook_trigger_DESTROY_BUDGET": "Etter at et budsjett er slettet",
+        "webhook_trigger_STORE_UPDATE_BUDGET_LIMIT": "Etter at et budsjetts bel\u00f8p er endret",
        "webhook_response_TRANSACTIONS": "Transaksjonsdetaljer",
-        "webhook_response_RELEVANT": "Relevant details",
+        "webhook_response_RELEVANT": "Relevante detaljer",
        "webhook_response_ACCOUNTS": "Kontodetaljer",
-        "webhook_response_NONE": "No details",
+        "webhook_response_NONE": "Ingen detaljer",
        "webhook_delivery_JSON": "JSON",
        "actions": "Handlinger",
        "meta_data": "Metadata",
@@ -146,21 +146,21 @@
        "response": "Respons",
        "visit_webhook_url": "Bes\u00f8k URL til webhook",
        "reset_webhook_secret": "Tilbakestill Webhook n\u00f8kkel",
-        "header_exchange_rates": "Exchange rates",
-        "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in <a href=\"https:\/\/docs.firefly-iii.org\/explanation\/financial-concepts\/exchange-rates\/\">the documentation<\/a>.",
-        "exchange_rates_from_to": "Between {from} and {to} (and the other way around)",
-        "exchange_rates_intro_rates": "Firefly III uses the following exchange rates. The inverse is automatically calculated when it is not provided. If no exchange rate exists for the date of the transaction, Firefly III will go back in time to find one. If none are present, the rate \"1\" will be used.",
-        "header_exchange_rates_rates": "Exchange rates",
-        "header_exchange_rates_table": "Table with exchange rates",
-        "help_rate_form": "On this day, how many {to} will you get for one {from}?",
-        "add_new_rate": "Add a new exchange rate",
-        "save_new_rate": "Save new rate"
+        "header_exchange_rates": "Valutakurser",
+        "exchange_rates_intro": "Firefly III st\u00f8tter nedlasting og bruk av valutakurser. Les mer om dette i <a href=\"https:\/\/docs.firefly-iii.org\/explanation\/financial-concepts\/exchange-rates\/\">dokumentasjonen<\/a>.",
+        "exchange_rates_from_to": "Mellom {from} og {to} (og omvendt)",
+        "exchange_rates_intro_rates": "Firefly III bruker f\u00f8lgende valutakurser. Omvendt blir automatisk beregnet n\u00e5r den ikke er oppgitt. Hvis det ikke finnes noen valutakurs for datoen for transaksjonen, vil Firefly III g\u00e5 tilbake i tid for \u00e5 finne en. Hvis ingen er til stede, vil kursen \"1\" brukes.",
+        "header_exchange_rates_rates": "Valutakurser",
+        "header_exchange_rates_table": "Tabell med valutakurser",
+        "help_rate_form": "P\u00e5 denne dagen, hvor mange {to} vil du f\u00e5 for en {from}?",
+        "add_new_rate": "Legg til en ny valutakurs",
+        "save_new_rate": "Lagre ny kurs"
    },
    "form": {
        "url": "Nettadresse",
        "active": "Aktiv",
        "interest_date": "Rentedato",
-        "administration_currency": "Primary currency",
+        "administration_currency": "Prim\u00e6rvaluta",
        "title": "Tittel",
        "date": "Dato",
        "book_date": "Bokf\u00f8ringsdato",
@@ -175,12 +175,12 @@
        "webhook_delivery": "Levering",
        "from_currency_to_currency": "{from} &rarr; {to}",
        "to_currency_from_currency": "{to} &rarr; {from}",
-        "rate": "Rate"
+        "rate": "Kurs"
    },
    "list": {
        "title": "Tittel",
        "active": "Er aktiv?",
-        "primary_currency": "Primary currency",
+        "primary_currency": "Prim\u00e6rvaluta",
        "trigger": "Utl\u00f8ser",
        "response": "Respons",
        "delivery": "Levering",
Author	SHA1	Message	Date
James Cole	cef514c22b	Merge pull request #11680 from firefly-iii/dependabot/composer/develop/mailersend/laravel-driver-3.0.0	2026-02-09 05:57:03 +01:00
github-actions[bot]	46d2ba3d3b	Merge pull request #11681 from firefly-iii/release-1770609440 🤖 Automatically merge the PR into the develop branch.	2026-02-09 04:57:28 +01:00
JC5	45a0504eba	🤖 Auto commit for release 'develop' on 2026-02-09	2026-02-09 04:57:20 +01:00
dependabot[bot]	9711bc1d04	Bump mailersend/laravel-driver from 2.12.0 to 3.0.0 Bumps [mailersend/laravel-driver](https://github.com/mailersend/mailersend-laravel-driver) from 2.12.0 to 3.0.0. - [Release notes](https://github.com/mailersend/mailersend-laravel-driver/releases) - [Commits](https://github.com/mailersend/mailersend-laravel-driver/compare/v2.12.0...v3.0.0) --- updated-dependencies: - dependency-name: mailersend/laravel-driver dependency-version: 3.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2026-02-09 03:52:32 +00:00
James Cole	cf2343c0dd	Catch errors in DB thing.	2026-02-08 21:07:50 +01:00
James Cole	34097cecf0	Fix viewrange.	2026-02-08 08:29:59 +01:00
github-actions[bot]	8735be2f6b	Merge pull request #11676 from firefly-iii/develop 🤖 Automatically merge the PR into the main branch.	2026-02-08 08:27:47 +01:00
github-actions[bot]	0e8cc91308	Merge pull request #11675 from firefly-iii/release-1770535655 🤖 Automatically merge the PR into the develop branch.	2026-02-08 08:27:42 +01:00
JC5	5cbb311e4d	🤖 Auto commit for release 'v6.4.18' on 2026-02-08	2026-02-08 08:27:35 +01:00
James Cole	c334641b90	Add class reference.	2026-02-08 08:21:24 +01:00
James Cole	4c2356881d	Remove unused debug logging.	2026-02-08 08:20:50 +01:00
James Cole	d9a0d06712	Clean up some debug logging.	2026-02-08 08:16:33 +01:00
github-actions[bot]	65b9dedc03	Merge pull request #11674 from firefly-iii/release-1770534470 🤖 Automatically merge the PR into the develop branch.	2026-02-08 08:07:56 +01:00
JC5	e46ef138b1	🤖 Auto commit for release 'develop' on 2026-02-08	2026-02-08 08:07:50 +01:00
James Cole	f0fdb57754	Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop	2026-02-08 08:04:05 +01:00
James Cole	09799582aa	Remove debug comments.	2026-02-08 08:03:59 +01:00
github-actions[bot]	850c824da1	Merge pull request #11673 from firefly-iii/release-1770531358 🤖 Automatically merge the PR into the develop branch.	2026-02-08 07:16:05 +01:00
JC5	34160da67a	🤖 Auto commit for release 'develop' on 2026-02-08	2026-02-08 07:15:58 +01:00
James Cole	2848a64c13	Fix sponsorship link.	2026-02-08 07:11:24 +01:00
James Cole	998d6bf874	Fix #11668	2026-02-08 06:49:27 +01:00
James Cole	b85200e1f6	Fix #11667	2026-02-08 06:46:14 +01:00
James Cole	6944001887	Fix #11671	2026-02-08 06:22:40 +01:00
github-actions[bot]	154abf1fc0	Merge pull request #11665 from firefly-iii/develop 🤖 Automatically merge the PR into the main branch.	2026-02-07 07:55:46 +01:00
github-actions[bot]	0113cc1651	Merge pull request #11664 from firefly-iii/release-1770447333 🤖 Automatically merge the PR into the develop branch.	2026-02-07 07:55:40 +01:00
JC5	38b5b656a1	🤖 Auto commit for release 'v6.4.17' on 2026-02-07	2026-02-07 07:55:33 +01:00