Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
🤖 Auto commit for release 'develop' on 2026-08-06
JC5f1c7a6885131
diff --git a/app/Api/V1/Controllers/Insight/Income/TagController.php b/app/Api/V1/Controllers/Insight/Income/TagController.phpindex df99eef909..94be2ae461 100644--- a/app/Api/V1/Controllers/Insight/Income/TagController.php+++ b/app/Api/V1/Controllers/Insight/Income/TagController.php@@ -158,7 +158,10 @@ final class TagController extends Controller'currency_id' => (string) $foreignCurrencyId,'currency_code' => $journal['foreign_currency_code'],];- $response[$foreignKey]['difference'] = bcadd((string) $response[$foreignKey]['difference'], Steam::positive($journal['foreign_amount']));+ $response[$foreignKey]['difference'] = bcadd(+ (string) $response[$foreignKey]['difference'],+ Steam::positive($journal['foreign_amount'])+ );$response[$foreignKey]['difference_float'] = (float) $response[$foreignKey]['difference'];}}diff --git a/app/Api/V1/Controllers/Insight/Transfer/TagController.php b/app/Api/V1/Controllers/Insight/Transfer/TagController.phpindex f92a7aa9f0..b7b85fd376 100644--- a/app/Api/V1/Controllers/Insight/Transfer/TagController.php+++ b/app/Api/V1/Controllers/Insight/Transfer/TagController.php@@ -155,7 +155,10 @@ final class TagController extends Controller'currency_id' => (string) $foreignCurrencyId,'currency_code' => $journal['foreign_currency_code'],];- $response[$foreignKey]['difference'] = bcadd((string) $response[$foreignKey]['difference'], Steam::positive($journal['foreign_amount']));+ $response[$foreignKey]['difference'] = bcadd(+ (string) $response[$foreignKey]['difference'],+ Steam::positive($journal['foreign_amount'])+ );$response[$foreignKey]['difference_float'] = (float) $response[$foreignKey]['difference']; // intentional float}}diff --git a/app/Http/Controllers/Account/EditController.php b/app/Http/Controllers/Account/EditController.phpindex 583da7608d..274dc0daf2 100644--- a/app/Http/Controllers/Account/EditController.php+++ b/app/Http/Controllers/Account/EditController.php@@ -143,7 +143,7 @@ final class EditController extends Controller'account_number' => $repository->getMetaValue($account, 'account_number'),'account_role' => $repository->getMetaValue($account, 'account_role'),'cc_type' => $repository->getMetaValue($account, 'cc_type'),- 'cc_monthly_payment_date' => substr($repository->getMetaValue($account, 'cc_monthly_payment_date'),0,10),+ 'cc_monthly_payment_date' => substr($repository->getMetaValue($account, 'cc_monthly_payment_date'), 0, 10),'BIC' => $repository->getMetaValue($account, 'BIC'),'opening_balance_date' => substr((string) $openingBalanceDate, 0, 10),'liability_type_id' => $account->account_type_id,diff --git a/app/Http/Controllers/Bill/CreateController.php b/app/Http/Controllers/Bill/CreateController.phpindex f9dfcc48f0..f4fcded54b 100644--- a/app/Http/Controllers/Bill/CreateController.php+++ b/app/Http/Controllers/Bill/CreateController.php@@ -121,7 +121,7 @@ final class CreateController extends Controller}// redirect to previous URL.- $redirect = redirect($this->getPreviousUrl('bills.create.url'));+ $redirect = redirect($this->getPreviousUrl('bills.create.url'));if (1 === (int) $request->input('create_another')) {// set value so create routine will not overwrite URL:$request->session()->put('bills.create.fromStore', true);diff --git a/app/Http/Controllers/Budget/BudgetLimitController.php b/app/Http/Controllers/Budget/BudgetLimitController.phpindex de7337738f..04d75cd738 100644--- a/app/Http/Controllers/Budget/BudgetLimitController.php+++ b/app/Http/Controllers/Budget/BudgetLimitController.php@@ -198,7 +198,13 @@ final class BudgetLimitController extends Controllerif ($request->expectsJson()) {$array = $limit->toArray();// add some extra metadata:- $spentArr = $this->opsRepository->sumExpenses($limit->start_date, $limit->end_date, null, new Collection()->push($budget), $currency);+ $spentArr = $this->opsRepository->sumExpenses(+ $limit->start_date,+ $limit->end_date,+ null,+ new Collection()->push($budget),+ $currency+ );$array['spent'] = $spentArr[$currency->id]['sum'] ?? '0';$array['left_formatted'] = Amount::formatAnything($limit->transactionCurrency, bcadd($array['spent'], (string) $array['amount']));$array['amount_formatted'] = Amount::formatAnything($limit->transactionCurrency, $limit['amount']);diff --git a/app/Http/Controllers/Budget/IndexController.php b/app/Http/Controllers/Budget/IndexController.phpindex 215ebbd484..d40d4432a3 100644--- a/app/Http/Controllers/Budget/IndexController.php+++ b/app/Http/Controllers/Budget/IndexController.php@@ -284,7 +284,10 @@ final class IndexController extends Controllerif (array_key_exists($currency->id, $spentArr) && array_key_exists('sum', $spentArr[$currency->id])) {$array['spent'][$currency->id]['spent'] = $spentArr[$currency->id]['sum'];- $array['spent'][$currency->id]['spent_outside'] = Steam::negative(bcsub($spentInLimits[$currency->id], $spentArr[$currency->id]['sum']));+ $array['spent'][$currency->id]['spent_outside'] = Steam::negative(bcsub(+ $spentInLimits[$currency->id],+ $spentArr[$currency->id]['sum']+ ));$array['spent'][$currency->id]['currency_id'] = $currency->id;$array['spent'][$currency->id]['currency_symbol'] = $currency->symbol;$array['spent'][$currency->id]['currency_decimal_places'] = $currency->decimal_places;diff --git a/app/Http/Controllers/Chart/BudgetController.php b/app/Http/Controllers/Chart/BudgetController.phpindex ad724137dc..f4b32fe5c5 100644--- a/app/Http/Controllers/Chart/BudgetController.php+++ b/app/Http/Controllers/Chart/BudgetController.php@@ -539,7 +539,13 @@ final class BudgetController extends Controller}// get spent amount in this period for this currency.- $sum = $this->opsRepository->sumExpenses($currentStart, $currentEnd, $accounts, new Collection()->push($budget), $currency);+ $sum = $this->opsRepository->sumExpenses(+ $currentStart,+ $currentEnd,+ $accounts,+ new Collection()->push($budget),+ $currency+ );$amount = Steam::positive($sum[$currency->id]['sum'] ?? '0');$chartData[0]['entries'][$title] = Steam::bcround($amount, $currency->decimal_places);diff --git a/app/Jobs/CreateAutoBudgetLimits.php b/app/Jobs/CreateAutoBudgetLimits.phpindex 93cf5e9364..d61661dd50 100644--- a/app/Jobs/CreateAutoBudgetLimits.php+++ b/app/Jobs/CreateAutoBudgetLimits.php@@ -122,7 +122,13 @@ class CreateAutoBudgetLimits implements ShouldQueue// if has one, calculate expenses and use that as a base.$repository = app(OperationsRepositoryInterface::class);$repository->setUser($autoBudget->budget->user);- $spent = $repository->sumExpenses($previousStart, $previousEnd, null, new Collection()->push($autoBudget->budget), $autoBudget->transactionCurrency);+ $spent = $repository->sumExpenses(+ $previousStart,+ $previousEnd,+ null,+ new Collection()->push($autoBudget->budget),+ $autoBudget->transactionCurrency+ );$currencyId = $autoBudget->transaction_currency_id;$spentAmount = $spent[$currencyId]['sum'] ?? '0';Log::debug(sprintf('Spent in previous budget period (%s-%s) is %s', $previousStart->format('Y-m-d'), $previousEnd->format('Y-m-d'), $spentAmount));@@ -212,7 +218,13 @@ class CreateAutoBudgetLimits implements ShouldQueue// if has one, calculate expenses and use that as a base.$repository = app(OperationsRepositoryInterface::class);$repository->setUser($autoBudget->budget->user);- $spent = $repository->sumExpenses($previousStart, $previousEnd, null, new Collection()->push($autoBudget->budget), $autoBudget->transactionCurrency);+ $spent = $repository->sumExpenses(+ $previousStart,+ $previousEnd,+ null,+ new Collection()->push($autoBudget->budget),+ $autoBudget->transactionCurrency+ );$currencyId = $autoBudget->transaction_currency_id;$spentAmount = $spent[$currencyId]['sum'] ?? '0';Log::debug(sprintf('Spent in previous budget period (%s-%s) is %s', $previousStart->format('Y-m-d'), $previousEnd->format('Y-m-d'), $spentAmount));diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.phpindex 567a3dc51f..67a1fc4fcb 100644--- a/app/Providers/AuthServiceProvider.php+++ b/app/Providers/AuthServiceProvider.php@@ -25,7 +25,6 @@ namespace FireflyIII\Providers;use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;-/*** Class AuthServiceProvider*/diff --git a/app/Repositories/Bill/BillRepository.php b/app/Repositories/Bill/BillRepository.phpindex 0f7592a49e..d061914941 100644--- a/app/Repositories/Bill/BillRepository.php+++ b/app/Repositories/Bill/BillRepository.php@@ -171,9 +171,10 @@ class BillRepository implements BillRepositoryInterface, UserGroupInterfacepublic function getActiveBills(): Collection{return $this->user->bills()- ->where('active', true)- ->orderBy('bills.name', 'ASC')- ->get(['bills.*', DB::raw('((bills.amount_min + bills.amount_max) / 2) AS expectedAmount')]);+ ->where('active', true)+ ->orderBy('bills.name', 'ASC')+ ->get(['bills.*', DB::raw('((bills.amount_min + bills.amount_max) / 2) AS expectedAmount')])+ ;}/**@@ -196,10 +197,11 @@ class BillRepository implements BillRepositoryInterface, UserGroupInterfacepublic function getBills(): Collection{return $this->user->bills()- ->orderBy('order', 'ASC')- ->orderBy('active', 'DESC')- ->orderBy('name', 'ASC')- ->get();+ ->orderBy('order', 'ASC')+ ->orderBy('active', 'DESC')+ ->orderBy('name', 'ASC')+ ->get()+ ;}public function getBillsForAccounts(Collection $accounts): Collection@@ -223,18 +225,19 @@ class BillRepository implements BillRepositoryInterface, UserGroupInterface$ids = $accounts->pluck('id')->toArray();return $this->user->bills()- ->leftJoin('transaction_journals', static function (JoinClause $join): void {- $join->on('transaction_journals.bill_id', '=', 'bills.id')->whereNull('transaction_journals.deleted_at');- })- ->leftJoin('transactions', static function (JoinClause $join): void {- $join->on('transaction_journals.id', '=', 'transactions.transaction_journal_id')->where('transactions.amount', '<', 0);- })- ->whereIn('transactions.account_id', $ids)- ->whereNull('transaction_journals.deleted_at')- ->orderBy('bills.active', 'DESC')- ->orderBy('bills.name', 'ASC')- ->groupBy($fields)- ->get($fields);+ ->leftJoin('transaction_journals', static function (JoinClause $join): void {+ $join->on('transaction_journals.bill_id', '=', 'bills.id')->whereNull('transaction_journals.deleted_at');+ })+ ->leftJoin('transactions', static function (JoinClause $join): void {+ $join->on('transaction_journals.id', '=', 'transactions.transaction_journal_id')->where('transactions.amount', '<', 0);+ })+ ->whereIn('transactions.account_id', $ids)+ ->whereNull('transaction_journals.deleted_at')+ ->orderBy('bills.active', 'DESC')+ ->orderBy('bills.name', 'ASC')+ ->groupBy($fields)+ ->get($fields)+ ;}/**@@ -253,13 +256,13 @@ class BillRepository implements BillRepositoryInterface, UserGroupInterface/** @var null|Note $note */$note = $bill->notes()->first();- return (string)$note?->text;+ return (string) $note?->text;}public function getOverallAverage(Bill $bill): array{/** @var JournalRepositoryInterface $repos */- $repos = app(JournalRepositoryInterface::class);+ $repos = app(JournalRepositoryInterface::class);$repos->setUser($this->user);// get and sort on currency@@ -270,9 +273,9 @@ class BillRepository implements BillRepositoryInterface, UserGroupInterfaceforeach ($journals as $journal) {/** @var Transaction $transaction */$transaction = $journal->transactions()->where('amount', '<', 0)->first();- $currencyId = (int)$journal->transaction_currency_id;+ $currencyId = (int) $journal->transaction_currency_id;$currency = $journal->transactionCurrency;- $result[$currencyId] ??= [+ $result[$currencyId] ??= ['sum' => '0','pc_sum' => '0','count' => 0,@@ -283,10 +286,10 @@ class BillRepository implements BillRepositoryInterface, UserGroupInterface'currency_symbol' => $currency->symbol,'currency_decimal_places' => $currency->decimal_places,];- $result[$currencyId]['sum'] = bcadd($result[$currencyId]['sum'], (string)$transaction->amount);+ $result[$currencyId]['sum'] = bcadd($result[$currencyId]['sum'], (string) $transaction->amount);$result[$currencyId]['pc_sum'] = bcadd($result[$currencyId]['pc_sum'], $transaction->native_amount ?? '0');if ($journal->foreign_currency_id === Amount::getPrimaryCurrency()->id) {- $result[$currencyId]['pc_sum'] = bcadd($result[$currencyId]['pc_sum'], (string)$transaction->amount);+ $result[$currencyId]['pc_sum'] = bcadd($result[$currencyId]['pc_sum'], (string) $transaction->amount);}++$result[$currencyId]['count'];}@@ -297,8 +300,8 @@ class BillRepository implements BillRepositoryInterface, UserGroupInterface* @var array $arr*/foreach ($result as $currencyId => $arr) {- $result[$currencyId]['avg'] = bcdiv((string)$arr['sum'], (string)$arr['count']);- $result[$currencyId]['pc_avg'] = bcdiv((string)$arr['pc_sum'], (string)$arr['count']);+ $result[$currencyId]['avg'] = bcdiv((string) $arr['sum'], (string) $arr['count']);+ $result[$currencyId]['pc_avg'] = bcdiv((string) $arr['pc_sum'], (string) $arr['count']);}return $result;@@ -327,18 +330,19 @@ class BillRepository implements BillRepositoryInterface, UserGroupInterface->before($end)->after($start)->get([- 'transaction_journals.id',- 'transaction_journals.date',- 'transaction_journals.transaction_group_id',- 'transactions.transaction_currency_id',- 'currency.code AS transaction_currency_code',- 'currency.decimal_places AS transaction_currency_decimal_places',- 'transactions.foreign_currency_id',- 'foreign_currency.code AS foreign_currency_code',- 'foreign_currency.decimal_places AS foreign_currency_decimal_places',- 'transactions.amount',- 'transactions.foreign_amount',- ]);+ 'transaction_journals.id',+ 'transaction_journals.date',+ 'transaction_journals.transaction_group_id',+ 'transactions.transaction_currency_id',+ 'currency.code AS transaction_currency_code',+ 'currency.decimal_places AS transaction_currency_decimal_places',+ 'transactions.foreign_currency_id',+ 'foreign_currency.code AS foreign_currency_code',+ 'foreign_currency.decimal_places AS foreign_currency_decimal_places',+ 'transactions.amount',+ 'transactions.foreign_amount',+ ])+ ;}/**@@ -365,7 +369,7 @@ class BillRepository implements BillRepositoryInterface, UserGroupInterface// \Illuminate\Support\Facades\Log::debug(sprintf('Currentstart (%s) has become %s.', $currentStart->format('Y-m-d'), $nextExpectedMatch->format('Y-m-d')));- $currentStart = clone $nextExpectedMatch;+ $currentStart = clone $nextExpectedMatch;}return $set;@@ -377,10 +381,11 @@ class BillRepository implements BillRepositoryInterface, UserGroupInterfacepublic function getRulesForBill(Bill $bill): Collection{return $this->user->rules()- ->leftJoin('rule_actions', 'rule_actions.rule_id', '=', 'rules.id')- ->where('rule_actions.action_type', 'link_to_bill')- ->where('rule_actions.action_value', $bill->name)- ->get(['rules.*']);+ ->leftJoin('rule_actions', 'rule_actions.rule_id', '=', 'rules.id')+ ->where('rule_actions.action_type', 'link_to_bill')+ ->where('rule_actions.action_value', $bill->name)+ ->get(['rules.*'])+ ;}/**@@ -391,15 +396,16 @@ class BillRepository implements BillRepositoryInterface, UserGroupInterface*/public function getRulesForBills(Collection $collection): array{- $rules = $this->user->rules()- ->leftJoin('rule_actions', 'rule_actions.rule_id', '=', 'rules.id')- ->where('rule_actions.action_type', 'link_to_bill')- ->get(['rules.id', 'rules.title', 'rule_actions.action_value', 'rules.active']);- $array = [];+ $rules = $this->user->rules()+ ->leftJoin('rule_actions', 'rule_actions.rule_id', '=', 'rules.id')+ ->where('rule_actions.action_type', 'link_to_bill')+ ->get(['rules.id', 'rules.title', 'rule_actions.action_value', 'rules.active'])+ ;+ $array = [];/** @var Rule $rule */foreach ($rules as $rule) {- $array[$rule->action_value] ??= [];+ $array[$rule->action_value] ??= [];$array[$rule->action_value][] = ['id' => $rule->id, 'title' => $rule->title, 'active' => $rule->active];}$return = [];@@ -413,28 +419,29 @@ class BillRepository implements BillRepositoryInterface, UserGroupInterfacepublic function getYearAverage(Bill $bill, Carbon $date): array{/** @var JournalRepositoryInterface $repos */- $repos = app(JournalRepositoryInterface::class);+ $repos = app(JournalRepositoryInterface::class);$repos->setUser($this->user);// get and sort on currency- $result = [];+ $result = [];$journals = $bill->transactionJournals()- ->where('date', '>=', $date->year . '-01-01 00:00:00')- ->where('date', '<=', $date->year . '-12-31 23:59:59')- ->get();+ ->where('date', '>=', $date->year.'-01-01 00:00:00')+ ->where('date', '<=', $date->year.'-12-31 23:59:59')+ ->get()+ ;/** @var TransactionJournal $journal */foreach ($journals as $journal) {/** @var null|Transaction $transaction */- $transaction = $journal->transactions()->where('amount', '<', 0)->first();+ $transaction = $journal->transactions()->where('amount', '<', 0)->first();if (null === $transaction) {continue;}- $currencyId = (int)$journal->transaction_currency_id;+ $currencyId = (int) $journal->transaction_currency_id;$currency = $journal->transactionCurrency;- $result[$currencyId] ??= [+ $result[$currencyId] ??= ['sum' => '0','pc_sum' => '0','count' => 0,@@ -444,10 +451,10 @@ class BillRepository implements BillRepositoryInterface, UserGroupInterface'currency_symbol' => $currency->symbol,'currency_decimal_places' => $currency->decimal_places,];- $result[$currencyId]['sum'] = bcadd($result[$currencyId]['sum'], (string)$transaction->amount);+ $result[$currencyId]['sum'] = bcadd($result[$currencyId]['sum'], (string) $transaction->amount);$result[$currencyId]['pc_sum'] = bcadd($result[$currencyId]['pc_sum'], $transaction->native_amount ?? '0');if ($journal->foreign_currency_id === Amount::getPrimaryCurrency()->id) {- $result[$currencyId]['pc_sum'] = bcadd($result[$currencyId]['pc_sum'], (string)$transaction->amount);+ $result[$currencyId]['pc_sum'] = bcadd($result[$currencyId]['pc_sum'], (string) $transaction->amount);}++$result[$currencyId]['count'];}@@ -458,8 +465,8 @@ class BillRepository implements BillRepositoryInterface, UserGroupInterface* @var array $arr*/foreach ($result as $currencyId => $arr) {- $result[$currencyId]['avg'] = bcdiv((string)$arr['sum'], (string)$arr['count']);- $result[$currencyId]['pc_avg'] = bcdiv((string)$arr['pc_sum'], (string)$arr['count']);+ $result[$currencyId]['avg'] = bcdiv((string) $arr['sum'], (string) $arr['count']);+ $result[$currencyId]['pc_avg'] = bcdiv((string) $arr['pc_sum'], (string) $arr['count']);}return $result;@@ -472,7 +479,7 @@ class BillRepository implements BillRepositoryInterface, UserGroupInterface{/** @var Transaction $transaction */foreach ($transactions as $transaction) {- $journal = $bill->user->transactionJournals()->find((int)$transaction['transaction_journal_id']);+ $journal = $bill->user->transactionJournals()->find((int) $transaction['transaction_journal_id']);$journal->bill_id = $bill->id;$journal->save();Log::debug(sprintf('Linked journal #%d to bill #%d', $journal->id, $bill->id));@@ -508,7 +515,7 @@ class BillRepository implements BillRepositoryInterface, UserGroupInterface*/public function nextExpectedMatch(Bill $bill, Carbon $date): Carbon{- $cache = new CacheProperties();+ $cache = new CacheProperties();$cache->addProperty($bill->id);$cache->addProperty('nextExpectedMatch');$cache->addProperty($date);@@ -516,17 +523,17 @@ class BillRepository implements BillRepositoryInterface, UserGroupInterfacereturn $cache->get();}// find the most recent date for this bill NOT in the future. Cache this date:- $start = clone $bill->date;+ $start = clone $bill->date;$start->startOfDay();- Log::debug('nextExpectedMatch: Start is ' . $start->format('Y-m-d'));+ Log::debug('nextExpectedMatch: Start is '.$start->format('Y-m-d'));while ($start < $date) {Log::debug(sprintf('$start (%s) < $date (%s)', $start->format('Y-m-d H:i:s'), $date->format('Y-m-d H:i:s')));$start = Navigation::addPeriod($start, $bill->repeat_freq, $bill->skip);- Log::debug('Start is now ' . $start->format('Y-m-d H:i:s'));+ Log::debug('Start is now '.$start->format('Y-m-d H:i:s'));}- $end = Navigation::addPeriod($start, $bill->repeat_freq, $bill->skip);+ $end = Navigation::addPeriod($start, $bill->repeat_freq, $bill->skip);$end->endOfDay();// see if the bill was paid in this period.@@ -538,8 +545,8 @@ class BillRepository implements BillRepositoryInterface, UserGroupInterface$start = clone $end;$end = Navigation::addPeriod($start, $bill->repeat_freq, $bill->skip);}- Log::debug('nextExpectedMatch: Final start is ' . $start->format('Y-m-d'));- Log::debug('nextExpectedMatch: Matching end is ' . $end->format('Y-m-d'));+ Log::debug('nextExpectedMatch: Final start is '.$start->format('Y-m-d'));+ Log::debug('nextExpectedMatch: Matching end is '.$end->format('Y-m-d'));$cache->store($start);@@ -558,10 +565,11 @@ class BillRepository implements BillRepositoryInterface, UserGroupInterface$query = sprintf('%%%s%%', $query);return $this->user->bills()- ->orderBy('name', 'ASC')- ->whereLike('name', $query)- ->take($limit)- ->get();+ ->orderBy('name', 'ASC')+ ->whereLike('name', $query)+ ->take($limit)+ ->get()+ ;}public function setObjectGroup(Bill $bill, string $objectGroupTitle): Bill@@ -604,10 +612,10 @@ class BillRepository implements BillRepositoryInterface, UserGroupInterfaceforeach ($bills as $bill) {// Log::debug(sprintf('Bill #%d ("%s")', $bill->id, $bill->name));/** @var Collection $set */- $set = $bill->transactionJournals()->after($start)->before($end)->get(['transaction_journals.*']);- $currency = $convertToPrimary && $bill->transactionCurrency->id !== $primary->id ? $primary : $bill->transactionCurrency;- $return[(int)$currency->id] ??= [- 'id' => (string)$currency->id,+ $set = $bill->transactionJournals()->after($start)->before($end)->get(['transaction_journals.*']);+ $currency = $convertToPrimary && $bill->transactionCurrency->id !== $primary->id ? $primary : $bill->transactionCurrency;+ $return[(int) $currency->id] ??= [+ 'id' => (string) $currency->id,'name' => $currency->name,'symbol' => $currency->symbol,'code' => $currency->code,@@ -619,17 +627,17 @@ class BillRepository implements BillRepositoryInterface, UserGroupInterface/** @var TransactionJournal $transactionJournal */foreach ($set as $transactionJournal) {// grab currency from journal.- $transactionCurrency = $transactionJournal->transactionCurrency;- $currencyId = (int)$transactionCurrency->id;+ $transactionCurrency = $transactionJournal->transactionCurrency;+ $currencyId = (int) $transactionCurrency->id;$return[$currencyId] ??= [- 'id' => (string)$transactionCurrency->id,+ 'id' => (string) $transactionCurrency->id,'name' => $transactionCurrency->name,'symbol' => $transactionCurrency->symbol,'code' => $transactionCurrency->code,'decimal_places' => $transactionCurrency->decimal_places,'sum' => '0',];- $amountFromJournal = Amount::getAmountFromJournalObject($transactionJournal, true);+ $amountFromJournal = Amount::getAmountFromJournalObject($transactionJournal, true);Log::debug(sprintf('Created a (new) array for currency #%d', $currencyId));Log::debug(sprintf('Amount to add is %s', $amountFromJournal));// get currency from transaction as well.@@ -637,13 +645,14 @@ class BillRepository implements BillRepositoryInterface, UserGroupInterface}}// remove empty sets- $final = [];+ $final = [];foreach ($return as $entry) {if (0 === bccomp($entry['sum'], '0')) {continue;}$final[] = $entry;}+return $final;}@@ -658,9 +667,9 @@ class BillRepository implements BillRepositoryInterface, UserGroupInterface/** @var Bill $bill */foreach ($bills as $bill) {// \Illuminate\Support\Facades\Log::debug(sprintf('Processing bill #%d ("%s")', $bill->id, $bill->name));- $dates = $this->getPayDatesInRange($bill, $start, $end);- $count = $bill->transactionJournals()->after($start)->before($end)->count();- $total = $dates->count() - $count;+ $dates = $this->getPayDatesInRange($bill, $start, $end);+ $count = $bill->transactionJournals()->after($start)->before($end)->count();+ $total = $dates->count() - $count;// \Illuminate\Support\Facades\Log::debug(sprintf('Pay dates: %d, count: %d, left: %d', $dates->count(), $count, $total));// \Illuminate\Support\Facades\Log::debug('dates', $dates->toArray());@@ -669,18 +678,18 @@ class BillRepository implements BillRepositoryInterface, UserGroupInterface// Log::debug(sprintf('min field is %s, max field is %s', $minField, $maxField));if ($total > 0) {- $currency = $convertToPrimary && $bill->transactionCurrency->id !== $primary->id ? $primary : $bill->transactionCurrency;- $average = bcdiv(bcadd($bill->{$maxField} ?? '0', $bill->{$minField} ?? '0'), '2');+ $currency = $convertToPrimary && $bill->transactionCurrency->id !== $primary->id ? $primary : $bill->transactionCurrency;+ $average = bcdiv(bcadd($bill->{$maxField} ?? '0', $bill->{$minField} ?? '0'), '2');Log::debug(sprintf('Amount to pay is %s %s (%d times)', $currency->code, $average, $total));- $return[$currency->id] ??= [- 'id' => (string)$currency->id,+ $return[$currency->id] ??= [+ 'id' => (string) $currency->id,'name' => $currency->name,'symbol' => $currency->symbol,'code' => $currency->code,'decimal_places' => $currency->decimal_places,'sum' => '0',];- $return[$currency->id]['sum'] = bcadd($return[$currency->id]['sum'], bcmul($average, (string)$total));+ $return[$currency->id]['sum'] = bcadd($return[$currency->id]['sum'], bcmul($average, (string) $total));}}diff --git a/app/Support/Amount.php b/app/Support/Amount.phpindex 838e124651..c9463093ec 100644--- a/app/Support/Amount.php+++ b/app/Support/Amount.php@@ -228,7 +228,9 @@ class Amount// Log::debug(sprintf('Get amount from journal #%d', $journal->id));$convertToPrimary = $this->convertToPrimary();$currency = $this->getPrimaryCurrency();- $field = false === $forceNormalAmount && $convertToPrimary && $currency->id !== $journal->transaction_currency_id ? 'native_amount' : 'amount';+ $field = false === $forceNormalAmount && $convertToPrimary && $currency->id !== $journal->transaction_currency_id+ ? 'native_amount'+ : 'amount';/** @var null|Transaction $sourceTransaction */$sourceTransaction = $journal->transactions()->where('amount', '<', 0)->first();diff --git a/app/Support/Http/Controllers/AugumentData.php b/app/Support/Http/Controllers/AugumentData.phpindex a3a940b1ba..a507156873 100644--- a/app/Support/Http/Controllers/AugumentData.php+++ b/app/Support/Http/Controllers/AugumentData.php@@ -222,7 +222,14 @@ trait AugumentData$currentEnd->addMonth();}// primary currency amount.- $expenses = $opsRepository->sumExpenses($currentStart, $currentEnd, null, $budgetCollection, $entry->transactionCurrency, $this->convertToPrimary);+ $expenses = $opsRepository->sumExpenses(+ $currentStart,+ $currentEnd,+ null,+ $budgetCollection,+ $entry->transactionCurrency,+ $this->convertToPrimary+ );$spent = $expenses[$currency->id]['sum'] ?? '0';$entry->pc_spent = $spent;diff --git a/app/Support/JsonApi/Enrichments/AccountEnrichment.php b/app/Support/JsonApi/Enrichments/AccountEnrichment.phpindex f769f1c67b..4ed99bdac4 100644--- a/app/Support/JsonApi/Enrichments/AccountEnrichment.php+++ b/app/Support/JsonApi/Enrichments/AccountEnrichment.php@@ -345,7 +345,7 @@ class AccountEnrichment implements EnrichmentInterface'interest_period','current_debt','cc_monthly_payment_date',- 'cc_type'+ 'cc_type',])->whereIn('account_id', $this->ids)->get(['account_meta.id', 'account_meta.account_id', 'account_meta.name', 'account_meta.data'])diff --git a/app/Support/JsonApi/Enrichments/RecurringEnrichment.php b/app/Support/JsonApi/Enrichments/RecurringEnrichment.phpindex d0c09bf027..2428353cb0 100644--- a/app/Support/JsonApi/Enrichments/RecurringEnrichment.php+++ b/app/Support/JsonApi/Enrichments/RecurringEnrichment.php@@ -354,7 +354,11 @@ class RecurringEnrichment implements EnrichmentInterface/** @var RecurrenceRepetition $repetition */foreach ($set as $repetition) {- $recurrence = $this->collection->filter(static fn (Recurrence $item): bool => (int) $item->id === (int) $repetition->recurrence_id)->first();+ $recurrence = $this->collection->filter(+ static fn (Recurrence $item): bool => (int) $item->id === (int) $repetition->recurrence_id+ )+ ->first()+ ;$fromDate = clone ($recurrence->latest_date ?? $recurrence->first_date);$recurrenceId = (int) $repetition->recurrence_id;$repId = (int) $repetition->id;diff --git a/composer.lock b/composer.lockindex f1727ddab6..9b216ddd34 100644--- a/composer.lock+++ b/composer.lock@@ -1246,21 +1246,21 @@},{"name": "guzzlehttp/guzzle",- "version": "7.15.2",+ "version": "7.15.3","source": {"type": "git","url": "https://github.com/guzzle/guzzle.git",- "reference": "744101956d78b7c1384d0cbf379db13e859167bf"+ "reference": "ae311b8f045ea93ce7b1c9cdb7cec06c53f944bc"},"dist": {"type": "zip",- "url": "https://api.github.com/repos/guzzle/guzzle/zipball/744101956d78b7c1384d0cbf379db13e859167bf",- "reference": "744101956d78b7c1384d0cbf379db13e859167bf",+ "url": "https://api.github.com/repos/guzzle/guzzle/zipball/ae311b8f045ea93ce7b1c9cdb7cec06c53f944bc",+ "reference": "ae311b8f045ea93ce7b1c9cdb7cec06c53f944bc","shasum": ""},"require": {"ext-json": "*",- "guzzlehttp/promises": "^2.5.1",+ "guzzlehttp/promises": "^2.5.2","guzzlehttp/psr7": "^2.13","php": "^7.2.5 || ^8.0","psr/http-client": "^1.0",@@ -1354,7 +1354,7 @@],"support": {"issues": "https://github.com/guzzle/guzzle/issues",- "source": "https://github.com/guzzle/guzzle/tree/7.15.2"+ "source": "https://github.com/guzzle/guzzle/tree/7.15.3"},"funding": [{@@ -1370,20 +1370,20 @@"type": "tidelift"}],- "time": "2026-07-26T23:23:20+00:00"+ "time": "2026-08-05T19:48:21+00:00"},{"name": "guzzlehttp/promises",- "version": "2.5.1",+ "version": "2.5.2","source": {"type": "git","url": "https://github.com/guzzle/promises.git",- "reference": "9ad1e4fc607446a055b95870c7f668e93b5cff29"+ "reference": "2823687acff28b2dbe67b2508a6b300e2c3fa4ce"},"dist": {"type": "zip",- "url": "https://api.github.com/repos/guzzle/promises/zipball/9ad1e4fc607446a055b95870c7f668e93b5cff29",- "reference": "9ad1e4fc607446a055b95870c7f668e93b5cff29",+ "url": "https://api.github.com/repos/guzzle/promises/zipball/2823687acff28b2dbe67b2508a6b300e2c3fa4ce",+ "reference": "2823687acff28b2dbe67b2508a6b300e2c3fa4ce","shasum": ""},"require": {@@ -1438,7 +1438,7 @@],"support": {"issues": "https://github.com/guzzle/promises/issues",- "source": "https://github.com/guzzle/promises/tree/2.5.1"+ "source": "https://github.com/guzzle/promises/tree/2.5.2"},"funding": [{@@ -1454,7 +1454,7 @@"type": "tidelift"}],- "time": "2026-07-08T15:48:39+00:00"+ "time": "2026-08-05T19:30:54+00:00"},{"name": "guzzlehttp/psr7",@@ -10095,16 +10095,16 @@},{"name": "carthage-software/mago",- "version": "1.45.0",+ "version": "1.46.0","source": {"type": "git","url": "https://github.com/carthage-software/mago.git",- "reference": "8771af7d3cdac8d2934e8fd187563d3c0464ac9a"+ "reference": "256da8ab866491730bf402d015161876330c822d"},"dist": {"type": "zip",- "url": "https://api.github.com/repos/carthage-software/mago/zipball/8771af7d3cdac8d2934e8fd187563d3c0464ac9a",- "reference": "8771af7d3cdac8d2934e8fd187563d3c0464ac9a",+ "url": "https://api.github.com/repos/carthage-software/mago/zipball/256da8ab866491730bf402d015161876330c822d",+ "reference": "256da8ab866491730bf402d015161876330c822d","shasum": ""},"require": {@@ -10142,7 +10142,7 @@],"support": {"issues": "https://github.com/carthage-software/mago/issues",- "source": "https://github.com/carthage-software/mago/tree/1.45.0"+ "source": "https://github.com/carthage-software/mago/tree/1.46.0"},"funding": [{@@ -10150,7 +10150,7 @@"type": "github"}],- "time": "2026-07-24T04:43:42+00:00"+ "time": "2026-08-05T22:31:08+00:00"},{"name": "cloudcreativity/json-api-testing",diff --git a/config/firefly.php b/config/firefly.phpindex fbe875615c..726bb90972 100644--- a/config/firefly.php+++ b/config/firefly.php@@ -78,8 +78,8 @@ return ['running_balance_column' => (bool)env_default_when_empty(env('USE_RUNNING_BALANCE'), true), // this is only the default value, is not used.// see cer.php for exchange rates feature flag.],-'version' => 'develop/2026-08-05',-'build_time' => 1785903483,+'version' => 'develop/2026-08-06',+'build_time' => 1785984973,'api_version' => '2.1.0', // field is no longer used.'db_version' => 28, // field is no longer used.diff --git a/package-lock.json b/package-lock.jsonindex de8e867639..96cd0a8bf8 100644--- a/package-lock.json+++ b/package-lock.json@@ -1868,9 +1868,9 @@}},"node_modules/@oxc-project/types": {- "version": "0.142.0",- "resolved": "https://registry.npmjs.org/@oxc-project/types/-/types-0.142.0.tgz",- "integrity": "sha512-7W+2q5AKQVU36fkaryontrHn3YDt1RyUYXatw9i5H8ocYe2sPKSFB6eS8WNPeRKiN1qAWWZUPm7gwFzJGrccqQ==",+ "version": "0.143.0",+ "resolved": "https://registry.npmjs.org/@oxc-project/types/-/types-0.143.0.tgz",+ "integrity": "sha512-u6JZdLBTLotrNC9Vd6vPssINdzcCzleKAH6EJKImQb7GtYvX5keN2dxkoK44stCc4tffE6QQRtZTXVSzsLUlWA==","dev": true,"license": "MIT","funding": {@@ -2190,9 +2190,9 @@}},"node_modules/@rolldown/binding-android-arm64": {- "version": "1.2.2",- "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm64/-/binding-android-arm64-1.2.2.tgz",- "integrity": "sha512-l7x215OGvo1s52JWmR8U/DAVzEDWBCIbTm28aeJV/WDTSHgcKXaZTuBT0hJMs5NggilfJTW3clZVvd24yfKJxA==",+ "version": "1.2.3",+ "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm64/-/binding-android-arm64-1.2.3.tgz",+ "integrity": "sha512-zrJtHDcaZJ1Fp7xf4hNl+7seH9Cn/N5TwLYkhgXREtBwAd/jaqW3uqeHxpDugJLVICWg4eW44kOQEGJ1r6jCGw==","cpu": ["arm64"],@@ -2207,9 +2207,9 @@}},"node_modules/@rolldown/binding-darwin-arm64": {- "version": "1.2.2",- "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-arm64/-/binding-darwin-arm64-1.2.2.tgz",- "integrity": "sha512-9u9Xv6c1AJZT0FfwH5vrMG5Jjcwhc1MlyrPu0XfTqkzsmqfks2M6W/o5XwAJgVVN/jHpqqngC1WevHKKTIUtIA==",+ "version": "1.2.3",+ "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-arm64/-/binding-darwin-arm64-1.2.3.tgz",+ "integrity": "sha512-ieIiibVCp0tX7TLu2cafoNPv8wJyYi01ekXpbf8q2j7F4rGAhhXb/eQh7ge9DRBY78GwmRQtvjZDux7EDbA8kA==","cpu": ["arm64"],@@ -2224,9 +2224,9 @@}},"node_modules/@rolldown/binding-darwin-x64": {- "version": "1.2.2",- "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-x64/-/binding-darwin-x64-1.2.2.tgz",- "integrity": "sha512-9W1mbGZAfW3oqd85bhBkmpyHCCzL1TeG/zFFP3vg7b0rlly8cxOcre5nXwz+LHazCwac2MNWgPdPCHndABjpWQ==",+ "version": "1.2.3",+ "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-x64/-/binding-darwin-x64-1.2.3.tgz",+ "integrity": "sha512-Zh9tCon19eDXJoihx0rqKhMUlMYqzwj3aPsSuHmI4RWZh62dWUL+DJN4C5YQya5TcQBJU/Fe8+rY0jhXTQITqA==","cpu": ["x64"],@@ -2241,9 +2241,9 @@}},"node_modules/@rolldown/binding-freebsd-x64": {- "version": "1.2.2",- "resolved": "https://registry.npmjs.org/@rolldown/binding-freebsd-x64/-/binding-freebsd-x64-1.2.2.tgz",- "integrity": "sha512-0p1lhiCSCyaerFwtrdZQUx7NqGk6LQnaRKWX7tFQqwQgvX0rjM15cIkm3pax1UpEakK14C4mOxx/jSqCBdBRqQ==",+ "version": "1.2.3",+ "resolved": "https://registry.npmjs.org/@rolldown/binding-freebsd-x64/-/binding-freebsd-x64-1.2.3.tgz",+ "integrity": "sha512-nGbJWewA1wrXXZiQhjAT5rhibGfns5ZNkDVqxsO6zJ3f3YvpoDNNmGMSbbhLuXKjNScaBJVOAboztAWVespQMg==","cpu": ["x64"],@@ -2258,9 +2258,9 @@}},"node_modules/@rolldown/binding-linux-arm-gnueabihf": {- "version": "1.2.2",- "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-1.2.2.tgz",- "integrity": "sha512-e+cOJXrJ2L3zx6YzqPg+f6Wbk3V1cKB8bOhbaYdVYN3DdquzNdRAmrbETz1qnt5yp/c7JNlNjmITiA2cVneQ7w==",+ "version": "1.2.3",+ "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-1.2.3.tgz",+ "integrity": "sha512-QNniJr5Kml0kDEB98jiDOJjXNroxIIi0IXIbdYzY26Xt1pVbeP62+KnoIZLwirOymX/0jDk/2gI/bNUv7A7OIw==","cpu": ["arm"],@@ -2275,9 +2275,9 @@}},"node_modules/@rolldown/binding-linux-arm64-gnu": {- "version": "1.2.2",- "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-1.2.2.tgz",- "integrity": "sha512-JsSMsj6sNat/MuhG5fnBD7QgbtpHKVe30x5/bAVirDHdhoQRXJkF6xc0Jqk8O4fiCUQAzMOoH9wZi3m60c8wtg==",+ "version": "1.2.3",+ "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-1.2.3.tgz",+ "integrity": "sha512-TkqEAcmmvH3I/q4114NB4RVt6241Dao48pF45uLcFGrwAaIn0iITgTAKP/dLjbN0R4buJjGb91+UHSoFmpgIWw==","cpu": ["arm64"],@@ -2292,9 +2292,9 @@}},"node_modules/@rolldown/binding-linux-arm64-musl": {- "version": "1.2.2",- "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-musl/-/binding-linux-arm64-musl-1.2.2.tgz",- "integrity": "sha512-B5G/zJdHaoJn9vD50eGHWkiWfmq8Uhi3IiLPJTzmZTrAalk1bztUikSXo0qga18ibE0IXboyeMUnhPjhAJ45wQ==",+ "version": "1.2.3",+ "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-musl/-/binding-linux-arm64-musl-1.2.3.tgz",+ "integrity": "sha512-NHqjnxpsndf4MPymxteFAWHHfkTL8HjWh1KB7z23ofZ6QO2euONuxDXjat69dKZRALnGypg8k8SsK8vZJoXv1Q==","cpu": ["arm64"],@@ -2309,9 +2309,9 @@}},"node_modules/@rolldown/binding-linux-ppc64-gnu": {- "version": "1.2.2",- "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-1.2.2.tgz",- "integrity": "sha512-6mC/awzKka8W6EoekjegpfGkjz8jXWDX63pqu/HYVpyKtZfu65Jsh4QAH3Kej3CAv/c1oGX7psTmFEbr0mDxLA==",+ "version": "1.2.3",+ "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-1.2.3.tgz",+ "integrity": "sha512-6tbrbwfz5GB9DQ4Jwo6hy9v+vR31xZlvzZ6n5Xut6Hhx5PvrA9q/HsK8KMaYQp063iqZGXwNvZtYNLD7EM/x0w==","cpu": ["ppc64"],@@ -2326,9 +2326,9 @@}},"node_modules/@rolldown/binding-linux-s390x-gnu": {- "version": "1.2.2",- "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-1.2.2.tgz",- "integrity": "sha512-412MX9fJLdA1IK28EZnc8jYv2HRTleOZgfLQumJ5zy7OeJLZlg/CETwFaXjNmGVxG51cFHpKLqb5LKvBC+HsHA==",+ "version": "1.2.3",+ "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-1.2.3.tgz",+ "integrity": "sha512-oyuXxXmoZHjXC917IAPFAAv4wWAa0cM9afk8nx1+9/jNNOX1uPf8yDA6p7G0RypOfw/X0PQt5IfoquY1um+zSg==","cpu": ["s390x"],@@ -2343,9 +2343,9 @@}},"node_modules/@rolldown/binding-linux-x64-gnu": {- "version": "1.2.2",- "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-gnu/-/binding-linux-x64-gnu-1.2.2.tgz",- "integrity": "sha512-Q/+HI/ToJafZ1iCqGgVQXUEkIjufHCTF0gBQ2a5o3cg7GJ2h0qyq3nvvSmU+bGda2/7ygXpTY4TM6gO9OhQ0ZA==",+ "version": "1.2.3",+ "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-gnu/-/binding-linux-x64-gnu-1.2.3.tgz",+ "integrity": "sha512-TytMwF2KVGqP2tgd0I1OY0PAv78dZRAYcF5ssDzjM34SUXCED3uXvSd5+lHoC0bTD6eEdFz7LdQNCO1y0oVk9w==","cpu": ["x64"],@@ -2360,9 +2360,9 @@}},"node_modules/@rolldown/binding-linux-x64-musl": {- "version": "1.2.2",- "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-musl/-/binding-linux-x64-musl-1.2.2.tgz",- "integrity": "sha512-ZKp/w41n6wCvxzxQHtQSbuphfX3Y4cCvbjkKHusrLx4lh+JWLTU7StSltO/DKARISzbj368d+qUaCjI8K2wzXw==",+ "version": "1.2.3",+ "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-musl/-/binding-linux-x64-musl-1.2.3.tgz",+ "integrity": "sha512-/E9m3qstrJFVPoULV25mVQblSNExY2+kBsYe4sy0Tn0yOOgJ8wZbZt3KnRbF/XeU2Gl1STKUQnDNTqhIE5MD4A==","cpu": ["x64"],@@ -2377,9 +2377,9 @@}},"node_modules/@rolldown/binding-openharmony-arm64": {- "version": "1.2.2",- "resolved": "https://registry.npmjs.org/@rolldown/binding-openharmony-arm64/-/binding-openharmony-arm64-1.2.2.tgz",- "integrity": "sha512-pxE6xD4KS3eAROkKK5yrhB9/3+vhlhVGMvlQLbdpzrBGDbKrnzx3RLwPaHvasLo6jgaiBLn7e04Df9C4tYhjmA==",+ "version": "1.2.3",+ "resolved": "https://registry.npmjs.org/@rolldown/binding-openharmony-arm64/-/binding-openharmony-arm64-1.2.3.tgz",+ "integrity": "sha512-Kr0OcsoQI816i6HOl3vFHpd1K0eZyh76zgfj4c1nTyaTsd5r2Mj1lwM4R90y/qaCfmTn9eHy0SKwi98eitRxug==","cpu": ["arm64"],@@ -2394,9 +2394,9 @@}},"node_modules/@rolldown/binding-win32-arm64-msvc": {- "version": "1.2.2",- "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-1.2.2.tgz",- "integrity": "sha512-4MqEue5re+xIZzAWsB8sj0P1kqZySWqIuN4t6QaIO/YA6SFwySOLruvWQFzfmqk8LBK2P30KCSJwf6mJCZZ5/A==",+ "version": "1.2.3",+ "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-1.2.3.tgz",+ "integrity": "sha512-hOtMwTqnME+/gJcH/PCZ0wn0zPUjiWOgkHpxbSJpfGKMezHltx1S7/k1SitzVa7Ww2cqrDDaFbZEhcJZO8o+Jw==","cpu": ["arm64"],@@ -2411,9 +2411,9 @@}},"node_modules/@rolldown/binding-win32-x64-msvc": {- "version": "1.2.2",- "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-x64-msvc/-/binding-win32-x64-msvc-1.2.2.tgz",- "integrity": "sha512-NweNxxD0Nf9t8v7kodun45Ijp3EIwYY+uydPP6qBEYvfBqhIjN6dZMzlQja3tqX/aLs3F3Uz+AxDpKgRhpOZQg==",+ "version": "1.2.3",+ "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-x64-msvc/-/binding-win32-x64-msvc-1.2.3.tgz",+ "integrity": "sha512-ekcqMMkI2PlhYnfzQnB/cEdYUVVJViWvoUyLrbzgDoi3Snfc1mVBwdnc306ufA5ejy8JSPjT2RlW1nQSjW7efg==","cpu": ["x64"],@@ -4453,13 +4453,16 @@"license": "MIT"},"node_modules/core-js-compat": {- "version": "3.49.0",- "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.49.0.tgz",- "integrity": "sha512-VQXt1jr9cBz03b331DFDCCP90b3fanciLkgiOoy8SBHy06gNf+vQ1A3WFLqG7I8TipYIKeYK9wxd0tUrvHcOZA==",+ "version": "3.50.0",+ "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.50.0.tgz",+ "integrity": "sha512-XGpFGbMLHwSt74YLTKho7Ib242qi6O8MSX+sRokV4oz7iKXvQWGYZthjIhjRGMxjzVkAubBO512dKGYcefmX3Q==","dev": true,"license": "MIT","dependencies": {- "browserslist": "^4.28.1"+ "browserslist": "^4.28.7"+ },+ "engines": {+ "node": ">=6.4.0"},"funding": {"type": "opencollective",@@ -5183,9 +5186,9 @@"license": "MIT"},"node_modules/electron-to-chromium": {- "version": "1.5.401",- "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.401.tgz",- "integrity": "sha512-H6ViHN68nGYlChEvlIU67fn8O2/tpbWQPwck98yaJmh+08LSvHiydzDQ6oXNccLU3kNRVIRS9A4mA7CG+i6fLQ==",+ "version": "1.5.402",+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.402.tgz",+ "integrity": "sha512-/oOpMaPT6Yg+6/1XQhyIPlzgj7Ye9zf+nNM2Uh6OcE2G2oNptWazFa+qB2Pdqqbsc9KnIDzgAntoYN0dbwOXwA==","dev": true,"license": "ISC"},@@ -9678,13 +9681,13 @@}},"node_modules/rolldown": {- "version": "1.2.2",- "resolved": "https://registry.npmjs.org/rolldown/-/rolldown-1.2.2.tgz",- "integrity": "sha512-opwpo1tQBAcpSUJDt94B7hhLNGOKjCdE//XXjeLrnx9b83bjnw45tXdg1b09yEw/VLFBJGZpwRULMmOZo7ol+A==",+ "version": "1.2.3",+ "resolved": "https://registry.npmjs.org/rolldown/-/rolldown-1.2.3.tgz",+ "integrity": "sha512-rn9wpmxplLf7NLNyCk9FyWh3FM43DbY8jOzCdEPzH7uflhTftRbCEpqi6Ly2osgoU8OwObtmavMbWLaWy4LX7A==","dev": true,"license": "MIT","dependencies": {- "@oxc-project/types": "=0.142.0",+ "@oxc-project/types": "=0.143.0","@rolldown/pluginutils": "^1.0.0"},"bin": {@@ -9694,20 +9697,20 @@"node": "^20.19.0 || >=22.12.0"},"optionalDependencies": {- "@rolldown/binding-android-arm64": "1.2.2",- "@rolldown/binding-darwin-arm64": "1.2.2",- "@rolldown/binding-darwin-x64": "1.2.2",- "@rolldown/binding-freebsd-x64": "1.2.2",- "@rolldown/binding-linux-arm-gnueabihf": "1.2.2",- "@rolldown/binding-linux-arm64-gnu": "1.2.2",- "@rolldown/binding-linux-arm64-musl": "1.2.2",- "@rolldown/binding-linux-ppc64-gnu": "1.2.2",- "@rolldown/binding-linux-s390x-gnu": "1.2.2",- "@rolldown/binding-linux-x64-gnu": "1.2.2",- "@rolldown/binding-linux-x64-musl": "1.2.2",- "@rolldown/binding-openharmony-arm64": "1.2.2",- "@rolldown/binding-win32-arm64-msvc": "1.2.2",- "@rolldown/binding-win32-x64-msvc": "1.2.2"+ "@rolldown/binding-android-arm64": "1.2.3",+ "@rolldown/binding-darwin-arm64": "1.2.3",+ "@rolldown/binding-darwin-x64": "1.2.3",+ "@rolldown/binding-freebsd-x64": "1.2.3",+ "@rolldown/binding-linux-arm-gnueabihf": "1.2.3",+ "@rolldown/binding-linux-arm64-gnu": "1.2.3",+ "@rolldown/binding-linux-arm64-musl": "1.2.3",+ "@rolldown/binding-linux-ppc64-gnu": "1.2.3",+ "@rolldown/binding-linux-s390x-gnu": "1.2.3",+ "@rolldown/binding-linux-x64-gnu": "1.2.3",+ "@rolldown/binding-linux-x64-musl": "1.2.3",+ "@rolldown/binding-openharmony-arm64": "1.2.3",+ "@rolldown/binding-win32-arm64-msvc": "1.2.3",+ "@rolldown/binding-win32-x64-msvc": "1.2.3"}},"node_modules/run-parallel": {@@ -10586,9 +10589,9 @@"peer": true},"node_modules/terser": {- "version": "5.49.1",- "resolved": "https://registry.npmjs.org/terser/-/terser-5.49.1.tgz",- "integrity": "sha512-7A2xlQ5EnGT8KPA92dUh6RbRYTVw8hEaEN9L1K68l4UOXFuV511NnAqObGoRqGOQofQcMypisu1s3xawCEHrvA==",+ "version": "5.49.2",+ "resolved": "https://registry.npmjs.org/terser/-/terser-5.49.2.tgz",+ "integrity": "sha512-rGbJiKeQ4WDe3EXlDAIaQcwftVfv2Q8o1awFNfvXolJYKkb1AuZY1RTOmqx4LJXZENbWZA7eIsYGHuEzHsi1nQ==","dev": true,"license": "BSD-2-Clause","dependencies": {