Merge pull request #11369 from firefly-iii/release-1765861996

🤖 Automatically merge the PR into the develop branch.
2025-12-17 03:49:22 +00:00 · 2025-12-16 06:13:25 +01:00
parent 76ea5b6e34 4e9e63ed08
commit 710ae981a6
5 changed files with 59 additions and 162 deletions
--- a/.ci/php-cs-fixer/composer.lock
+++ b/.ci/php-cs-fixer/composer.lock
@@ -402,16 +402,16 @@
        },
        {
            "name": "friendsofphp/php-cs-fixer",
-            "version": "v3.92.0",
+            "version": "v3.92.1",
            "source": {
                "type": "git",
                "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
-                "reference": "5646c2cd99b7cb4b658ff681fe27069ba86c7280"
+                "reference": "ed33ad03313a019533ba065eba6c86af0a382873"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/5646c2cd99b7cb4b658ff681fe27069ba86c7280",
-                "reference": "5646c2cd99b7cb4b658ff681fe27069ba86c7280",
+                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/ed33ad03313a019533ba065eba6c86af0a382873",
+                "reference": "ed33ad03313a019533ba065eba6c86af0a382873",
                "shasum": ""
            },
            "require": {
@@ -451,6 +451,7 @@
                "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.6",
                "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.6",
                "phpunit/phpunit": "^9.6.25 || ^10.5.53 || ^11.5.34",
+                "symfony/polyfill-php85": "^1.33",
                "symfony/var-dumper": "^5.4.48 || ^6.4.24 || ^7.3.2 || ^8.0",
                "symfony/yaml": "^5.4.45 || ^6.4.24 || ^7.3.2 || ^8.0"
            },
@@ -493,7 +494,7 @@
            ],
            "support": {
                "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues",
-                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.92.0"
+                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.92.1"
            },
            "funding": [
                {
@@ -501,7 +502,7 @@
                    "type": "github"
                }
            ],
