Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
🤖 Auto commit for release 'develop' on 2026-09-15
JC56e2edf3537be
diff --git a/.ci/php-cs-fixer/composer.lock b/.ci/php-cs-fixer/composer.lockindex 270894389e..85dd6dc5eb 100644--- a/.ci/php-cs-fixer/composer.lock+++ b/.ci/php-cs-fixer/composer.lock@@ -1330,16 +1330,16 @@},{"name": "symfony/console",- "version": "v8.1.6",+ "version": "v8.1.7","source": {"type": "git","url": "https://github.com/symfony/console.git",- "reference": "eb7d9957d66739649e931ce7a9d05dab69f8abac"+ "reference": "29afb89f4e941f68a6e90f28e3f52ff1f6793a7d"},"dist": {"type": "zip",- "url": "https://api.github.com/repos/symfony/console/zipball/eb7d9957d66739649e931ce7a9d05dab69f8abac",- "reference": "eb7d9957d66739649e931ce7a9d05dab69f8abac",+ "url": "https://api.github.com/repos/symfony/console/zipball/29afb89f4e941f68a6e90f28e3f52ff1f6793a7d",+ "reference": "29afb89f4e941f68a6e90f28e3f52ff1f6793a7d","shasum": ""},"require": {@@ -1406,7 +1406,7 @@"terminal"],"support": {- "source": "https://github.com/symfony/console/tree/v8.1.6"+ "source": "https://github.com/symfony/console/tree/v8.1.7"},"funding": [{@@ -1426,7 +1426,7 @@"type": "tidelift"}],- "time": "2026-08-25T14:18:42+00:00"+ "time": "2026-09-13T10:55:57+00:00"},{"name": "symfony/deprecation-contracts",@@ -1738,16 +1738,16 @@},{"name": "symfony/finder",- "version": "v8.1.5",+ "version": "v8.1.7","source": {"type": "git","url": "https://github.com/symfony/finder.git",- "reference": "8d7acede2b2ae07605783d1c43e49b5767036474"+ "reference": "4fbe46a3eb64abf8a57f0364075b91f4a233e062"},"dist": {"type": "zip",- "url": "https://api.github.com/repos/symfony/finder/zipball/8d7acede2b2ae07605783d1c43e49b5767036474",- "reference": "8d7acede2b2ae07605783d1c43e49b5767036474",+ "url": "https://api.github.com/repos/symfony/finder/zipball/4fbe46a3eb64abf8a57f0364075b91f4a233e062",+ "reference": "4fbe46a3eb64abf8a57f0364075b91f4a233e062","shasum": ""},"require": {@@ -1782,7 +1782,7 @@"description": "Finds files and directories via an intuitive fluent interface","homepage": "https://symfony.com","support": {- "source": "https://github.com/symfony/finder/tree/v8.1.5"+ "source": "https://github.com/symfony/finder/tree/v8.1.7"},"funding": [{@@ -1802,7 +1802,7 @@"type": "tidelift"}],- "time": "2026-08-21T12:16:08+00:00"+ "time": "2026-09-10T19:14:39+00:00"},{"name": "symfony/options-resolver",@@ -2536,16 +2536,16 @@},{"name": "symfony/process",- "version": "v8.1.6",+ "version": "v8.1.7","source": {"type": "git","url": "https://github.com/symfony/process.git",- "reference": "d863f5e70d7c87abb906ac11b61f83036093000b"+ "reference": "10823b09358e690df4ff943e24e8492bb1019fc3"},"dist": {"type": "zip",- "url": "https://api.github.com/repos/symfony/process/zipball/d863f5e70d7c87abb906ac11b61f83036093000b",- "reference": "d863f5e70d7c87abb906ac11b61f83036093000b",+ "url": "https://api.github.com/repos/symfony/process/zipball/10823b09358e690df4ff943e24e8492bb1019fc3",+ "reference": "10823b09358e690df4ff943e24e8492bb1019fc3","shasum": ""},"require": {@@ -2577,7 +2577,7 @@"description": "Executes commands in sub-processes","homepage": "https://symfony.com","support": {- "source": "https://github.com/symfony/process/tree/v8.1.6"+ "source": "https://github.com/symfony/process/tree/v8.1.7"},"funding": [{@@ -2597,7 +2597,7 @@"type": "tidelift"}],- "time": "2026-08-21T17:47:34+00:00"+ "time": "2026-09-02T12:40:29+00:00"},{"name": "symfony/service-contracts",@@ -2754,16 +2754,16 @@},{"name": "symfony/string",- "version": "v8.1.2",+ "version": "v8.1.7","source": {"type": "git","url": "https://github.com/symfony/string.git",- "reference": "286a76b7255e5cc4bf0101a0bc5388ecf1c38ccc"+ "reference": "d950140b5f56f31901e5b7a0c04ffc3a3deb943c"},"dist": {"type": "zip",- "url": "https://api.github.com/repos/symfony/string/zipball/286a76b7255e5cc4bf0101a0bc5388ecf1c38ccc",- "reference": "286a76b7255e5cc4bf0101a0bc5388ecf1c38ccc",+ "url": "https://api.github.com/repos/symfony/string/zipball/d950140b5f56f31901e5b7a0c04ffc3a3deb943c",+ "reference": "d950140b5f56f31901e5b7a0c04ffc3a3deb943c","shasum": ""},"require": {@@ -2820,7 +2820,7 @@"utf8"],"support": {- "source": "https://github.com/symfony/string/tree/v8.1.2"+ "source": "https://github.com/symfony/string/tree/v8.1.7"},"funding": [{@@ -2840,7 +2840,7 @@"type": "tidelift"}],- "time": "2026-07-28T07:35:25+00:00"+ "time": "2026-09-11T14:51:16+00:00"}],"packages-dev": [],diff --git a/app/Api/V1/Controllers/Insight/Income/TagController.php b/app/Api/V1/Controllers/Insight/Income/TagController.phpindex 94be2ae461..df99eef909 100644--- a/app/Api/V1/Controllers/Insight/Income/TagController.php+++ b/app/Api/V1/Controllers/Insight/Income/TagController.php@@ -158,10 +158,7 @@ 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 b7b85fd376..f92a7aa9f0 100644--- a/app/Api/V1/Controllers/Insight/Transfer/TagController.php+++ b/app/Api/V1/Controllers/Insight/Transfer/TagController.php@@ -155,10 +155,7 @@ 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/Budget/BudgetLimitController.php b/app/Http/Controllers/Budget/BudgetLimitController.phpindex d461374baa..2edb4f5531 100644--- a/app/Http/Controllers/Budget/BudgetLimitController.php+++ b/app/Http/Controllers/Budget/BudgetLimitController.php@@ -198,13 +198,7 @@ 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 d40d4432a3..215ebbd484 100644--- a/app/Http/Controllers/Budget/IndexController.php+++ b/app/Http/Controllers/Budget/IndexController.php@@ -284,10 +284,7 @@ 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 f4b32fe5c5..ad724137dc 100644--- a/app/Http/Controllers/Chart/BudgetController.php+++ b/app/Http/Controllers/Chart/BudgetController.php@@ -539,13 +539,7 @@ 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/SearchController.php b/app/Http/Controllers/SearchController.phpindex 783109a028..679d332955 100644--- a/app/Http/Controllers/SearchController.php+++ b/app/Http/Controllers/SearchController.php@@ -32,6 +32,7 @@ use Illuminate\Http\Request;use Illuminate\Support\Facades\Log;use Illuminate\View\View;use Throwable;+use function Safe\mb_convert_encoding;/**@@ -48,7 +49,7 @@ final class SearchController extends Controllerapp('view')->share('showCategory', true);$this->middleware(static function ($request, $next) {app('view')->share('mainTitleIcon', 'bi-search');- app('view')->share('title', (string)trans('firefly.search'));+ app('view')->share('title', (string) trans('firefly.search'));return $next($request);});@@ -59,24 +60,25 @@ final class SearchController extends Controller** @return Factory|View*/- public function index(Request $request, SearchInterface $searcher): Factory | \Illuminate\Contracts\View\View+ public function index(Request $request, SearchInterface $searcher): Factory|\Illuminate\Contracts\View\View{// search params:- $fullQuery = (string)$request->input('search');- $fullQuery = substr($fullQuery, 0, 500);+ $fullQuery = (string) $request->input('search');+ $fullQuery = substr($fullQuery, 0, 500);if (is_array($request->input('search'))) {$fullQuery = '';}- $fullQuery = (string)$fullQuery;- $fullQuery = mb_convert_encoding($fullQuery, 'UTF-8', 'UTF-8');;- $page = 0 === (int)$request->input('page') ? 1 : (int)$request->input('page');- $page = clamp(value: $page, min: 1, max: 2 ** 16);- $ruleId = (int)$request->input('rule');- $ruleChanged = false;+ $fullQuery = (string) $fullQuery;+ $fullQuery = mb_convert_encoding($fullQuery, 'UTF-8', 'UTF-8');++ $page = 0 === (int) $request->input('page') ? 1 : (int) $request->input('page');+ $page = clamp(value: $page, min: 1, max: 2 ** 16);+ $ruleId = (int) $request->input('rule');+ $ruleChanged = false;// find rule, check if query is different, offer to update.- $ruleRepository = app(RuleRepositoryInterface::class);- $rule = $ruleRepository->find($ruleId);+ $ruleRepository = app(RuleRepositoryInterface::class);+ $rule = $ruleRepository->find($ruleId);if (null !== $rule) {$originalQuery = $ruleRepository->getSearchQuery($rule);if ($originalQuery !== $fullQuery) {@@ -91,9 +93,9 @@ final class SearchController extends Controller$excludedWords = $searcher->getExcludedWords();$operators = $searcher->getOperators();$invalidOperators = $searcher->getInvalidOperators();- $subTitle = (string)trans('breadcrumbs.search_result', ['query' => $fullQuery]);+ $subTitle = (string) trans('breadcrumbs.search_result', ['query' => $fullQuery]);- $res = view('search.index', [+ return view('search.index', ['words' => $words,'excludedWords' => $excludedWords,'operators' => $operators,@@ -105,7 +107,6 @@ final class SearchController extends Controller'ruleChanged' => $ruleChanged,'invalidOperators' => $invalidOperators,]);- return $res;}/**@@ -115,13 +116,13 @@ final class SearchController extends Controller*/public function search(Request $request, SearchInterface $searcher): JsonResponse{- $entry = $request->input('query');+ $entry = $request->input('query');if (!is_scalar($entry)) {$entry = '';}- $fullQuery = (string)$entry;- $page = 0 === (int)$request->input('page') ? 1 : (int)$request->input('page');- $page = clamp(value: $page, min: 1, max: 2 ** 16);+ $fullQuery = (string) $entry;+ $page = 0 === (int) $request->input('page') ? 1 : (int) $request->input('page');+ $page = clamp(value: $page, min: 1, max: 2 ** 16);$searcher->parseQuery($fullQuery);@@ -130,7 +131,7 @@ final class SearchController extends Controller$hasPages = $groups->hasPages();$searchTime = round($searcher->searchTime(), 3); // in seconds$parameters = ['search' => $fullQuery];- $url = route('search.index') . '?' . http_build_query($parameters);+ $url = route('search.index').'?'.http_build_query($parameters);$groups->setPath($url);try {diff --git a/app/Jobs/CreateAutoBudgetLimits.php b/app/Jobs/CreateAutoBudgetLimits.phpindex affea656a0..476da65ac3 100644--- a/app/Jobs/CreateAutoBudgetLimits.php+++ b/app/Jobs/CreateAutoBudgetLimits.php@@ -132,13 +132,7 @@ 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));@@ -228,13 +222,7 @@ 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/Support/Http/Controllers/AugumentData.php b/app/Support/Http/Controllers/AugumentData.phpindex a507156873..a3a940b1ba 100644--- a/app/Support/Http/Controllers/AugumentData.php+++ b/app/Support/Http/Controllers/AugumentData.php@@ -222,14 +222,7 @@ 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 2428353cb0..d0c09bf027 100644--- a/app/Support/JsonApi/Enrichments/RecurringEnrichment.php+++ b/app/Support/JsonApi/Enrichments/RecurringEnrichment.php@@ -354,11 +354,7 @@ 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/app/Support/Search/QueryParser/QueryParser.php b/app/Support/Search/QueryParser/QueryParser.phpindex b2af829b66..6cc7555a4d 100644--- a/app/Support/Search/QueryParser/QueryParser.php+++ b/app/Support/Search/QueryParser/QueryParser.php@@ -28,8 +28,9 @@ use Illuminate\Support\Facades\Log;use LogicException;use Safe\Exceptions\PcreException;use SensitiveParameter;-use function Safe\preg_split;+use function Safe\mb_convert_encoding;+use function Safe\preg_split;/*** Single-pass parser that processes query strings into structured nodes.@@ -38,28 +39,30 @@ use function Safe\mb_convert_encoding;*/class QueryParser implements QueryParserInterface{- private int $position = 0;- private int $depth = 0;+ private int $position = 0;+ private int $depth = 0;private const int MAX_DEPTH = 32;// private string $query;- private array $chrArray = [];- private int $count = 0;+ private array $chrArray = [];+ private int $count = 0;public function parse(string $query): NodeGroup{// Log::debug(sprintf('Parsing query in QueryParser: "%s"', $query));// $this->query = $query;$this->position = 0;+try {- $query = mb_convert_encoding($query, 'UTF-8', 'UTF-8');;+ $query = mb_convert_encoding($query, 'UTF-8', 'UTF-8');+$this->chrArray = preg_split('//u', $query, -1, PREG_SPLIT_NO_EMPTY);} catch (PcreException $e) {Log::error($e->getMessage());$this->chrArray = [];}- $this->count = count($this->chrArray);+ $this->count = count($this->chrArray);return $this->buildNodeGroup(false);}@@ -81,7 +84,7 @@ class QueryParser implements QueryParserInterfaceif ('\\' === $char && '"' === $nextChar && '\\' !== $prevChar) {// Log::debug('Found a backslash and the next one is a double quote.');// escaped quote, pretend it's a normal char and continue two places (skipping the actual character).- $tokenUnderConstruction .= '\\' . $nextChar;+ $tokenUnderConstruction .= '\\'.$nextChar;$this->position += 2;continue;@@ -164,7 +167,7 @@ class QueryParser implements QueryParserInterfaceif ('' === $tokenUnderConstruction) {// In any other location, it's just a normal character$tokenUnderConstruction .= $char;- $skipNext = true;+ $skipNext = true;}if ('' !== $tokenUnderConstruction && !$skipNext) {// Log::debug(sprintf('Turns out that "%s" is a field name. Reset the token.', $tokenUnderConstruction));@@ -192,7 +195,7 @@ class QueryParser implements QueryParserInterface++$this->position;}- $finalNode = '' !== $tokenUnderConstruction || '' !== $fieldName ? $this->createNode($tokenUnderConstruction, $fieldName, $prohibited) : null;+ $finalNode = '' !== $tokenUnderConstruction || '' !== $fieldName ? $this->createNode($tokenUnderConstruction, $fieldName, $prohibited) : null;return new NodeResult($finalNode, true);}@@ -203,7 +206,7 @@ class QueryParser implements QueryParserInterface$nodeResult = $this->buildNextNode($isSubquery);while ($nodeResult->node instanceof Node) {- $nodes[] = $nodeResult->node;+ $nodes[] = $nodeResult->node;if ($nodeResult->isSubqueryEnd) {break;}diff --git a/changelog.md b/changelog.mdindex 5973faa4dd..cde7b7292e 100644--- a/changelog.md+++ b/changelog.md@@ -6,7 +6,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).## v6.7.2 - 2026-09-16### Fixed-- #12757+- [Issue 12757](https://github.com/firefly-iii/firefly-iii/issues/12757) (Transaction List - "Clone" and "Clone and Edit" button doesn't work) reported by @fabienfitoussi## v6.7.1 - 2026-09-15diff --git a/composer.lock b/composer.lockindex c4443a5c3a..21aaeab32e 100644--- a/composer.lock+++ b/composer.lock@@ -6401,16 +6401,16 @@},{"name": "symfony/cache",- "version": "v8.1.6",+ "version": "v8.1.7","source": {"type": "git","url": "https://github.com/symfony/cache.git",- "reference": "91a2b338b18de1400ba38faae3f1e160d3eefc28"+ "reference": "47616ab077b5aff4d0f718b96680a48599fc1a3f"},"dist": {"type": "zip",- "url": "https://api.github.com/repos/symfony/cache/zipball/91a2b338b18de1400ba38faae3f1e160d3eefc28",- "reference": "91a2b338b18de1400ba38faae3f1e160d3eefc28",+ "url": "https://api.github.com/repos/symfony/cache/zipball/47616ab077b5aff4d0f718b96680a48599fc1a3f",+ "reference": "47616ab077b5aff4d0f718b96680a48599fc1a3f","shasum": ""},"require": {@@ -6476,7 +6476,7 @@"psr6"],"support": {- "source": "https://github.com/symfony/cache/tree/v8.1.6"+ "source": "https://github.com/symfony/cache/tree/v8.1.7"},"funding": [{@@ -6496,7 +6496,7 @@"type": "tidelift"}],- "time": "2026-08-30T20:10:55+00:00"+ "time": "2026-09-08T13:39:13+00:00"},{"name": "symfony/cache-contracts",@@ -6657,16 +6657,16 @@},{"name": "symfony/console",- "version": "v8.1.6",+ "version": "v8.1.7","source": {"type": "git","url": "https://github.com/symfony/console.git",- "reference": "eb7d9957d66739649e931ce7a9d05dab69f8abac"+ "reference": "29afb89f4e941f68a6e90f28e3f52ff1f6793a7d"},"dist": {"type": "zip",- "url": "https://api.github.com/repos/symfony/console/zipball/eb7d9957d66739649e931ce7a9d05dab69f8abac",- "reference": "eb7d9957d66739649e931ce7a9d05dab69f8abac",+ "url": "https://api.github.com/repos/symfony/console/zipball/29afb89f4e941f68a6e90f28e3f52ff1f6793a7d",+ "reference": "29afb89f4e941f68a6e90f28e3f52ff1f6793a7d","shasum": ""},"require": {@@ -6733,7 +6733,7 @@"terminal"],"support": {- "source": "https://github.com/symfony/console/tree/v8.1.6"+ "source": "https://github.com/symfony/console/tree/v8.1.7"},"funding": [{@@ -6753,7 +6753,7 @@"type": "tidelift"}],- "time": "2026-08-25T14:18:42+00:00"+ "time": "2026-09-13T10:55:57+00:00"},{"name": "symfony/css-selector",@@ -7211,16 +7211,16 @@},{"name": "symfony/finder",- "version": "v8.1.5",+ "version": "v8.1.7","source": {"type": "git","url": "https://github.com/symfony/finder.git",- "reference": "8d7acede2b2ae07605783d1c43e49b5767036474"+ "reference": "4fbe46a3eb64abf8a57f0364075b91f4a233e062"},"dist": {"type": "zip",- "url": "https://api.github.com/repos/symfony/finder/zipball/8d7acede2b2ae07605783d1c43e49b5767036474",- "reference": "8d7acede2b2ae07605783d1c43e49b5767036474",+ "url": "https://api.github.com/repos/symfony/finder/zipball/4fbe46a3eb64abf8a57f0364075b91f4a233e062",+ "reference": "4fbe46a3eb64abf8a57f0364075b91f4a233e062","shasum": ""},"require": {@@ -7255,7 +7255,7 @@"description": "Finds files and directories via an intuitive fluent interface","homepage": "https://symfony.com","support": {- "source": "https://github.com/symfony/finder/tree/v8.1.5"+ "source": "https://github.com/symfony/finder/tree/v8.1.7"},"funding": [{@@ -7275,20 +7275,20 @@"type": "tidelift"}],- "time": "2026-08-21T12:16:08+00:00"+ "time": "2026-09-10T19:14:39+00:00"},{"name": "symfony/http-client",- "version": "v8.1.6",+ "version": "v8.1.7","source": {"type": "git","url": "https://github.com/symfony/http-client.git",- "reference": "fe91dd1ddf09b61aa01e73d29907acbf1775c0a9"+ "reference": "099aae7d3619bffb5e68b33dbbadf6649c6d49c5"},"dist": {"type": "zip",- "url": "https://api.github.com/repos/symfony/http-client/zipball/fe91dd1ddf09b61aa01e73d29907acbf1775c0a9",- "reference": "fe91dd1ddf09b61aa01e73d29907acbf1775c0a9",+ "url": "https://api.github.com/repos/symfony/http-client/zipball/099aae7d3619bffb5e68b33dbbadf6649c6d49c5",+ "reference": "099aae7d3619bffb5e68b33dbbadf6649c6d49c5","shasum": ""},"require": {@@ -7352,7 +7352,7 @@"http"],"support": {- "source": "https://github.com/symfony/http-client/tree/v8.1.6"+ "source": "https://github.com/symfony/http-client/tree/v8.1.7"},"funding": [{@@ -7372,7 +7372,7 @@"type": "tidelift"}],- "time": "2026-08-30T14:03:40+00:00"+ "time": "2026-09-08T13:39:13+00:00"},{"name": "symfony/http-client-contracts",@@ -7458,16 +7458,16 @@},{"name": "symfony/http-foundation",- "version": "v8.1.6",+ "version": "v8.1.7","source": {"type": "git","url": "https://github.com/symfony/http-foundation.git",- "reference": "093b78326f649c3a9db922b9f17123b6aeb3b8fb"+ "reference": "d8fdc670ed510a69e3a9eb4f5eac89f5ed627e17"},"dist": {"type": "zip",- "url": "https://api.github.com/repos/symfony/http-foundation/zipball/093b78326f649c3a9db922b9f17123b6aeb3b8fb",- "reference": "093b78326f649c3a9db922b9f17123b6aeb3b8fb",+ "url": "https://api.github.com/repos/symfony/http-foundation/zipball/d8fdc670ed510a69e3a9eb4f5eac89f5ed627e17",+ "reference": "d8fdc670ed510a69e3a9eb4f5eac89f5ed627e17","shasum": ""},"require": {@@ -7515,7 +7515,7 @@"description": "Defines an object-oriented layer for the HTTP specification","homepage": "https://symfony.com","support": {- "source": "https://github.com/symfony/http-foundation/tree/v8.1.6"+ "source": "https://github.com/symfony/http-foundation/tree/v8.1.7"},"funding": [{@@ -7535,20 +7535,20 @@"type": "tidelift"}],- "time": "2026-08-30T20:10:55+00:00"+ "time": "2026-09-14T17:47:24+00:00"},{"name": "symfony/http-kernel",- "version": "v8.1.6",+ "version": "v8.1.7","source": {"type": "git","url": "https://github.com/symfony/http-kernel.git",- "reference": "2f73beb7c6f1a97d2c17bbf4dbd59da8cc18b355"+ "reference": "ec7a3a5832c22cf880cf27d2fdc7ad2e94838e85"},"dist": {"type": "zip",- "url": "https://api.github.com/repos/symfony/http-kernel/zipball/2f73beb7c6f1a97d2c17bbf4dbd59da8cc18b355",- "reference": "2f73beb7c6f1a97d2c17bbf4dbd59da8cc18b355",+ "url": "https://api.github.com/repos/symfony/http-kernel/zipball/ec7a3a5832c22cf880cf27d2fdc7ad2e94838e85",+ "reference": "ec7a3a5832c22cf880cf27d2fdc7ad2e94838e85","shasum": ""},"require": {@@ -7625,7 +7625,7 @@"description": "Provides a structured process for converting a Request into a Response","homepage": "https://symfony.com","support": {- "source": "https://github.com/symfony/http-kernel/tree/v8.1.6"+ "source": "https://github.com/symfony/http-kernel/tree/v8.1.7"},"funding": [{@@ -7645,20 +7645,20 @@"type": "tidelift"}],- "time": "2026-08-30T21:40:49+00:00"+ "time": "2026-09-15T07:12:52+00:00"},{"name": "symfony/mailer",- "version": "v8.1.5",+ "version": "v8.1.7","source": {"type": "git","url": "https://github.com/symfony/mailer.git",- "reference": "89f43137da74b8f1aab37c99926482b7084f51b9"+ "reference": "8783380ecdafa23d36fc90c5873fd44b635c6e10"},"dist": {"type": "zip",- "url": "https://api.github.com/repos/symfony/mailer/zipball/89f43137da74b8f1aab37c99926482b7084f51b9",- "reference": "89f43137da74b8f1aab37c99926482b7084f51b9",+ "url": "https://api.github.com/repos/symfony/mailer/zipball/8783380ecdafa23d36fc90c5873fd44b635c6e10",+ "reference": "8783380ecdafa23d36fc90c5873fd44b635c6e10","shasum": ""},"require": {@@ -7705,7 +7705,7 @@"description": "Helps sending emails","homepage": "https://symfony.com","support": {- "source": "https://github.com/symfony/mailer/tree/v8.1.5"+ "source": "https://github.com/symfony/mailer/tree/v8.1.7"},"funding": [{@@ -7725,7 +7725,7 @@"type": "tidelift"}],- "time": "2026-08-21T17:47:34+00:00"+ "time": "2026-09-15T06:01:24+00:00"},{"name": "symfony/mailgun-mailer",@@ -7799,16 +7799,16 @@},{"name": "symfony/mime",- "version": "v8.1.6",+ "version": "v8.1.7","source": {"type": "git","url": "https://github.com/symfony/mime.git",- "reference": "1b36ccfd7ccb9ad1d6eafb9024b3dd3d9606b15f"+ "reference": "773ac57f20e2795bdadb65b5b1b5f4850d498283"},"dist": {"type": "zip",- "url": "https://api.github.com/repos/symfony/mime/zipball/1b36ccfd7ccb9ad1d6eafb9024b3dd3d9606b15f",- "reference": "1b36ccfd7ccb9ad1d6eafb9024b3dd3d9606b15f",+ "url": "https://api.github.com/repos/symfony/mime/zipball/773ac57f20e2795bdadb65b5b1b5f4850d498283",+ "reference": "773ac57f20e2795bdadb65b5b1b5f4850d498283","shasum": ""},"require": {@@ -7861,7 +7861,7 @@"mime-type"],"support": {- "source": "https://github.com/symfony/mime/tree/v8.1.6"+ "source": "https://github.com/symfony/mime/tree/v8.1.7"},"funding": [{@@ -7881,7 +7881,7 @@"type": "tidelift"}],- "time": "2026-08-22T09:06:25+00:00"+ "time": "2026-09-04T11:02:17+00:00"},{"name": "symfony/options-resolver",@@ -8867,16 +8867,16 @@},{"name": "symfony/process",- "version": "v8.1.6",+ "version": "v8.1.7","source": {"type": "git","url": "https://github.com/symfony/process.git",- "reference": "d863f5e70d7c87abb906ac11b61f83036093000b"+ "reference": "10823b09358e690df4ff943e24e8492bb1019fc3"},"dist": {"type": "zip",- "url": "https://api.github.com/repos/symfony/process/zipball/d863f5e70d7c87abb906ac11b61f83036093000b",- "reference": "d863f5e70d7c87abb906ac11b61f83036093000b",+ "url": "https://api.github.com/repos/symfony/process/zipball/10823b09358e690df4ff943e24e8492bb1019fc3",+ "reference": "10823b09358e690df4ff943e24e8492bb1019fc3","shasum": ""},"require": {@@ -8908,7 +8908,7 @@"description": "Executes commands in sub-processes","homepage": "https://symfony.com","support": {- "source": "https://github.com/symfony/process/tree/v8.1.6"+ "source": "https://github.com/symfony/process/tree/v8.1.7"},"funding": [{@@ -8928,7 +8928,7 @@"type": "tidelift"}],- "time": "2026-08-21T17:47:34+00:00"+ "time": "2026-09-02T12:40:29+00:00"},{"name": "symfony/psr-http-message-bridge",@@ -9186,16 +9186,16 @@},{"name": "symfony/string",- "version": "v8.1.2",+ "version": "v8.1.7","source": {"type": "git","url": "https://github.com/symfony/string.git",- "reference": "286a76b7255e5cc4bf0101a0bc5388ecf1c38ccc"+ "reference": "d950140b5f56f31901e5b7a0c04ffc3a3deb943c"},"dist": {"type": "zip",- "url": "https://api.github.com/repos/symfony/string/zipball/286a76b7255e5cc4bf0101a0bc5388ecf1c38ccc",- "reference": "286a76b7255e5cc4bf0101a0bc5388ecf1c38ccc",+ "url": "https://api.github.com/repos/symfony/string/zipball/d950140b5f56f31901e5b7a0c04ffc3a3deb943c",+ "reference": "d950140b5f56f31901e5b7a0c04ffc3a3deb943c","shasum": ""},"require": {@@ -9252,7 +9252,7 @@"utf8"],"support": {- "source": "https://github.com/symfony/string/tree/v8.1.2"+ "source": "https://github.com/symfony/string/tree/v8.1.7"},"funding": [{@@ -9272,7 +9272,7 @@"type": "tidelift"}],- "time": "2026-07-28T07:35:25+00:00"+ "time": "2026-09-11T14:51:16+00:00"},{"name": "symfony/translation",@@ -9529,16 +9529,16 @@},{"name": "symfony/var-dumper",- "version": "v8.1.6",+ "version": "v8.1.7","source": {"type": "git","url": "https://github.com/symfony/var-dumper.git",- "reference": "3783365b58972f4779254d98372af80fbf15e170"+ "reference": "741a8c4c948b0bb9bd3653daacd3644c73c40ea5"},"dist": {"type": "zip",- "url": "https://api.github.com/repos/symfony/var-dumper/zipball/3783365b58972f4779254d98372af80fbf15e170",- "reference": "3783365b58972f4779254d98372af80fbf15e170",+ "url": "https://api.github.com/repos/symfony/var-dumper/zipball/741a8c4c948b0bb9bd3653daacd3644c73c40ea5",+ "reference": "741a8c4c948b0bb9bd3653daacd3644c73c40ea5","shasum": ""},"require": {@@ -9592,7 +9592,7 @@"dump"],"support": {- "source": "https://github.com/symfony/var-dumper/tree/v8.1.6"+ "source": "https://github.com/symfony/var-dumper/tree/v8.1.7"},"funding": [{@@ -9612,7 +9612,7 @@"type": "tidelift"}],- "time": "2026-08-30T20:10:55+00:00"+ "time": "2026-09-03T16:02:27+00:00"},{"name": "symfony/var-exporter",@@ -12172,16 +12172,16 @@},{"name": "phpunit/phpunit",- "version": "13.3.3",+ "version": "13.3.4","source": {"type": "git","url": "https://github.com/sebastianbergmann/phpunit.git",- "reference": "0d8711067516c1f6ba1a66f762e16c2fb1a8ccd1"+ "reference": "d19d90cf860efb7e4d96cee8243e06a248578085"},"dist": {"type": "zip",- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/0d8711067516c1f6ba1a66f762e16c2fb1a8ccd1",- "reference": "0d8711067516c1f6ba1a66f762e16c2fb1a8ccd1",+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/d19d90cf860efb7e4d96cee8243e06a248578085",+ "reference": "d19d90cf860efb7e4d96cee8243e06a248578085","shasum": ""},"require": {@@ -12195,7 +12195,7 @@"phar-io/manifest": "^2.0.4","phar-io/version": "^3.2.1","php": ">=8.4.1",- "phpunit/php-code-coverage": "^14.3.2",+ "phpunit/php-code-coverage": "^14.3.3","phpunit/php-file-iterator": "^7.0.2","phpunit/php-invoker": "^7.0.0","phpunit/php-text-template": "^6.0.0",@@ -12252,7 +12252,7 @@"support": {"issues": "https://github.com/sebastianbergmann/phpunit/issues","security": "https://github.com/sebastianbergmann/phpunit/security/policy",- "source": "https://github.com/sebastianbergmann/phpunit/tree/13.3.3"+ "source": "https://github.com/sebastianbergmann/phpunit/tree/13.3.4"},"funding": [{@@ -12260,7 +12260,7 @@"type": "other"}],- "time": "2026-09-09T04:50:32+00:00"+ "time": "2026-09-15T07:37:05+00:00"},{"name": "rector/rector",diff --git a/config/firefly.php b/config/firefly.phpindex 4306661fce..461c431482 100644--- a/config/firefly.php+++ b/config/firefly.php@@ -79,7 +79,7 @@ return [// see cer.php for exchange rates feature flag.],'version' => 'develop/2026-09-15',-'build_time' => 1789447299,+'build_time' => 1789476462,'api_version' => '2.1.0', // field is no longer used.'db_version' => 28, // field is no longer used.diff --git a/resources/assets/v3/js/boot/bootstrap.js b/resources/assets/v3/js/boot/bootstrap.jsindex 337206853d..a88be86a11 100644--- a/resources/assets/v3/js/boot/bootstrap.js+++ b/resources/assets/v3/js/boot/bootstrap.js@@ -20,7 +20,7 @@// JS// Supports weights 100-900-import '@fontsource/roboto/300.css';+import "@fontsource/roboto/300.css";import "bootstrap";import "admin-lte";import Alpine from "alpinejs";diff --git a/resources/assets/v3/sass/app.scss b/resources/assets/v3/sass/app.scssindex 1a438a8482..3b08ce1c14 100644--- a/resources/assets/v3/sass/app.scss+++ b/resources/assets/v3/sass/app.scss@@ -19,11 +19,11 @@*/@use "bootstrap-icons/font/bootstrap-icons.css";-@use '@fontsource/roboto/300.css' as roboto300;+@use "@fontsource/roboto/300.css" as roboto300;$color-mode-type: data;$link-decoration: none;-$font-family-sans-serif: 'Roboto', sans-serif;+$font-family-sans-serif: "Roboto", sans-serif;// colors are for light mode.$danger: #cd5029; // originaldiff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.phpindex b156bf257f..719ea99e9b 100644--- a/resources/lang/en_US/firefly.php+++ b/resources/lang/en_US/firefly.php@@ -1839,7 +1839,7 @@ return ['yearly_budgets' => 'Yearly budgets','other_budgets' => 'Custom timed budgets','budget_limit_not_in_range' => 'This amount applies from :start to :end:',- 'totals' => 'Totals',+ 'totals' => 'Totals','total_available_budget' => 'Total available budget (between :start and :end)','total_available_budget_in_currency' => 'Total available budget in :currency','see_below' => 'see below',