🤖 Auto commit for release 'develop' on 2025-08-08

2025-10-03 11:08:28 +00:00 · 2025-08-08 21:03:45 +02:00
parent 76e91be4dc
commit 92f534bcb3
14 changed files with 323 additions and 318 deletions
--- a/app/Api/V1/Controllers/Chart/BalanceController.php
+++ b/app/Api/V1/Controllers/Chart/BalanceController.php
@@ -4,7 +4,6 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Controllers\Chart;

-
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Chart\ChartRequest;
 use FireflyIII\Enums\TransactionTypeEnum;
@@ -76,7 +75,8 @@ class BalanceController extends Controller
        $this->collector->setRange($queryParameters['start'], $queryParameters['end'])
            ->withAccountInformation()
            ->setXorAccounts($accounts)
-                        ->setTypes([TransactionTypeEnum::WITHDRAWAL->value, TransactionTypeEnum::DEPOSIT->value, TransactionTypeEnum::RECONCILIATION->value, TransactionTypeEnum::TRANSFER->value]);
+            ->setTypes([TransactionTypeEnum::WITHDRAWAL->value, TransactionTypeEnum::DEPOSIT->value, TransactionTypeEnum::RECONCILIATION->value, TransactionTypeEnum::TRANSFER->value])
+        ;
        $journals        = $this->collector->getExtractedJournals();

        $object          = new AccountBalanceGrouped();
--- a/app/Http/Controllers/Chart/AccountController.php
+++ b/app/Http/Controllers/Chart/AccountController.php
@@ -43,6 +43,7 @@ use FireflyIII\Support\Http\Controllers\DateCalculation;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Log;
+
 use function Safe\json_encode;

 /**
@@ -207,7 +208,6 @@ class AccountController extends Controller

    /**
     * Expenses per budget for all time, as shown on account overview.
-     *
     */
    public function expenseBudgetAll(AccountRepositoryInterface $repository, Account $account): JsonResponse
    {
@@ -236,7 +236,8 @@ class AccountController extends Controller
        $collector = app(GroupCollectorInterface::class);
        $collector->setAccounts(new Collection([$account]))
            ->setRange($start, $end)
-                  ->withBudgetInformation()->setTypes([TransactionTypeEnum::WITHDRAWAL->value]);
+            ->withBudgetInformation()->setTypes([TransactionTypeEnum::WITHDRAWAL->value])
+        ;
        $journals  = $collector->getExtractedJournals();
        $chartData = [];
        $result    = [];
--- a/app/Repositories/Account/AccountRepository.php
+++ b/app/Repositories/Account/AccountRepository.php
@@ -567,7 +567,7 @@ class AccountRepository implements AccountRepositoryInterface, UserGroupInterfac
                'transaction_journals.transaction_currency_id',
                'transactions.amount',
                'transactions.native_amount',
-                'transactions.foreign_amount'
+                'transactions.foreign_amount',
            ])
            ->toArray()
        ;
--- a/app/Repositories/AuditLogEntry/ALERepositoryInterface.php
+++ b/app/Repositories/AuditLogEntry/ALERepositoryInterface.php
@@ -45,8 +45,8 @@ use Illuminate\Support\Collection;
 interface ALERepositoryInterface
 {
    public function getForObject(Model $model): Collection;
-    public function getForId(string $model, int $modelId): Collection;

+    public function getForId(string $model, int $modelId): Collection;

    public function store(array $data): AuditLogEntry;
 }
--- a/app/Support/Amount.php
+++ b/app/Support/Amount.php
@@ -122,15 +122,18 @@ class Amount
            if (null === $pref) {
                $res = true === Preferences::get('convert_to_primary', false)->data && true === config('cer.enabled');
                $instance->setPreference('convert_to_primary_no_user', $res);
+
                return $res;
            }
+
            return $pref;
        }
        $key      = sprintf('convert_to_primary_%d', $user->id);
        $pref     = $instance->getPreference($key);