-            "time": "2025-12-12T10:29:19+00:00"
+            "time": "2025-12-15T23:09:01+00:00"
        },
        {
            "name": "psr/container",
--- a/app/Http/Controllers/Transaction/IndexController.php
+++ b/app/Http/Controllers/Transaction/IndexController.php
@@ -76,16 +76,16 @@ class IndexController extends Controller
     * @throws FireflyException
     * @throws NotFoundExceptionInterface
     */
-    public function index(Request $request, string $objectType, ?Carbon $start = null, ?Carbon $end = null): Factory | \Illuminate\Contracts\View\View
+    public function index(Request $request, string $objectType, ?Carbon $start = null, ?Carbon $end = null): Factory|\Illuminate\Contracts\View\View
    {
        if ('transfers' === $objectType) {
            $objectType = 'transfer';
        }

-        $subTitleIcon = config('firefly.transactionIconsByType.' . $objectType);
-        $types        = config('firefly.transactionTypesByType.' . $objectType);
-        $page         = (int)$request->get('page');
-        $pageSize     = (int)Preferences::get('listPageSize', 50)->data;
+        $subTitleIcon  = config('firefly.transactionIconsByType.'.$objectType);
+        $types         = config('firefly.transactionTypesByType.'.$objectType);
+        $page          = (int)$request->get('page');
+        $pageSize      = (int)Preferences::get('listPageSize', 50)->data;

        if (!$start instanceof Carbon) {
            $start = session('start');
@@ -98,33 +98,34 @@ class IndexController extends Controller
        }

        [$start, $end] = $end < $start ? [$end, $start] : [$start, $end];
-        $startStr     = $start->isoFormat($this->monthAndDayFormat);
-        $endStr       = $end->isoFormat($this->monthAndDayFormat);
-        $subTitle     = (string)trans(sprintf('firefly.title_%s_between', $objectType), ['start' => $startStr, 'end' => $endStr]);
-        $path         = route('transactions.index', [$objectType, $start->format('Y-m-d'), $end->format('Y-m-d')]);
-        $firstJournal = $this->repository->firstNull();
-        $startPeriod  = $firstJournal instanceof TransactionJournal ? $firstJournal->date : new Carbon();
-        $endPeriod    = clone $end;
+        $startStr      = $start->isoFormat($this->monthAndDayFormat);
+        $endStr        = $end->isoFormat($this->monthAndDayFormat);
+        $subTitle      = (string)trans(sprintf('firefly.title_%s_between', $objectType), ['start' => $startStr, 'end' => $endStr]);
+        $path          = route('transactions.index', [$objectType, $start->format('Y-m-d'), $end->format('Y-m-d')]);
+        $firstJournal  = $this->repository->firstNull();
+        $startPeriod   = $firstJournal instanceof TransactionJournal ? $firstJournal->date : new Carbon();
+        $endPeriod     = clone $end;

        // limit to 3 years for the time being.
        if (now()->diffInYears($startPeriod, true) > 3) {
            $startPeriod = now()->subYears(3);
        }

-        $periods = $this->getTransactionPeriodOverview($objectType, $startPeriod, $endPeriod);
+        $periods       = $this->getTransactionPeriodOverview($objectType, $startPeriod, $endPeriod);

        /** @var GroupCollectorInterface $collector */
-        $collector = app(GroupCollectorInterface::class);
+        $collector     = app(GroupCollectorInterface::class);

        $collector->setRange($start, $end)
-                  ->setTypes($types)
-                  ->setLimit($pageSize)
-                  ->setPage($page)
-                  ->withBudgetInformation()
-                  ->withCategoryInformation()
-                  ->withAccountInformation()
-                  ->withAttachmentInformation();
-        $groups = $collector->getPaginatedGroups();
+            ->setTypes($types)
+            ->setLimit($pageSize)
+            ->setPage($page)
+            ->withBudgetInformation()
+            ->withCategoryInformation()
+            ->withAccountInformation()
+            ->withAttachmentInformation()
+        ;
+        $groups        = $collector->getPaginatedGroups();
        $groups->setPath($path);

        return view('transactions.index', ['subTitle' => $subTitle, 'objectType' => $objectType, 'subTitleIcon' => $subTitleIcon, 'groups' => $groups, 'periods' => $periods, 'start' => $start, 'end' => $end]);
@@ -138,10 +139,10 @@ class IndexController extends Controller
     * @throws ContainerExceptionInterface
     * @throws NotFoundExceptionInterface
     */
-    public function indexAll(Request $request, string $objectType): Factory | \Illuminate\Contracts\View\View
+    public function indexAll(Request $request, string $objectType): Factory|\Illuminate\Contracts\View\View
    {
-        $subTitleIcon = config('firefly.transactionIconsByType.' . $objectType);
-        $types        = config('firefly.transactionTypesByType.' . $objectType);
+        $subTitleIcon = config('firefly.transactionIconsByType.'.$objectType);
+        $types        = config('firefly.transactionTypesByType.'.$objectType);
        $page         = (int)$request->get('page');
        $pageSize     = (int)Preferences::get('listPageSize', 50)->data;
        $path         = route('transactions.index.all', [$objectType]);
@@ -149,20 +150,21 @@ class IndexController extends Controller
        $start        = $first instanceof TransactionJournal ? $first->date : new Carbon();
        $last         = $this->repository->getLast();
        $end          = $last instanceof TransactionJournal ? $last->date : today(config('app.timezone'));
-        $subTitle     = (string)trans('firefly.all_' . $objectType);
+        $subTitle     = (string)trans('firefly.all_'.$objectType);

        /** @var GroupCollectorInterface $collector */
-        $collector = app(GroupCollectorInterface::class);
+        $collector    = app(GroupCollectorInterface::class);

        $collector->setRange($start, $end)
-                  ->setTypes($types)
-                  ->setLimit($pageSize)
-                  ->setPage($page)
-                  ->withAccountInformation()
-                  ->withBudgetInformation()
-                  ->withCategoryInformation()
-                  ->withAttachmentInformation();
-        $groups = $collector->getPaginatedGroups();
+            ->setTypes($types)
+            ->setLimit($pageSize)
+            ->setPage($page)
+            ->withAccountInformation()
+            ->withBudgetInformation()
+            ->withCategoryInformation()
+            ->withAttachmentInformation()
+        ;
+        $groups       = $collector->getPaginatedGroups();
        $groups->setPath($path);

        return view('transactions.index', ['subTitle' => $subTitle, 'objectType' => $objectType, 'subTitleIcon' => $subTitleIcon, 'groups' => $groups, 'start' => $start, 'end' => $end]);
--- a/changelog.md
+++ b/changelog.md
@@ -7,8 +7,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).

 ### Fixed

- #11368
- #11367
+- [Issue 11368](https://github.com/firefly-iii/firefly-iii/issues/11368) (Attempt to read property "user" on null) reported by @simonwiles
+- [Issue 11367](https://github.com/firefly-iii/firefly-iii/issues/11367) (Expenses page has incorrect summary values) reported by @purplemeteorite

 ## v6.4.11 - 2025-12-16

--- 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'                              => 'develop/2025-12-15',
-    'build_time'                           => 1765805113,
+    'version'                              => 'develop/2025-12-16',
+    'build_time'                           => 1765861887,
    '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
@@ -10232,9 +10232,9 @@
            }
        },
        "node_modules/send": {
-            "version": "0.19.1",
-            "resolved": "https://registry.npmjs.org/send/-/send-0.19.1.tgz",
-            "integrity": "sha512-p4rRk4f23ynFEfcD9LA0xRYngj+IyGiEYyqqOak8kaN0TvNmuxC2dcVeBn62GpCeR2CpWqyHCNScTP91QbAVFg==",
+            "version": "0.19.2",
+            "resolved": "https://registry.npmjs.org/send/-/send-0.19.2.tgz",
+            "integrity": "sha512-VMbMxbDeehAxpOtWJXlcUS5E8iXh6QmN+BkRX1GARS3wRaXEEgzCcB10gTQazO42tpNIya8xIyNx8fll1OFPrg==",
            "dev": true,
            "license": "MIT",
            "dependencies": {
@@ -10244,13 +10244,13 @@
                "encodeurl": "~2.0.0",
                "escape-html": "~1.0.3",
                "etag": "~1.8.1",
-                "fresh": "0.5.2",
-                "http-errors": "2.0.0",
+                "fresh": "~0.5.2",
+                "http-errors": "~2.0.1",
                "mime": "1.6.0",
                "ms": "2.1.3",
-                "on-finished": "2.4.1",
+                "on-finished": "~2.4.1",
                "range-parser": "~1.2.1",
-                "statuses": "2.0.1"
+                "statuses": "~2.0.2"
            },
            "engines": {
                "node": ">= 0.8.0"
@@ -10273,33 +10273,6 @@
            "dev": true,
            "license": "MIT"
        },
-        "node_modules/send/node_modules/http-errors": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
-            "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "depd": "2.0.0",
-                "inherits": "2.0.4",
-                "setprototypeof": "1.2.0",
-                "statuses": "2.0.1",
-                "toidentifier": "1.0.1"
-            },
-            "engines": {
-                "node": ">= 0.8"
-            }
-        },
-        "node_modules/send/node_modules/statuses": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
-            "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">= 0.8"
-            }
-        },
        "node_modules/serialize-javascript": {
            "version": "6.0.2",
            "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
@@ -10397,100 +10370,21 @@
            }
        },
        "node_modules/serve-static": {
-            "version": "1.16.2",
-            "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz",
-            "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==",
+            "version": "1.16.3",
+            "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.3.tgz",
+            "integrity": "sha512-x0RTqQel6g5SY7Lg6ZreMmsOzncHFU7nhnRWkKgWuMTu5NN0DR5oruckMqRvacAN9d5w6ARnRBXl9xhDCgfMeA==",
            "dev": true,
            "license": "MIT",
            "dependencies": {
                "encodeurl": "~2.0.0",
                "escape-html": "~1.0.3",
                "parseurl": "~1.3.3",
-                "send": "0.19.0"
+                "send": "~0.19.1"
            },
            "engines": {
                "node": ">= 0.8.0"
            }
        },
