Merge pull request #11876 from firefly-iii/release-1772642273

🤖 Automatically merge the PR into the develop branch.
🤖 Auto commit for release 'develop' on 2026-03-04
2026-03-05 15:31:32 +00:00 · 2026-03-04 17:38:02 +01:00 · 2026-03-04 17:37:53 +01:00 · 2026-03-04 17:31:42 +01:00 · 2026-03-04 17:28:57 +01:00 · 2026-03-04 15:35:20 +01:00
6 changed files with 39 additions and 32 deletions
--- a/.ci/phpstan.neon
+++ b/.ci/phpstan.neon
@@ -5,6 +5,7 @@ parameters:
    - ../routes
    - ../config
    - ../bootstrap/app.php
+    - ../bootstrap/providers.php
  universalObjectCratesClasses:
    - Illuminate\Database\Eloquent\Model
  reportUnmatchedIgnoredErrors: true
--- a/app/Http/Controllers/PiggyBank/AmountController.php
+++ b/app/Http/Controllers/PiggyBank/AmountController.php
@@ -69,7 +69,7 @@ final class AmountController extends Controller
    public function add(PiggyBank $piggyBank): Factory|\Illuminate\Contracts\View\View
    {
        /** @var Carbon $date */
-        $date       = session('end', today(config('app.timezone')));
+        $date       = now(config('app.timezone'));
        $accounts   = [];
        $total      = '0';
        $totalSaved = $this->piggyRepos->getCurrentAmount($piggyBank);
@@ -109,7 +109,7 @@ final class AmountController extends Controller
    public function addMobile(PiggyBank $piggyBank): Factory|\Illuminate\Contracts\View\View
    {
        /** @var Carbon $date */
-        $date       = session('end', today(config('app.timezone')));
+        $date       = now(config('app.timezone'));
        $accounts   = [];
        $total      = '0';
        $totalSaved = $this->piggyRepos->getCurrentAmount($piggyBank);
@@ -143,7 +143,7 @@ final class AmountController extends Controller
        /** @var Account $account */
        foreach ($piggyBank->accounts as $account) {
            $amount        = (string) ($amounts[$account->id] ?? '0');
-            if ('' === $amount || 0 === bccomp($amount, '0')) {
+            if ('' === $amount || !is_numeric($amount) || 0 === bccomp($amount, '0')) {
                continue;
            }
            if (-1 === bccomp($amount, '0')) {
--- a/app/Repositories/PiggyBank/PiggyBankRepository.php
+++ b/app/Repositories/PiggyBank/PiggyBankRepository.php
@@ -143,7 +143,13 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface, UserGroupInte
            $amount = '' === $amount ? '0' : $amount;
            $sum    = bcadd($sum, $amount);
        }
-        Log::debug(sprintf('Current amount in piggy bank #%d ("%s") is %s', $piggyBank->id, $piggyBank->name, $sum));
+        Log::debug(sprintf(
+            'Current amount (at %s) in piggy bank #%d ("%s") is %s',
+            now(config('app.timezone'))->toW3cString(),
+            $piggyBank->id,
+            $piggyBank->name,
+            $sum
+        ));

        return $sum;
    }
--- a/composer.lock
+++ b/composer.lock
@@ -1009,16 +1009,16 @@
        },
        {
            "name": "firebase/php-jwt",
-            "version": "v6.11.1",
+            "version": "v7.0.3",
            "source": {
                "type": "git",
                "url": "https://github.com/firebase/php-jwt.git",
-                "reference": "d1e91ecf8c598d073d0995afa8cd5c75c6e19e66"
+                "reference": "28aa0694bcfdfa5e2959c394d5a1ee7a5083629e"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/firebase/php-jwt/zipball/d1e91ecf8c598d073d0995afa8cd5c75c6e19e66",
-                "reference": "d1e91ecf8c598d073d0995afa8cd5c75c6e19e66",
+                "url": "https://api.github.com/repos/firebase/php-jwt/zipball/28aa0694bcfdfa5e2959c394d5a1ee7a5083629e",
+                "reference": "28aa0694bcfdfa5e2959c394d5a1ee7a5083629e",
                "shasum": ""
            },
            "require": {
@@ -1066,9 +1066,9 @@
            ],
            "support": {
                "issues": "https://github.com/firebase/php-jwt/issues",
-                "source": "https://github.com/firebase/php-jwt/tree/v6.11.1"
+                "source": "https://github.com/firebase/php-jwt/tree/v7.0.3"
            },
-            "time": "2025-04-09T20:32:01+00:00"
+            "time": "2026-02-25T22:16:40+00:00"
        },
        {
            "name": "fruitcake/php-cors",
@@ -2100,21 +2100,21 @@
        },
        {
            "name": "laravel/passport",
-            "version": "v12.4.2",
+            "version": "v12.4.3",
            "source": {
                "type": "git",
                "url": "https://github.com/laravel/passport.git",
-                "reference": "65a885607b62d361aedaeb10a946bc6b5a954262"
+                "reference": "1d2e0170a52f150d5c35c9a6fc1f7ccebcde7626"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/passport/zipball/65a885607b62d361aedaeb10a946bc6b5a954262",
-                "reference": "65a885607b62d361aedaeb10a946bc6b5a954262",
+                "url": "https://api.github.com/repos/laravel/passport/zipball/1d2e0170a52f150d5c35c9a6fc1f7ccebcde7626",
+                "reference": "1d2e0170a52f150d5c35c9a6fc1f7ccebcde7626",
                "shasum": ""
            },
            "require": {
                "ext-json": "*",
-                "firebase/php-jwt": "^6.4",
+                "firebase/php-jwt": "^6.4|^7.0",
                "illuminate/auth": "^9.21|^10.0|^11.0|^12.0",
                "illuminate/console": "^9.21|^10.0|^11.0|^12.0",
                "illuminate/container": "^9.21|^10.0|^11.0|^12.0",
@@ -2172,7 +2172,7 @@
                "issues": "https://github.com/laravel/passport/issues",
                "source": "https://github.com/laravel/passport"
            },
-            "time": "2025-02-12T16:11:33+00:00"
+            "time": "2026-02-19T14:14:05+00:00"
        },
        {
            "name": "laravel/prompts",
--- a/config/firefly.php
+++ b/config/firefly.php
@@ -78,8 +78,8 @@ return [
        'running_balance_column' => (bool)envNonEmpty('USE_RUNNING_BALANCE', true), // this is only the default value, is not used.
        // see cer.php for exchange rates feature flag.
    ],
-    'version'                              => '6.5.3',
-    'build_time'                           => 1772606967,
+    'version'                              => 'develop/2026-03-04',
+    'build_time'                           => 1772642078,
    'api_version'                          => '2.1.0', // field is no longer used.
    'db_version'                           => 28, // field is no longer used.

--- a/package-lock.json
+++ b/package-lock.json
@@ -2969,16 +2969,6 @@
                "win32"
            ]
        },
-        "node_modules/@trysound/sax": {
-            "version": "0.2.0",
-            "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz",
-            "integrity": "sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==",
-            "dev": true,
-            "license": "ISC",
-            "engines": {
-                "node": ">=10.13.0"
-            }
-        },
        "node_modules/@types/babel__core": {
            "version": "7.20.5",
            "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz",
@@ -10284,6 +10274,16 @@
                "url": "https://paulmillr.com/funding/"
            }
        },
