Merge pull request #11023 from firefly-iii/release-1759860049

🤖 Automatically merge the PR into the develop branch.
🤖 Auto commit for release 'develop' on 2025-10-07
2025-10-10 22:52:10 +00:00 · 2025-10-07 20:00:56 +02:00 · 2025-10-07 20:00:49 +02:00 · 2025-10-07 10:11:44 +02:00 · 2025-10-07 10:11:37 +02:00 · 2025-10-07 10:06:54 +02:00
7 changed files with 44 additions and 26 deletions
--- a/app/Api/V1/Controllers/Models/Account/ShowController.php
+++ b/app/Api/V1/Controllers/Models/Account/ShowController.php
@@ -88,7 +88,9 @@ class ShowController extends Controller
        $accounts    = $collection->slice(($this->parameters->get('page') - 1) * $params['limit'], $params['limit']);

        // #11007 go to the end of the previous day.
-        $this->parameters->set('start', $this->parameters->get('start')->subSecond());
+        $this->parameters->set('start', $this->parameters->get('start')?->subSecond());
+        // #11018 also end of the day.
+        $this->parameters->set('end', $this->parameters->get('end')?->endOfDay());

        // enrich
        /** @var User $admin */
@@ -129,7 +131,9 @@ class ShowController extends Controller
        $manager     = $this->getManager();

        // #11007 go to the end of the previous day.
-        $this->parameters->set('start', $this->parameters->get('start')->subSecond());
+        $this->parameters->set('start', $this->parameters->get('start')?->subSecond());
+        // #11018 also end of the day.
+        $this->parameters->set('end', $this->parameters->get('end')?->endOfDay());

        // enrich
        /** @var User $admin */
--- a/app/Api/V1/Controllers/Models/TransactionCurrency/ListController.php
+++ b/app/Api/V1/Controllers/Models/TransactionCurrency/ListController.php
@@ -101,7 +101,9 @@ class ListController extends Controller
        $accounts          = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);

        // #11007 go to the end of the previous day.
-        $this->parameters->set('start', $this->parameters->get('start')->subSecond());
+        $this->parameters->set('start', $this->parameters->get('start')?->subSecond());
+        // #11018 also end of the day.
+        $this->parameters->set('end', $this->parameters->get('end')?->endOfDay());

        // enrich
        /** @var User $admin */
--- a/app/Support/JsonApi/Enrichments/SubscriptionEnrichment.php
+++ b/app/Support/JsonApi/Enrichments/SubscriptionEnrichment.php
@@ -82,10 +82,9 @@ class SubscriptionEnrichment implements EnrichmentInterface
        // TODO clean me up.

        $notes            = $this->notes;
-        $objectGroups     = $this->objectGroups;
        $paidDates        = $this->paidDates;
        $payDates         = $this->payDates;