-        "node_modules/serve-static/node_modules/debug": {
-            "version": "2.6.9",
-            "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-            "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "ms": "2.0.0"
-            }
-        },
-        "node_modules/serve-static/node_modules/debug/node_modules/ms": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-            "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/serve-static/node_modules/http-errors": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
-            "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "depd": "2.0.0",
-                "inherits": "2.0.4",
-                "setprototypeof": "1.2.0",
-                "statuses": "2.0.1",
-                "toidentifier": "1.0.1"
-            },
-            "engines": {
-                "node": ">= 0.8"
-            }
-        },
-        "node_modules/serve-static/node_modules/send": {
-            "version": "0.19.0",
-            "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz",
-            "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "debug": "2.6.9",
-                "depd": "2.0.0",
-                "destroy": "1.2.0",
-                "encodeurl": "~1.0.2",
-                "escape-html": "~1.0.3",
-                "etag": "~1.8.1",
-                "fresh": "0.5.2",
-                "http-errors": "2.0.0",
-                "mime": "1.6.0",
-                "ms": "2.1.3",
-                "on-finished": "2.4.1",
-                "range-parser": "~1.2.1",
-                "statuses": "2.0.1"
-            },
-            "engines": {
-                "node": ">= 0.8.0"
-            }
-        },
-        "node_modules/serve-static/node_modules/send/node_modules/encodeurl": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-            "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">= 0.8"
-            }
-        },
-        "node_modules/serve-static/node_modules/statuses": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
-            "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">= 0.8"
-            }
-        },
        "node_modules/set-function-length": {
            "version": "1.2.2",
            "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",