+        "node_modules/sax": {
+            "version": "1.5.0",
+            "resolved": "https://registry.npmjs.org/sax/-/sax-1.5.0.tgz",
+            "integrity": "sha512-21IYA3Q5cQf089Z6tgaUTr7lDAyzoTPx5HRtbhsME8Udispad8dC/+sziTNugOEx54ilvatQ9YCzl4KQLPcRHA==",
+            "dev": true,
+            "license": "BlueOak-1.0.0",
+            "engines": {
+                "node": ">=11.0.0"
+            }
+        },
        "node_modules/schema-utils": {
            "version": "2.7.1",
            "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz",
@@ -10968,18 +10968,18 @@
            }
        },
        "node_modules/svgo": {
-            "version": "2.8.0",
-            "resolved": "https://registry.npmjs.org/svgo/-/svgo-2.8.0.tgz",
-            "integrity": "sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg==",
+            "version": "2.8.2",
+            "resolved": "https://registry.npmjs.org/svgo/-/svgo-2.8.2.tgz",
+            "integrity": "sha512-TyzE4NVGLUFy+H/Uy4N6c3G0HEeprsVfge6Lmq+0FdQQ/zqoVYB62IsBZORsiL+o96s6ff/V6/3UQo/C0cgCAA==",
            "dev": true,
            "license": "MIT",
            "dependencies": {
-                "@trysound/sax": "0.2.0",
                "commander": "^7.2.0",
                "css-select": "^4.1.3",
                "css-tree": "^1.1.3",
                "csso": "^4.2.0",
                "picocolors": "^1.0.0",
+                "sax": "^1.5.0",
                "stable": "^0.1.8"
            },
            "bin": {
Author	SHA1	Message	Date
github-actions[bot]	463ae00ec2	Merge pull request #11876 from firefly-iii/release-1772642273 🤖 Automatically merge the PR into the develop branch.	2026-03-04 17:38:02 +01:00
JC5	969460d271	🤖 Auto commit for release 'develop' on 2026-03-04	2026-03-04 17:37:53 +01:00
James Cole	8ecfa4b619	Fix #11873	2026-03-04 17:31:42 +01:00
James Cole	55ae86ad62	Merge branch 'main' into develop	2026-03-04 17:28:57 +01:00
github-actions[bot]	5e68d948f3	Merge pull request #11874 from firefly-iii/release-1772634907 🤖 Automatically merge the PR into the develop branch.	2026-03-04 15:35:20 +01:00
JC5	77cae13b95	🤖 Auto commit for release 'develop' on 2026-03-04	2026-03-04 15:35:07 +01:00
Sander Dorigo	49d8a3c32e	Catch not numeric numbers	2026-03-04 15:25:32 +01:00
github-actions[bot]	0ad4db8a71	Merge pull request #11872 from firefly-iii/release-1772618461 🤖 Automatically merge the PR into the develop branch.	2026-03-04 11:01:10 +01:00
JC5	ed9754c8d4	🤖 Auto commit for release 'develop' on 2026-03-04	2026-03-04 11:01:01 +01:00
Sander Dorigo	f8687d4fc1	New config	2026-03-04 10:01:24 +01:00