-        $this->collection = $this->collection->map(function (Bill $item) use ($notes, $objectGroups, $paidDates, $payDates) {
+        $this->collection = $this->collection->map(function (Bill $item) use ($notes, $paidDates, $payDates) {
            $id            = (int)$item->id;
            $currency      = $item->transactionCurrency;
            $nem           = $this->getNextExpectedMatch($payDates[$id] ?? []);
@@ -122,10 +121,12 @@ class SubscriptionEnrichment implements EnrichmentInterface

            // add object group if available
            if (array_key_exists($id, $this->mappedObjects)) {
-                $key                        = $this->mappedObjects[$id];
-                $meta['object_group_id']    = (string)$objectGroups[$key]['id'];
-                $meta['object_group_title'] = $objectGroups[$key]['title'];
-                $meta['object_group_order'] = $objectGroups[$key]['order'];
+                $key = $this->mappedObjects[$id];
+                if (array_key_exists($key, $this->objectGroups)) {
+                    $meta['object_group_id']    = (string)$this->objectGroups[$key]['id'];
+                    $meta['object_group_title'] = $this->objectGroups[$key]['title'];
+                    $meta['object_group_order'] = $this->objectGroups[$key]['order'];
+                }
            }

            // Add notes if available.
--- a/changelog.md
+++ b/changelog.md
@@ -3,7 +3,18 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).

-## 6.4.1 - 2025-09-15
+
+## 6.4.2 - 2055-10-07
+
+Everything from v6.4.1, plus:
+
+### Fixed
+
+- [Issue 11015](https://github.com/firefly-iii/firefly-iii/issues/11015) (Call to a member function subSecond() on null when viewing accounts) reported by @sirgio145
+- [Issue 11016](https://github.com/firefly-iii/firefly-iii/issues/11016) (Undefined array key 1 when viewing subscriptions) reported by @anuneo
+- [Issue 11018](https://github.com/firefly-iii/firefly-iii/issues/11018) (/v1/accounts balance_difference last day is not accounted for) reported by @ctrl-f5
+
+## 6.4.1 - 2025-10-07

 ### Added

--- a/composer.lock
+++ b/composer.lock
@@ -1878,16 +1878,16 @@
        },
        {
            "name": "laravel/framework",
-            "version": "v12.32.5",
+            "version": "v12.33.0",
            "source": {
                "type": "git",
                "url": "https://github.com/laravel/framework.git",
-                "reference": "77b2740391cd2a825ba59d6fada45e9b8b9bcc5a"
+                "reference": "124efc5f09d4668a4dc13f94a1018c524a58bcb1"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/77b2740391cd2a825ba59d6fada45e9b8b9bcc5a",
-                "reference": "77b2740391cd2a825ba59d6fada45e9b8b9bcc5a",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/124efc5f09d4668a4dc13f94a1018c524a58bcb1",
+                "reference": "124efc5f09d4668a4dc13f94a1018c524a58bcb1",
                "shasum": ""
            },
            "require": {
@@ -2093,7 +2093,7 @@
                "issues": "https://github.com/laravel/framework/issues",
                "source": "https://github.com/laravel/framework"
            },
-            "time": "2025-09-30T17:39:22+00:00"
+            "time": "2025-10-07T14:30:39+00:00"
        },
        {
            "name": "laravel/passport",
--- a/config/firefly.php
+++ b/config/firefly.php
@@ -78,8 +78,8 @@ return [
        'running_balance_column' => env('USE_RUNNING_BALANCE', false),
        // see cer.php for exchange rates feature flag.
    ],
-    'version'                      => '6.4.1',
-    'build_time'                   => 1759814318,
+    'version'                      => 'develop/2025-10-07',
+    'build_time'                   => 1759859933,
    '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
@@ -4075,9 +4075,9 @@
            "license": "MIT"
        },
        "node_modules/baseline-browser-mapping": {
-            "version": "2.8.12",
-            "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.8.12.tgz",
-            "integrity": "sha512-vAPMQdnyKCBtkmQA6FMCBvU9qFIppS3nzyXnEM+Lo2IAhG4Mpjv9cCxMudhgV3YdNNJv6TNqXy97dfRVL2LmaQ==",
+            "version": "2.8.13",
+            "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.8.13.tgz",
+            "integrity": "sha512-7s16KR8io8nIBWQyCYhmFhd+ebIzb9VKTzki+wOJXHTxTnV6+mFGH3+Jwn1zoKaY9/H9T/0BcKCZnzXljPnpSQ==",
            "dev": true,
            "license": "Apache-2.0",
            "bin": {
@@ -11836,9 +11836,9 @@
            "license": "BSD-2-Clause"
        },
        "node_modules/webpack": {
-            "version": "5.102.0",
-            "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.102.0.tgz",
-            "integrity": "sha512-hUtqAR3ZLVEYDEABdBioQCIqSoguHbFn1K7WlPPWSuXmx0031BD73PSE35jKyftdSh4YLDoQNgK4pqBt5Q82MA==",
+            "version": "5.102.1",
+            "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.102.1.tgz",
+            "integrity": "sha512-7h/weGm9d/ywQ6qzJ+Xy+r9n/3qgp/thalBbpOi5i223dPXKi04IBtqPN9nTd+jBc7QKfvDbaBnFipYp4sJAUQ==",
            "dev": true,
            "license": "MIT",
            "dependencies": {
@@ -11850,7 +11850,7 @@
                "@webassemblyjs/wasm-parser": "^1.14.1",
                "acorn": "^8.15.0",
                "acorn-import-phases": "^1.0.3",
-                "browserslist": "^4.24.5",
+                "browserslist": "^4.26.3",
                "chrome-trace-event": "^1.0.2",
                "enhanced-resolve": "^5.17.3",
                "es-module-lexer": "^1.2.1",
@@ -11862,8 +11862,8 @@
                "loader-runner": "^4.2.0",
                "mime-types": "^2.1.27",
                "neo-async": "^2.6.2",
-                "schema-utils": "^4.3.2",
-                "tapable": "^2.2.3",
+                "schema-utils": "^4.3.3",
+                "tapable": "^2.3.0",
                "terser-webpack-plugin": "^5.3.11",
                "watchpack": "^2.4.4",
                "webpack-sources": "^3.3.3"
Author	SHA1	Message	Date
github-actions[bot]	98be3a1414	Merge pull request #11023 from firefly-iii/release-1759860049 🤖 Automatically merge the PR into the develop branch.	2025-10-07 20:00:56 +02:00
JC5	e3c3a0a84b	🤖 Auto commit for release 'develop' on 2025-10-07	2025-10-07 20:00:49 +02:00
github-actions[bot]	f21a5b3000	Merge pull request #11020 from firefly-iii/release-1759824697 🤖 Automatically merge the PR into the develop branch.	2025-10-07 10:11:44 +02:00
JC5	6029fe2e84	🤖 Auto commit for release 'v6.4.2' on 2025-10-07	2025-10-07 10:11:37 +02:00
Sander Dorigo	651e11ed1c	Fix #11018	2025-10-07 10:06:54 +02:00
James Cole	5ba29cdacd	Merge pull request #11019 from ctrl-f5/fix/currency-account-end-date fix #11015 set end date time to end of day	2025-10-07 10:05:15 +02:00
mergify[bot]	f948cc95b4	Merge branch 'develop' into fix/currency-account-end-date	2025-10-07 08:04:45 +00:00
Nicky De Maeyer	11e721c6c9	fix #11018 , set end date to endOfDay	2025-10-07 10:03:26 +02:00
github-actions[bot]	4bc77b2707	Merge pull request #11017 from firefly-iii/release-1759823886 🤖 Automatically merge the PR into the develop branch.	2025-10-07 09:58:17 +02:00
JC5	6639309935	🤖 Auto commit for release 'develop' on 2025-10-07	2025-10-07 09:58:06 +02:00
Sander Dorigo	52e08bb9eb	Update changelog	2025-10-07 09:52:39 +02:00
Sander Dorigo	435ca994cf	Fix #11016	2025-10-07 09:52:29 +02:00
Sander Dorigo	b29c35864c	Fix #11015	2025-10-07 09:49:35 +02:00