Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
Update packages, another fix for the same issue.
James Cole0b00f3510193
diff --git a/composer.lock b/composer.lockindex 7c6d9584c0..57159f1965 100644--- a/composer.lock+++ b/composer.lock@@ -1938,16 +1938,16 @@},{"name": "laravel/framework",- "version": "v12.41.1",+ "version": "v12.42.0","source": {"type": "git","url": "https://github.com/laravel/framework.git",- "reference": "3e229b05935fd0300c632fb1f718c73046d664fc"+ "reference": "509b33095564c5165366d81bbaa0afaac28abe75"},"dist": {"type": "zip",- "url": "https://api.github.com/repos/laravel/framework/zipball/3e229b05935fd0300c632fb1f718c73046d664fc",- "reference": "3e229b05935fd0300c632fb1f718c73046d664fc",+ "url": "https://api.github.com/repos/laravel/framework/zipball/509b33095564c5165366d81bbaa0afaac28abe75",+ "reference": "509b33095564c5165366d81bbaa0afaac28abe75","shasum": ""},"require": {@@ -2035,6 +2035,7 @@"illuminate/process": "self.version","illuminate/queue": "self.version","illuminate/redis": "self.version",+ "illuminate/reflection": "self.version","illuminate/routing": "self.version","illuminate/session": "self.version","illuminate/support": "self.version",@@ -2059,7 +2060,7 @@"league/flysystem-sftp-v3": "^3.25.1","mockery/mockery": "^1.6.10","opis/json-schema": "^2.4.1",- "orchestra/testbench-core": "^10.8.0",+ "orchestra/testbench-core": "^10.8.1","pda/pheanstalk": "^5.0.6|^7.0.0","php-http/discovery": "^1.15","phpstan/phpstan": "^2.0",@@ -2121,6 +2122,7 @@"src/Illuminate/Filesystem/functions.php","src/Illuminate/Foundation/helpers.php","src/Illuminate/Log/functions.php",+ "src/Illuminate/Reflection/helpers.php","src/Illuminate/Support/functions.php","src/Illuminate/Support/helpers.php"],@@ -2129,7 +2131,8 @@"Illuminate\\Support\\": ["src/Illuminate/Macroable/","src/Illuminate/Collections/",- "src/Illuminate/Conditionable/"+ "src/Illuminate/Conditionable/",+ "src/Illuminate/Reflection/"]}},@@ -2153,7 +2156,7 @@"issues": "https://github.com/laravel/framework/issues","source": "https://github.com/laravel/framework"},- "time": "2025-12-03T01:02:13+00:00"+ "time": "2025-12-09T15:51:23+00:00"},{"name": "laravel/passport",@@ -3361,20 +3364,20 @@},{"name": "league/uri",- "version": "7.6.0",+ "version": "7.7.0","source": {"type": "git","url": "https://github.com/thephpleague/uri.git",- "reference": "f625804987a0a9112d954f9209d91fec52182344"+ "reference": "8d587cddee53490f9b82bf203d3a9aa7ea4f9807"},"dist": {"type": "zip",- "url": "https://api.github.com/repos/thephpleague/uri/zipball/f625804987a0a9112d954f9209d91fec52182344",- "reference": "f625804987a0a9112d954f9209d91fec52182344",+ "url": "https://api.github.com/repos/thephpleague/uri/zipball/8d587cddee53490f9b82bf203d3a9aa7ea4f9807",+ "reference": "8d587cddee53490f9b82bf203d3a9aa7ea4f9807","shasum": ""},"require": {- "league/uri-interfaces": "^7.6",+ "league/uri-interfaces": "^7.7","php": "^8.1","psr/http-factory": "^1"},@@ -3447,7 +3450,7 @@"docs": "https://uri.thephpleague.com","forum": "https://thephpleague.slack.com","issues": "https://github.com/thephpleague/uri-src/issues",- "source": "https://github.com/thephpleague/uri/tree/7.6.0"+ "source": "https://github.com/thephpleague/uri/tree/7.7.0"},"funding": [{@@ -3455,20 +3458,20 @@"type": "github"}],- "time": "2025-11-18T12:17:23+00:00"+ "time": "2025-12-07T16:02:06+00:00"},{"name": "league/uri-interfaces",- "version": "7.6.0",+ "version": "7.7.0","source": {"type": "git","url": "https://github.com/thephpleague/uri-interfaces.git",- "reference": "ccbfb51c0445298e7e0b7f4481b942f589665368"+ "reference": "62ccc1a0435e1c54e10ee6022df28d6c04c2946c"},"dist": {"type": "zip",- "url": "https://api.github.com/repos/thephpleague/uri-interfaces/zipball/ccbfb51c0445298e7e0b7f4481b942f589665368",- "reference": "ccbfb51c0445298e7e0b7f4481b942f589665368",+ "url": "https://api.github.com/repos/thephpleague/uri-interfaces/zipball/62ccc1a0435e1c54e10ee6022df28d6c04c2946c",+ "reference": "62ccc1a0435e1c54e10ee6022df28d6c04c2946c","shasum": ""},"require": {@@ -3531,7 +3534,7 @@"docs": "https://uri.thephpleague.com","forum": "https://thephpleague.slack.com","issues": "https://github.com/thephpleague/uri-src/issues",- "source": "https://github.com/thephpleague/uri-interfaces/tree/7.6.0"+ "source": "https://github.com/thephpleague/uri-interfaces/tree/7.7.0"},"funding": [{@@ -3539,7 +3542,7 @@"type": "github"}],- "time": "2025-11-18T12:17:23+00:00"+ "time": "2025-12-07T16:03:21+00:00"},{"name": "mailersend/laravel-driver",@@ -7014,20 +7017,20 @@},{"name": "symfony/css-selector",- "version": "v7.4.0",+ "version": "v8.0.0","source": {"type": "git","url": "https://github.com/symfony/css-selector.git",- "reference": "ab862f478513e7ca2fe9ec117a6f01a8da6e1135"+ "reference": "6225bd458c53ecdee056214cb4a2ffaf58bd592b"},"dist": {"type": "zip",- "url": "https://api.github.com/repos/symfony/css-selector/zipball/ab862f478513e7ca2fe9ec117a6f01a8da6e1135",- "reference": "ab862f478513e7ca2fe9ec117a6f01a8da6e1135",+ "url": "https://api.github.com/repos/symfony/css-selector/zipball/6225bd458c53ecdee056214cb4a2ffaf58bd592b",+ "reference": "6225bd458c53ecdee056214cb4a2ffaf58bd592b","shasum": ""},"require": {- "php": ">=8.2"+ "php": ">=8.4"},"type": "library","autoload": {@@ -7059,7 +7062,7 @@"description": "Converts CSS selectors to XPath expressions","homepage": "https://symfony.com","support": {- "source": "https://github.com/symfony/css-selector/tree/v7.4.0"+ "source": "https://github.com/symfony/css-selector/tree/v8.0.0"},"funding": [{@@ -7079,7 +7082,7 @@"type": "tidelift"}],- "time": "2025-10-30T13:39:42+00:00"+ "time": "2025-10-30T14:17:19+00:00"},{"name": "symfony/deprecation-contracts",@@ -7784,16 +7787,16 @@},{"name": "symfony/http-kernel",- "version": "v7.4.1",+ "version": "v7.4.2","source": {"type": "git","url": "https://github.com/symfony/http-kernel.git",- "reference": "171d2ec4002012a023e042c6041d7fde58b143c6"+ "reference": "f6e6f0a5fa8763f75a504b930163785fb6dd055f"},"dist": {"type": "zip",- "url": "https://api.github.com/repos/symfony/http-kernel/zipball/171d2ec4002012a023e042c6041d7fde58b143c6",- "reference": "171d2ec4002012a023e042c6041d7fde58b143c6",+ "url": "https://api.github.com/repos/symfony/http-kernel/zipball/f6e6f0a5fa8763f75a504b930163785fb6dd055f",+ "reference": "f6e6f0a5fa8763f75a504b930163785fb6dd055f","shasum": ""},"require": {@@ -7879,7 +7882,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/v7.4.1"+ "source": "https://github.com/symfony/http-kernel/tree/v7.4.2"},"funding": [{@@ -7899,7 +7902,7 @@"type": "tidelift"}],- "time": "2025-12-07T16:28:51+00:00"+ "time": "2025-12-08T07:43:37+00:00"},{"name": "symfony/mailer",@@ -10020,23 +10023,23 @@},{"name": "tijsverkoyen/css-to-inline-styles",- "version": "v2.3.0",+ "version": "v2.4.0","source": {"type": "git","url": "https://github.com/tijsverkoyen/CssToInlineStyles.git",- "reference": "0d72ac1c00084279c1816675284073c5a337c20d"+ "reference": "f0292ccf0ec75843d65027214426b6b163b48b41"},"dist": {"type": "zip",- "url": "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/0d72ac1c00084279c1816675284073c5a337c20d",- "reference": "0d72ac1c00084279c1816675284073c5a337c20d",+ "url": "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/f0292ccf0ec75843d65027214426b6b163b48b41",+ "reference": "f0292ccf0ec75843d65027214426b6b163b48b41","shasum": ""},"require": {"ext-dom": "*","ext-libxml": "*","php": "^7.4 || ^8.0",- "symfony/css-selector": "^5.4 || ^6.0 || ^7.0"+ "symfony/css-selector": "^5.4 || ^6.0 || ^7.0 || ^8.0"},"require-dev": {"phpstan/phpstan": "^2.0",@@ -10069,9 +10072,9 @@"homepage": "https://github.com/tijsverkoyen/CssToInlineStyles","support": {"issues": "https://github.com/tijsverkoyen/CssToInlineStyles/issues",- "source": "https://github.com/tijsverkoyen/CssToInlineStyles/tree/v2.3.0"+ "source": "https://github.com/tijsverkoyen/CssToInlineStyles/tree/v2.4.0"},- "time": "2024-12-21T16:25:41+00:00"+ "time": "2025-12-02T11:56:42+00:00"},{"name": "twig/twig",@@ -10399,16 +10402,16 @@},{"name": "barryvdh/laravel-ide-helper",- "version": "v3.6.0",+ "version": "v3.6.1","source": {"type": "git","url": "https://github.com/barryvdh/laravel-ide-helper.git",- "reference": "8d00250cba25728373e92c1d8dcebcbf64623d29"+ "reference": "b106f7ee85f263c4f103eca49e7bf3862c2e5e75"},"dist": {"type": "zip",- "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/8d00250cba25728373e92c1d8dcebcbf64623d29",- "reference": "8d00250cba25728373e92c1d8dcebcbf64623d29",+ "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/b106f7ee85f263c4f103eca49e7bf3862c2e5e75",+ "reference": "b106f7ee85f263c4f103eca49e7bf3862c2e5e75","shasum": ""},"require": {@@ -10477,7 +10480,7 @@],"support": {"issues": "https://github.com/barryvdh/laravel-ide-helper/issues",- "source": "https://github.com/barryvdh/laravel-ide-helper/tree/v3.6.0"+ "source": "https://github.com/barryvdh/laravel-ide-helper/tree/v3.6.1"},"funding": [{@@ -10489,7 +10492,7 @@"type": "github"}],- "time": "2025-07-17T20:11:57+00:00"+ "time": "2025-12-10T09:11:07+00:00"},{"name": "barryvdh/reflection-docblock",@@ -10751,16 +10754,16 @@},{"name": "driftingly/rector-laravel",- "version": "2.1.6",+ "version": "2.1.7","source": {"type": "git","url": "https://github.com/driftingly/rector-laravel.git",- "reference": "682d1e73ac79aced7e645141fd61a9ac468a0c44"+ "reference": "2a64c96fa363bc85e4e6d4162c6a6bb7a78fd122"},"dist": {"type": "zip",- "url": "https://api.github.com/repos/driftingly/rector-laravel/zipball/682d1e73ac79aced7e645141fd61a9ac468a0c44",- "reference": "682d1e73ac79aced7e645141fd61a9ac468a0c44",+ "url": "https://api.github.com/repos/driftingly/rector-laravel/zipball/2a64c96fa363bc85e4e6d4162c6a6bb7a78fd122",+ "reference": "2a64c96fa363bc85e4e6d4162c6a6bb7a78fd122","shasum": ""},"require": {@@ -10781,9 +10784,9 @@"description": "Rector upgrades rules for Laravel Framework","support": {"issues": "https://github.com/driftingly/rector-laravel/issues",- "source": "https://github.com/driftingly/rector-laravel/tree/2.1.6"+ "source": "https://github.com/driftingly/rector-laravel/tree/2.1.7"},- "time": "2025-12-04T13:37:33+00:00"+ "time": "2025-12-10T11:30:42+00:00"},{"name": "fakerphp/faker",@@ -11685,23 +11688,23 @@},{"name": "phpunit/php-code-coverage",- "version": "12.5.0",+ "version": "12.5.1","source": {"type": "git","url": "https://github.com/sebastianbergmann/php-code-coverage.git",- "reference": "bca180c050dd3ae15f87c26d25cabb34fe1a0a5a"+ "reference": "c467c59a4f6e04b942be422844e7a6352fa01b57"},"dist": {"type": "zip",- "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/bca180c050dd3ae15f87c26d25cabb34fe1a0a5a",- "reference": "bca180c050dd3ae15f87c26d25cabb34fe1a0a5a",+ "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/c467c59a4f6e04b942be422844e7a6352fa01b57",+ "reference": "c467c59a4f6e04b942be422844e7a6352fa01b57","shasum": ""},"require": {"ext-dom": "*","ext-libxml": "*","ext-xmlwriter": "*",- "nikic/php-parser": "^5.6.2",+ "nikic/php-parser": "^5.7.0","php": ">=8.3","phpunit/php-file-iterator": "^6.0","phpunit/php-text-template": "^5.0",@@ -11709,10 +11712,10 @@"sebastian/environment": "^8.0.3","sebastian/lines-of-code": "^4.0","sebastian/version": "^6.0",- "theseer/tokenizer": "^1.3.1"+ "theseer/tokenizer": "^2.0"},"require-dev": {- "phpunit/phpunit": "^12.4.4"+ "phpunit/phpunit": "^12.5.1"},"suggest": {"ext-pcov": "PHP extension that provides line coverage",@@ -11750,7 +11753,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/12.5.0"+ "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/12.5.1"},"funding": [{@@ -11770,7 +11773,7 @@"type": "tidelift"}],- "time": "2025-11-29T07:15:54+00:00"+ "time": "2025-12-08T07:17:58+00:00"},{"name": "phpunit/php-file-iterator",@@ -12019,16 +12022,16 @@},{"name": "phpunit/phpunit",- "version": "12.5.1",+ "version": "12.5.3","source": {"type": "git","url": "https://github.com/sebastianbergmann/phpunit.git",- "reference": "e33a5132ea24119400f6ce5bce6665922e968bad"+ "reference": "6dc2e076d09960efbb0c1272aa9bc156fc80955e"},"dist": {"type": "zip",- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/e33a5132ea24119400f6ce5bce6665922e968bad",- "reference": "e33a5132ea24119400f6ce5bce6665922e968bad",+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/6dc2e076d09960efbb0c1272aa9bc156fc80955e",+ "reference": "6dc2e076d09960efbb0c1272aa9bc156fc80955e","shasum": ""},"require": {@@ -12042,7 +12045,7 @@"phar-io/manifest": "^2.0.4","phar-io/version": "^3.2.1","php": ">=8.3",- "phpunit/php-code-coverage": "^12.5.0",+ "phpunit/php-code-coverage": "^12.5.1","phpunit/php-file-iterator": "^6.0.0","phpunit/php-invoker": "^6.0.0","phpunit/php-text-template": "^5.0.0",@@ -12096,7 +12099,7 @@"support": {"issues": "https://github.com/sebastianbergmann/phpunit/issues","security": "https://github.com/sebastianbergmann/phpunit/security/policy",- "source": "https://github.com/sebastianbergmann/phpunit/tree/12.5.1"+ "source": "https://github.com/sebastianbergmann/phpunit/tree/12.5.3"},"funding": [{@@ -12120,25 +12123,25 @@"type": "tidelift"}],- "time": "2025-12-06T12:19:17+00:00"+ "time": "2025-12-11T08:52:59+00:00"},{"name": "rector/rector",- "version": "2.2.11",+ "version": "2.2.14","source": {"type": "git","url": "https://github.com/rectorphp/rector.git",- "reference": "7bd21a40b0332b93d4bfee284093d7400696902d"+ "reference": "6d56bb0e94d4df4f57a78610550ac76ab403657d"},"dist": {"type": "zip",- "url": "https://api.github.com/repos/rectorphp/rector/zipball/7bd21a40b0332b93d4bfee284093d7400696902d",- "reference": "7bd21a40b0332b93d4bfee284093d7400696902d",+ "url": "https://api.github.com/repos/rectorphp/rector/zipball/6d56bb0e94d4df4f57a78610550ac76ab403657d",+ "reference": "6d56bb0e94d4df4f57a78610550ac76ab403657d","shasum": ""},"require": {"php": "^7.4|^8.0",- "phpstan/phpstan": "^2.1.32"+ "phpstan/phpstan": "^2.1.33"},"conflict": {"rector/rector-doctrine": "*",@@ -12172,7 +12175,7 @@],"support": {"issues": "https://github.com/rectorphp/rector/issues",- "source": "https://github.com/rectorphp/rector/tree/2.2.11"+ "source": "https://github.com/rectorphp/rector/tree/2.2.14"},"funding": [{@@ -12180,7 +12183,7 @@"type": "github"}],- "time": "2025-12-02T11:23:46+00:00"+ "time": "2025-12-09T10:57:55+00:00"},{"name": "sebastian/cli-parser",@@ -13191,23 +13194,23 @@},{"name": "theseer/tokenizer",- "version": "1.3.1",+ "version": "2.0.1","source": {"type": "git","url": "https://github.com/theseer/tokenizer.git",- "reference": "b7489ce515e168639d17feec34b8847c326b0b3c"+ "reference": "7989e43bf381af0eac72e4f0ca5bcbfa81658be4"},"dist": {"type": "zip",- "url": "https://api.github.com/repos/theseer/tokenizer/zipball/b7489ce515e168639d17feec34b8847c326b0b3c",- "reference": "b7489ce515e168639d17feec34b8847c326b0b3c",+ "url": "https://api.github.com/repos/theseer/tokenizer/zipball/7989e43bf381af0eac72e4f0ca5bcbfa81658be4",+ "reference": "7989e43bf381af0eac72e4f0ca5bcbfa81658be4","shasum": ""},"require": {"ext-dom": "*","ext-tokenizer": "*","ext-xmlwriter": "*",- "php": "^7.2 || ^8.0"+ "php": "^8.1"},"type": "library","autoload": {@@ -13229,7 +13232,7 @@"description": "A small library for converting tokenized PHP source code into XML and potentially other formats","support": {"issues": "https://github.com/theseer/tokenizer/issues",- "source": "https://github.com/theseer/tokenizer/tree/1.3.1"+ "source": "https://github.com/theseer/tokenizer/tree/2.0.1"},"funding": [{@@ -13237,7 +13240,7 @@"type": "github"}],- "time": "2025-11-17T20:03:58+00:00"+ "time": "2025-12-08T11:19:18+00:00"},{"name": "webmozart/assert",diff --git a/resources/views/list/groups.twig b/resources/views/list/groups.twigindex 0761699621..f10d927afd 100644--- a/resources/views/list/groups.twig+++ b/resources/views/list/groups.twig@@ -272,14 +272,12 @@{% if transaction.transaction_type_type == 'Deposit' %}{% if transaction.source_account_id == account.id %}{{ formatAmountBySymbol(transaction.source_balance_after, transaction.currency_symbol, transaction.currency_decimal_places) }}- {% else %}+ {% else %}{{ formatAmountBySymbol(transaction.destination_balance_after, transaction.currency_symbol, transaction.currency_decimal_places) }}{% endif %}{% elseif transaction.transaction_type_type == 'Withdrawal' %}-{% if 'Loan' == transaction.destination_account_type or 'Mortgage' == transaction.destination_account_type or 'Debt' == transaction.destination_account_type %}-{% if currency.id == transaction.currency_id %}{% if account.id == transaction.source_account_id %}{{ formatAmountBySymbol(transaction.source_balance_after, transaction.currency_symbol, transaction.currency_decimal_places) }}@@ -287,14 +285,18 @@{% if account.id == transaction.destination_account_id %}{{ formatAmountBySymbol(transaction.destination_balance_after, transaction.currency_symbol, transaction.currency_decimal_places) }}{% endif %}-{% endif %}{% if currency.id == transaction.foreign_currency_id and null != transaction.destination_balance_after and null != transaction.destination_balance_after %}{{ formatAmountBySymbol(transaction.destination_balance_after, transaction.foreign_currency_symbol ?? transaction.currency_symbol, transaction.foreign_currency_decimal_places ?? transaction.currency_decimal_places) }}{% endif %}-{% else %}- {{ formatAmountBySymbol(transaction.source_balance_after, transaction.currency_symbol, transaction.currency_decimal_places) }}+ {% if account.id == transaction.source_account_id %}+ {{ formatAmountBySymbol(transaction.source_balance_after, transaction.currency_symbol, transaction.currency_decimal_places) }}+ {% endif %}+ {% if account.id == transaction.destination_account_id %}+ {{ formatAmountBySymbol(transaction.destination_balance_after, transaction.currency_symbol, transaction.currency_decimal_places) }}+ {% endif %}+{% endif %}{% elseif transaction.transaction_type_type == 'Opening balance' %}{% if transaction.source_account_type == 'Initial balance account' %}