-        if(null === $pref) {
+        if (null === $pref) {
            $res = true === Preferences::getForUser($user, 'convert_to_primary', false)->data && true === config('cer.enabled');
            $instance->setPreference($key, $res);
+
            return $res;
        }

@@ -330,9 +333,9 @@ class Amount
        }

        if ($csPrecedes) {
-            return $posA . $posB . '%s' . $posC . $space . $posD . '%v' . $posE;
+            return $posA.$posB.'%s'.$posC.$space.$posD.'%v'.$posE;
        }

-        return $posA . $posD . '%v' . $space . $posB . '%s' . $posC . $posE;
+        return $posA.$posD.'%v'.$space.$posB.'%s'.$posC.$posE;
    }
 }
--- a/app/Support/Http/Controllers/PeriodOverview.php
+++ b/app/Support/Http/Controllers/PeriodOverview.php
@@ -150,7 +150,7 @@ trait PeriodOverview
                $result[] = $item;
                unset($transactions[$index]);
            }
-            if(!$fits) {
+            if (!$fits) {
                $filtered[] = $item;
            }
        }
@@ -172,10 +172,12 @@ trait PeriodOverview
            if ($date >= $start && $date <= $end) {
                if ('away' === $direction && -1 === bccomp((string)$item['amount'], '0')) {
                    $result[] = $item;
+
                    continue;
                }
                if ('in' === $direction && 1 === bccomp((string)$item['amount'], '0')) {
                    $result[] = $item;
+
                    continue;
                }
                $filtered[] = $item;
--- a/app/Support/Preferences.php
+++ b/app/Support/Preferences.php
@@ -286,7 +286,7 @@ class Preferences
    {
        $instance     = PreferencesSingleton::getInstance();
        $pref         = $instance->getPreference('last_activity');
-        if(null !== $pref) {
+        if (null !== $pref) {
            // Log::debug(sprintf('Found last activity in singleton: %s', $pref));
            return $pref;
        }
@@ -301,6 +301,7 @@ class Preferences
        }
        $setting      = hash('sha256', (string) $lastActivity);
        $instance->setPreference('last_activity', $setting);
+
        return $setting;
    }

--- a/app/Support/Singleton/PreferencesSingleton.php
+++ b/app/Support/Singleton/PreferencesSingleton.php
@@ -1,5 +1,7 @@
 <?php

+declare(strict_types=1);
+
 namespace FireflyIII\Support\Singleton;

 class PreferencesSingleton
@@ -13,16 +15,17 @@ class PreferencesSingleton
        // Private constructor to prevent direct instantiation.
    }

