Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
🤖 Auto commit for release 'develop' on 2026-04-24
JC5a6fd80520202
diff --git a/THANKS.md b/THANKS.mdindex 8472000e73..877b85685f 100755--- a/THANKS.md+++ b/THANKS.md@@ -4,6 +4,7 @@ Over time, many people have contributed to Firefly III. Their efforts are not alPlease find below all the people who contributed to the Firefly III code. Their names are mentioned in the year of their first contribution.## 2026+- tasnim0tantawi- Joe Longendyke- Daniel Holøien- Matthew Grovediff --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/Helpers/Functions/helpers.php b/app/Helpers/Functions/helpers.phpindex 87be8c88bc..f271f5376b 100644--- a/app/Helpers/Functions/helpers.php+++ b/app/Helpers/Functions/helpers.php@@ -1,4 +1,5 @@<?php+/** helpers.php* Copyright (c) 2026 [email protected]@@ -22,16 +23,16 @@declare(strict_types=1);use FireflyIII\Exceptions\FireflyException;++use function Safe\mb_ord;use function Safe\preg_match;use function Safe\preg_replace_callback;-use function Safe\mb_ord;if (!function_exists('env_default_when_empty')) {/**- *- * @return mixed|null+ * @return null|mixed*/- function env_default_when_empty(mixed $value, string | int | bool | null $default = null): mixed+ function env_default_when_empty(mixed $value, bool|int|string|null $default = null): mixed{if (null === $value) {return $default;@@ -39,6 +40,7 @@ if (!function_exists('env_default_when_empty')) {if ('' === $value) {return $default;}+return $value;}}@@ -59,41 +61,45 @@ if (!function_exists('blade_escape_js')) {throw new FireflyException('The string to escape is not a valid UTF-8 string.');}- return preg_replace_callback('#[^a-zA-Z0-9,\._]#Su', static function ($matches) {- $char = $matches[0];+ return preg_replace_callback(+ '#[^a-zA-Z0-9,\._]#Su',+ static function ($matches) {+ $char = $matches[0];- /*- * A few characters have short escape sequences in JSON and JavaScript.- * Escape sequences supported only by JavaScript, not JSON, are omitted.- * \" is also supported but omitted, because the resulting string is not HTML safe.- */- $short = match ($char) {- '\\' => '\\\\',- '/' => '\\/',- "\x08" => '\b',- "\x0C" => '\f',- "\x0A" => '\n',- "\x0D" => '\r',- "\x09" => '\t',- default => false,- };+ /*+ * A few characters have short escape sequences in JSON and JavaScript.+ * Escape sequences supported only by JavaScript, not JSON, are omitted.+ * \" is also supported but omitted, because the resulting string is not HTML safe.+ */+ $short = match ($char) {+ '\\' => '\\\\',+ '/' => '\/',+ "\x08" => '\b',+ "\x0C" => '\f',+ "\x0A" => '\n',+ "\x0D" => '\r',+ "\x09" => '\t',+ default => false+ };- if ($short) {- return $short;- }+ if ($short) {+ return $short;+ }- $codepoint = mb_ord($char, 'UTF-8');- if (0x10_000 > $codepoint) {- return \sprintf('\u%04X', $codepoint);- }+ $codepoint = mb_ord($char, 'UTF-8');+ if (0x10_000 > $codepoint) {+ return \sprintf('\u%04X', $codepoint);+ }- // Split characters outside the BMP into surrogate pairs- // https://tools.ietf.org/html/rfc2781.html#section-2.1- $u = $codepoint - 0x10_000;- $high = 0xD800 | ($u >> 10);- $low = 0xDC00 | ($u & 0x3FF);+ // Split characters outside the BMP into surrogate pairs+ // https://tools.ietf.org/html/rfc2781.html#section-2.1+ $u = $codepoint - 0x10_000;+ $high = 0xD800 | ($u >> 10);+ $low = 0xDC00 | ($u & 0x3FF);- return \sprintf('\u%04X\u%04X', $high, $low);- }, $string);+ return \sprintf('\u%04X\u%04X', $high, $low);+ },+ $string+ );}}diff --git a/app/Http/Controllers/Bill/IndexController.php b/app/Http/Controllers/Bill/IndexController.phpindex 2009369ae0..07947c2c85 100644--- a/app/Http/Controllers/Bill/IndexController.php+++ b/app/Http/Controllers/Bill/IndexController.php@@ -255,7 +255,10 @@ final class IndexController extends Controllerif (count($bill['paid_dates']) < count($bill['pay_dates'])) {$count = count($bill['pay_dates']) - count($bill['paid_dates']);if ($count > 0) {- $avg = bcdiv(bcadd((string) $bill['amount_min'], (string) $bill['amount_max']), '2');+ $avg = bcdiv(+ bcadd((string) $bill['amount_min'], (string) $bill['amount_max']),+ '2'+ );$avg = bcmul($avg, (string) $count);$sums[$groupOrder][$currencyId]['total_left_to_pay'] = bcadd($sums[$groupOrder][$currencyId]['total_left_to_pay'], $avg);Log::debug(diff --git a/app/Http/Controllers/Budget/BudgetLimitController.php b/app/Http/Controllers/Budget/BudgetLimitController.phpindex 9632996690..b263d702a2 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 c4dc30e617..a5eb4be4d4 100644--- a/app/Http/Controllers/Budget/IndexController.php+++ b/app/Http/Controllers/Budget/IndexController.php@@ -245,13 +245,7 @@ final class IndexController extends Controller$inPast = $limitPeriod->startsBefore(now()) && $limitPeriod->endsBefore(now());$currency = $limit->transactionCurrency ?? $primaryCurrency;$amount = Steam::bcround($limit->amount, $currency->decimal_places);- $spent = $this->opsRepository->sumExpenses(- $limit->start_date,- $limit->end_date,- null,- new Collection()->push($budget),- $currency- );+ $spent = $this->opsRepository->sumExpenses($limit->start_date, $limit->end_date, null, new Collection()->push($budget), $currency);$spentAmount = $spent[$currency->id]['sum'] ?? '0';$array['budgeted'][] = ['id' => $limit->id,@@ -289,7 +283,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'] = bcmul(bcsub($spentInLimits[$currency->id], $spentArr[$currency->id]['sum']), '-1');+ $array['spent'][$currency->id]['spent_outside'] = bcmul(+ bcsub($spentInLimits[$currency->id], $spentArr[$currency->id]['sum']),+ '-1'+ );$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/Http/Controllers/Profile/OAuthController.php b/app/Http/Controllers/Profile/OAuthController.phpindex bc0190f98b..46aba8d057 100644--- a/app/Http/Controllers/Profile/OAuthController.php+++ b/app/Http/Controllers/Profile/OAuthController.php@@ -115,7 +115,7 @@ final class OAuthController extends Controllerpublic function listClients(): JsonResponse{- if(!auth()->check()) {+ if (!auth()->check()) {return response()->json([]);}Log::debug('Now in listClients()');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/AppServiceProvider.php b/app/Providers/AppServiceProvider.phpindex 8c18e39396..da8f692a67 100644--- a/app/Providers/AppServiceProvider.php+++ b/app/Providers/AppServiceProvider.php@@ -23,7 +23,6 @@ declare(strict_types=1);namespace FireflyIII\Providers;-use FireflyIII\Exceptions\FireflyException;use Illuminate\Support\Facades\Blade;use Illuminate\Support\Facades\Response;use Illuminate\Support\Facades\Route;@@ -31,6 +30,7 @@ use Illuminate\Support\Facades\Schema;use Illuminate\Support\ServiceProvider;use Laravel\Passport\Passport;use Override;+use function Safe\preg_match;/**@@ -49,7 +49,7 @@ class AppServiceProvider extends ServiceProviderSchema::defaultStringLength(191);Response::macro('api', function (array $value) {$headers = ['Cache-Control' => 'no-store'];- $uuid = (string)request()->header('X-Trace-Id');+ $uuid = (string) request()->header('X-Trace-Id');if ('' !== trim($uuid) && 1 === preg_match('/^[a-f\d]{8}(-[a-f\d]{4}){4}[a-f\d]{8}$/i', trim($uuid))) {$headers['X-Trace-Id'] = $uuid;}@@ -67,20 +67,18 @@ class AppServiceProvider extends ServiceProviderreturn '';});Blade::if('partialroute', function (string $route, string $firstParam = ''): bool {- $name = Route::getCurrentRoute()->getName() ?? '';+ $name = Route::getCurrentRoute()->getName() ?? '';if ('' === $firstParam && str_contains($name, $route)) {return true;}/** @var null|array $params */$params = Route::getCurrentRoute()->parameters();- $params ??= [];+ $params ??= [];$objectType = $params['objectType'] ?? '';return $objectType === $firstParam && str_contains($name, $route);});--}/**diff --git a/app/Rules/PiggyBank/IsEnoughInAccounts.php b/app/Rules/PiggyBank/IsEnoughInAccounts.phpindex b7880eccb8..04724eaec4 100644--- a/app/Rules/PiggyBank/IsEnoughInAccounts.php+++ b/app/Rules/PiggyBank/IsEnoughInAccounts.php@@ -54,9 +54,9 @@ class IsEnoughInAccounts implements ValidationRule$accounts = $this->data['accounts'];foreach ($accounts as $info) {- $account = $repository->find((int) $info['account_id']);- $amount = $info['current_amount'] ?? '0';- $savedSoFar = $piggyRepos->getCurrentAmount($this->piggyBank, $account);+ $account = $repository->find((int) $info['account_id']);+ $amount = $info['current_amount'] ?? '0';+ $savedSoFar = $piggyRepos->getCurrentAmount($this->piggyBank, $account);if (null === $account) {$fail('validation.no_asset_account')->translate();@@ -65,7 +65,7 @@ class IsEnoughInAccounts implements ValidationRuleif ('' === $amount || 0 === bccomp($amount, '0')) {continue;}- $diff = bcsub($amount, $savedSoFar);+ $diff = bcsub($amount, $savedSoFar);if (1 === bccomp($diff, '0') && !$piggyRepos->canAddAmount($this->piggyBank, $account, $diff)) {$fail('validation.cannot_add_piggy_amount')->translate();}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/RecurringEnrichment.php b/app/Support/JsonApi/Enrichments/RecurringEnrichment.phpindex 54d91d57c1..8d7c840315 100644--- a/app/Support/JsonApi/Enrichments/RecurringEnrichment.php+++ b/app/Support/JsonApi/Enrichments/RecurringEnrichment.php@@ -354,7 +354,10 @@ 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 74cc1939a5..c6870c9d62 100644--- a/composer.lock+++ b/composer.lock@@ -11511,16 +11511,16 @@},{"name": "phpunit/php-code-coverage",- "version": "14.1.3",+ "version": "14.1.4","source": {"type": "git","url": "https://github.com/sebastianbergmann/php-code-coverage.git",- "reference": "24dc6fcf9f2a983de5b3f1199fb01e88d68e7474"+ "reference": "13dd8d33c6a23da100acec635cd351bfa7ff1a98"},"dist": {"type": "zip",- "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/24dc6fcf9f2a983de5b3f1199fb01e88d68e7474",- "reference": "24dc6fcf9f2a983de5b3f1199fb01e88d68e7474",+ "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/13dd8d33c6a23da100acec635cd351bfa7ff1a98",+ "reference": "13dd8d33c6a23da100acec635cd351bfa7ff1a98","shasum": ""},"require": {@@ -11576,7 +11576,7 @@"support": {"issues": "https://github.com/sebastianbergmann/php-code-coverage/issues","security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy",- "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/14.1.3"+ "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/14.1.4"},"funding": [{@@ -11596,7 +11596,7 @@"type": "tidelift"}],- "time": "2026-04-18T05:41:54+00:00"+ "time": "2026-04-23T17:00:20+00:00"},{"name": "phpunit/php-file-iterator",diff --git a/config/firefly.php b/config/firefly.phpindex c08b83f8c8..2b0b2455c2 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-04-22',-'build_time' => 1776876664,+'version' => 'develop/2026-04-24',+'build_time' => 1777003029,'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 3670bd9528..689b9794a1 100644--- a/package-lock.json+++ b/package-lock.json@@ -3315,9 +3315,9 @@"license": "MIT"},"node_modules/ajv": {- "version": "6.14.0",- "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.14.0.tgz",- "integrity": "sha512-IWrosm/yrn43eiKqkfkHis7QioDleaXQHdDVPKg0FSwwd/DuvyX79TZnFOnYpB7dcsFAMmtFztZuXPDvSePkFw==",+ "version": "6.15.0",+ "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.15.0.tgz",+ "integrity": "sha512-fgFx7Hfoq60ytK2c7DhnF8jIvzYgOMxfugjLOSMHjLIPgenqa7S7oaagATUq99mV6IYvN2tRmC0wnTYX6iPbMw==","dev": true,"license": "MIT","dependencies": {@@ -5337,9 +5337,9 @@"license": "MIT"},"node_modules/electron-to-chromium": {- "version": "1.5.343",- "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.343.tgz",- "integrity": "sha512-YHnQ3MXI08icvL9ZKnEBy05F2EQ8ob01UaMOuMbM8l+4UcAq6MPPbBTJBbsBUg3H8JeZNt+O4fjsoWth3p6IFg==",+ "version": "1.5.344",+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.344.tgz",+ "integrity": "sha512-4MxfbmNDm+KPh066EZy+eUnkcDPcZ35wNmOWzFuh/ijvHsve6kbLTLURy88uCNK5FbpN+yk2nQY6BYh1GEt+wg==","dev": true,"license": "ISC"},@@ -5394,14 +5394,14 @@}},"node_modules/enhanced-resolve": {- "version": "5.20.1",- "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.20.1.tgz",- "integrity": "sha512-Qohcme7V1inbAfvjItgw0EaxVX5q2rdVEZHRBrEQdRZTssLDGsL8Lwrznl8oQ/6kuTJONLaDcGjkNP247XEhcA==",+ "version": "5.21.0",+ "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.21.0.tgz",+ "integrity": "sha512-otxSQPw4lkOZWkHpB3zaEQs6gWYEsmX4xQF68ElXC/TWvGxGMSGOvoNbaLXm6/cS/fSfHtsEdw90y20PCd+sCA==","dev": true,"license": "MIT","dependencies": {"graceful-fs": "^4.2.4",- "tapable": "^2.3.0"+ "tapable": "^2.3.3"},"engines": {"node": ">=10.13.0"@@ -6646,9 +6646,9 @@}},"node_modules/i18next": {- "version": "26.0.6",- "resolved": "https://registry.npmjs.org/i18next/-/i18next-26.0.6.tgz",- "integrity": "sha512-A4U6eCXodIbrhf8EarRurB9/4ebyaurH4+fu4gig9bqxmpSt+fCAFm/GpRQDcN1Xzu/LdFCx4nYHsnM1edIIbg==",+ "version": "26.0.7",+ "resolved": "https://registry.npmjs.org/i18next/-/i18next-26.0.7.tgz",+ "integrity": "sha512-f7tL/iw0VQsx4nC5oNxBM2RjM8alNys5KzyiQTU6A9TI5TI89py4/Ez1cKFvHiLWsvzOXvuGUES+Kk/A2WiANQ==","funding": [{"type": "individual",@@ -6664,9 +6664,6 @@}],"license": "MIT",- "dependencies": {- "@babel/runtime": "^7.29.2"- },"peerDependencies": {"typescript": "^5 || ^6"},@@ -6686,9 +6683,9 @@}},"node_modules/i18next-http-backend": {- "version": "3.0.5",- "resolved": "https://registry.npmjs.org/i18next-http-backend/-/i18next-http-backend-3.0.5.tgz",- "integrity": "sha512-QaWHnsxieEDcqKe+vo/RFqpiIFRi/KBqlOSPcUlvinBaISCeiTRCbtrazHAjtHtsLC66oDsROAH8frWkQzfMMQ==",+ "version": "3.0.6",+ "resolved": "https://registry.npmjs.org/i18next-http-backend/-/i18next-http-backend-3.0.6.tgz",+ "integrity": "sha512-mBOqy8993jtqAoj6XaI1XeC/8/9v6EPS+681ziegrPvTB0DoaCY7PpTS0SpY56qLMoS4OI1TZEM2Zf59zNh05w==","license": "MIT","dependencies": {"cross-fetch": "4.1.0"@@ -10762,9 +10759,9 @@}},"node_modules/terser": {- "version": "5.46.1",- "resolved": "https://registry.npmjs.org/terser/-/terser-5.46.1.tgz",- "integrity": "sha512-vzCjQO/rgUuK9sf8VJZvjqiqiHFaZLnOiimmUuOKODxWL8mm/xua7viT7aqX7dgPY60otQjUotzFMmCB4VdmqQ==",+ "version": "5.46.2",+ "resolved": "https://registry.npmjs.org/terser/-/terser-5.46.2.tgz",+ "integrity": "sha512-uxfo9fPcSgLDYob/w1FuL0c99MWiJDnv+5qXSQc5+Ki5NjVNsYi66INnMFBjf6uFz6OnX12piJQPF4IpjJTNTw==","dev": true,"license": "BSD-2-Clause","dependencies": {@@ -10781,9 +10778,9 @@}},"node_modules/terser-webpack-plugin": {- "version": "5.4.0",- "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.4.0.tgz",- "integrity": "sha512-Bn5vxm48flOIfkdl5CaD2+1CiUVbonWQ3KQPyP7/EuIl9Gbzq/gQFOzaMFUEgVjB1396tcK0SG8XcNJ/2kDH8g==",+ "version": "5.5.0",+ "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.5.0.tgz",+ "integrity": "sha512-UYhptBwhWvfIjKd/UuFo6D8uq9xpGLDK+z8EDsj/zWhrTaH34cKEbrkMKfV5YWqGBvAYA3tlzZbs2R+qYrbQJA==","dev": true,"license": "MIT","dependencies": {@@ -11983,9 +11980,9 @@}},"node_modules/webpack/node_modules/webpack-sources": {- "version": "3.3.4",- "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.3.4.tgz",- "integrity": "sha512-7tP1PdV4vF+lYPnkMR0jMY5/la2ub5Fc/8VQrrU+lXkiM6C4TjVfGw7iKfyhnTQOsD+6Q/iKw0eFciziRgD58Q==",+ "version": "3.4.0",+ "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.4.0.tgz",+ "integrity": "sha512-gHwIe1cgBvvfLeu1Yz/dcFpmHfKDVxxyqI+kzqmuxZED81z2ChxpyqPaWcNqigPywhaEke7AjSGga+kxY55gjQ==","dev": true,"license": "MIT","engines": {diff --git a/resources/lang/en_US/validation.php b/resources/lang/en_US/validation.phpindex 5ba532f5f4..7a8d1f602d 100644--- a/resources/lang/en_US/validation.php+++ b/resources/lang/en_US/validation.php@@ -23,7 +23,7 @@declare(strict_types=1);return [- 'verifying_password' => 'Verifying password...',+ 'verifying_password' => 'Verifying password...','invalid_account_list' => 'Invalid account type list entry ":value"','invalid_transaction_type_list' => 'Invalid transaction type list','limit_exists' => 'There is already a budget limit (amount) for this budget and currency in the given period.',diff --git a/routes/web.php b/routes/web.phpindex 2ec4e8e025..d98f3d10ec 100644--- a/routes/web.php+++ b/routes/web.php@@ -32,9 +32,9 @@ if (!defined('DATEFORMAT')) {// new Passport routes.Route::group([- 'as' => 'passport.',- 'prefix' => 'oauth',- 'middleware' => ['user-full-auth']+ 'as' => 'passport.',+ 'prefix' => 'oauth',+ 'middleware' => ['user-full-auth'],// 'namespace' => 'FireflyIII\Http\Controllers\OAuth',],function (): void {