-    public static function getInstance(): PreferencesSingleton
+    public static function getInstance(): self
    {
-        if (self::$instance === null) {
-            self::$instance = new PreferencesSingleton();
+        if (null === self::$instance) {
+            self::$instance = new self();
        }

        return self::$instance;
    }

-    public function resetPreferences(): void {
+    public function resetPreferences(): void
+    {
        $this->preferences = [];
    }

@@ -35,5 +38,4 @@ class PreferencesSingleton
    {
        return $this->preferences[$key] ?? null;
    }
-
 }
--- a/composer.lock
+++ b/composer.lock
@@ -939,16 +939,16 @@
        },
        {
            "name": "filp/whoops",
-            "version": "2.18.3",
+            "version": "2.18.4",
            "source": {
                "type": "git",
                "url": "https://github.com/filp/whoops.git",
-                "reference": "59a123a3d459c5a23055802237cb317f609867e5"
+                "reference": "d2102955e48b9fd9ab24280a7ad12ed552752c4d"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/filp/whoops/zipball/59a123a3d459c5a23055802237cb317f609867e5",
-                "reference": "59a123a3d459c5a23055802237cb317f609867e5",
+                "url": "https://api.github.com/repos/filp/whoops/zipball/d2102955e48b9fd9ab24280a7ad12ed552752c4d",
+                "reference": "d2102955e48b9fd9ab24280a7ad12ed552752c4d",
                "shasum": ""
            },
            "require": {
@@ -998,7 +998,7 @@
            ],
            "support": {
                "issues": "https://github.com/filp/whoops/issues",
-                "source": "https://github.com/filp/whoops/tree/2.18.3"
+                "source": "https://github.com/filp/whoops/tree/2.18.4"
            },
            "funding": [
                {
@@ -1006,7 +1006,7 @@
                    "type": "github"
                }
            ],
-            "time": "2025-06-16T00:02:10+00:00"
+            "time": "2025-08-08T12:00:00+00:00"
        },
        {
            "name": "firebase/php-jwt",
@@ -1879,16 +1879,16 @@
        },
        {
            "name": "laravel/framework",
-            "version": "v12.22.0",
+            "version": "v12.22.1",
            "source": {
                "type": "git",
                "url": "https://github.com/laravel/framework.git",
-                "reference": "6ab00c913ef6ec6fad0bd506f7452c0bb9e792c3"
+                "reference": "d33ee45184126f32f593d4b809a846ed88a1dc43"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/6ab00c913ef6ec6fad0bd506f7452c0bb9e792c3",
-                "reference": "6ab00c913ef6ec6fad0bd506f7452c0bb9e792c3",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/d33ee45184126f32f593d4b809a846ed88a1dc43",
+                "reference": "d33ee45184126f32f593d4b809a846ed88a1dc43",
                "shasum": ""
            },
            "require": {
@@ -2090,7 +2090,7 @@
                "issues": "https://github.com/laravel/framework/issues",
                "source": "https://github.com/laravel/framework"
            },
-            "time": "2025-08-07T13:49:53+00:00"
+            "time": "2025-08-08T13:58:03+00:00"
        },
        {
            "name": "laravel/passport",
--- a/config/firefly.php
+++ b/config/firefly.php
@@ -79,7 +79,7 @@ return [
        // see cer.php for exchange rates feature flag.
    ],
    'version'                      => 'develop/2025-08-08',
-    'build_time'                   => 1754630161,
+    'build_time'                   => 1754679717,
    'api_version'                  => '2.1.0', // field is no longer used.
    'db_version'                   => 26,

--- a/package-lock.json
+++ b/package-lock.json
@@ -3148,9 +3148,9 @@
            "license": "MIT"
        },
        "node_modules/@types/node": {
-            "version": "24.2.0",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-24.2.0.tgz",
-            "integrity": "sha512-3xyG3pMCq3oYCNg7/ZP+E1ooTaGB4cG8JWRsqqOYQdbWNY4zbaV0Ennrd7stjiJEFZCaybcIgpTjJWHRfBSIDw==",
+            "version": "24.2.1",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-24.2.1.tgz",
+            "integrity": "sha512-DRh5K+ka5eJic8CjH7td8QpYEV6Zo10gfRkjHCO3weqZHWDtAaSTFtl4+VMqOJ4N5jcuhZ9/l+yy8rVgw7BQeQ==",
            "dev": true,
            "license": "MIT",
            "dependencies": {
@@ -4486,9 +4486,9 @@
            }
        },
        "node_modules/caniuse-lite": {
-            "version": "1.0.30001731",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001731.tgz",
-            "integrity": "sha512-lDdp2/wrOmTRWuoB5DpfNkC0rJDU8DqRa6nYL6HK6sytw70QMopt/NIc/9SM7ylItlBWfACXk0tEn37UWM/+mg==",
+            "version": "1.0.30001733",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001733.tgz",
+            "integrity": "sha512-e4QKw/O2Kavj2VQTKZWrwzkt3IxOmIlU6ajRb6LP64LHpBo1J67k2Hi4Vu/TgJWsNtynurfS0uK3MaUTCPfu5Q==",
            "dev": true,
            "funding": [
                {
--- a/routes/api.php
+++ b/routes/api.php
@@ -24,10 +24,6 @@ declare(strict_types=1);

 use Illuminate\Support\Facades\Route;

-
-
-
-
 /*
 * ____    ____  __     .______        ______    __    __  .___________. _______     _______.
 * \   \  /   / /_ |    |   _  \      /  __  \  |  |  |  | |           ||   ____|   /       |