Auto commit for release 'develop' on 2025-02-20

2025-10-13 16:00:13 +00:00 · 2025-02-20 08:00:12 +01:00
parent 2e3669a32f
commit 12629a1955
6 changed files with 52 additions and 48 deletions
--- a/app/Support/JsonApi/Enrichments/AccountEnrichment.php
+++ b/app/Support/JsonApi/Enrichments/AccountEnrichment.php
@@ -234,7 +234,7 @@ class AccountEnrichment implements EnrichmentInterface

    private function collectMetaData(): void
    {
-        $set        = AccountMeta::whereIn('name', ['is_multi_currency', 'include_net_worth','currency_id', 'account_role', 'account_number', 'liability_direction', 'interest', 'interest_period', 'current_debt'])
+        $set        = AccountMeta::whereIn('name', ['is_multi_currency', 'include_net_worth', 'currency_id', 'account_role', 'account_number', 'liability_direction', 'interest', 'interest_period', 'current_debt'])
            ->whereIn('account_id', $this->accountIds)
            ->get(['account_meta.id', 'account_meta.account_id', 'account_meta.name', 'account_meta.data'])->toArray()
        ;
--- a/app/Support/Preferences.php
+++ b/app/Support/Preferences.php
@@ -52,10 +52,11 @@ class Preferences
                $q->whereNull('user_group_id');
                $q->orWhere('user_group_id', $user->user_group_id);
            })
-                         ->get();
+            ->get()
+        ;
    }

-    public function get(string $name, null | array | bool | int | string $default = null): ?Preference
+    public function get(string $name, null|array|bool|int|string $default = null): ?Preference
    {
        /** @var null|User $user */
        $user = auth()->user();
@@ -69,7 +70,7 @@ class Preferences
        return $this->getForUser($user, $name, $default);
    }

-    public function getForUser(User $user, string $name, null | array | bool | int | string $default = null): ?Preference
+    public function getForUser(User $user, string $name, null|array|bool|int|string $default = null): ?Preference
    {
        Log::debug(sprintf('getForUser(#%d, "%s")', $user->id, $name));
        // don't care about user group ID, except for some specific preferences.
@@ -90,11 +91,13 @@ class Preferences

        if (null !== $preference) {
            Log::debug(sprintf('Found preference #%d for user #%d: %s', $preference->id, $user->id, $name));
+
            return $preference;
        }
        // no preference found and default is null:
        if (null === $default) {
            Log::debug('Return NULL, create no preference.');
+
            // return NULL
            return null;
        }
@@ -131,7 +134,7 @@ class Preferences
        Cache::put($key, '', 5);
    }

-    public function setForUser(User $user, string $name, null | array | bool | int | string $value): Preference
+    public function setForUser(User $user, string $name, null|array|bool|int|string $value): Preference
    {
        $fullName         = sprintf('preference%s%s', $user->id, $name);
        $userGroupId      = $this->getUserGroupId($user, $name);
@@ -193,7 +196,8 @@ class Preferences
                $q->orWhere('user_group_id', $user->user_group_id);
            })
            ->whereIn('name', $list)
-                                 ->get(['id', 'name', 'data']);
+            ->get(['id', 'name', 'data'])
+        ;

        /** @var Preference $preference */
        foreach ($preferences as $preference) {
@@ -235,7 +239,7 @@ class Preferences
        return $result;
    }

-    public function getEncryptedForUser(User $user, string $name, null | array | bool | int | string $default = null): ?Preference
+    public function getEncryptedForUser(User $user, string $name, null|array|bool|int|string $default = null): ?Preference
    {
        $result = $this->getForUser($user, $name, $default);
        if ('' === $result->data) {
@@ -260,7 +264,7 @@ class Preferences
        return $result;
    }

-    public function getFresh(string $name, null | array | bool | int | string $default = null): ?Preference
+    public function getFresh(string $name, null|array|bool|int|string $default = null): ?Preference
    {
        /** @var null|User $user */
        $user = auth()->user();
@@ -298,7 +302,7 @@ class Preferences
        Session::forget('first');
    }

-    public function set(string $name, null | array | bool | int | string $value): Preference
+    public function set(string $name, null|array|bool|int|string $value): Preference
    {
        /** @var null|User $user */
        $user = auth()->user();
--- a/composer.lock
+++ b/composer.lock
@@ -1874,16 +1874,16 @@
        },
        {
            "name": "laravel/framework",
-            "version": "v11.43.0",
+            "version": "v11.43.2",
            "source": {
                "type": "git",
                "url": "https://github.com/laravel/framework.git",
-                "reference": "70760d976486310b11d8e487e873077db069e77a"
+                "reference": "99d1573698abc42222f04d25fcd5b213d0eedf21"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/70760d976486310b11d8e487e873077db069e77a",
-                "reference": "70760d976486310b11d8e487e873077db069e77a",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/99d1573698abc42222f04d25fcd5b213d0eedf21",
+                "reference": "99d1573698abc42222f04d25fcd5b213d0eedf21",
                "shasum": ""
            },
            "require": {
@@ -2085,7 +2085,7 @@
                "issues": "https://github.com/laravel/framework/issues",
                "source": "https://github.com/laravel/framework"
            },
-            "time": "2025-02-18T15:37:56+00:00"
+            "time": "2025-02-19T21:53:48+00:00"
        },
        {
            "name": "laravel/passport",
@@ -11267,16 +11267,16 @@
        },
        {
            "name": "phpstan/phpstan",
-            "version": "2.1.5",
+            "version": "2.1.6",
            "source": {
                "type": "git",
                "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "451b17f9665481ee502adc39be987cb71067ece2"
+                "reference": "6eaec7c6c9e90dcfe46ad1e1ffa5171e2dab641c"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/451b17f9665481ee502adc39be987cb71067ece2",
-                "reference": "451b17f9665481ee502adc39be987cb71067ece2",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/6eaec7c6c9e90dcfe46ad1e1ffa5171e2dab641c",
+                "reference": "6eaec7c6c9e90dcfe46ad1e1ffa5171e2dab641c",
                "shasum": ""
            },
            "require": {
@@ -11321,7 +11321,7 @@
                    "type": "github"
                }
            ],
-            "time": "2025-02-13T12:49:56+00:00"
+            "time": "2025-02-19T15:46:42+00:00"
        },
        {
            "name": "phpstan/phpstan-deprecation-rules",
--- a/config/firefly.php
+++ b/config/firefly.php
@@ -81,7 +81,7 @@ return [
        'running_balance_column' => env('USE_RUNNING_BALANCE', false),
        // see cer.php for exchange rates feature flag.
    ],
-    'version'                      => 'develop/2025-02-19',
+    'version'                      => 'develop/2025-02-20',
    'api_version'                  => '2.1.0', // field is no longer used.
    'db_version'                   => 25,

--- a/package-lock.json
+++ b/package-lock.json
@@ -4510,9 +4510,9 @@
            }
        },
        "node_modules/chart.js": {
-            "version": "4.4.7",
-            "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.4.7.tgz",
-            "integrity": "sha512-pwkcKfdzTMAU/+jNosKhNL2bHtJc/sSmYgVbuGTEDhzkrhmyihmP7vUc/5ZK9WopidMDHNe3Wm7jOd/WhuHWuw==",
+            "version": "4.4.8",
+            "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.4.8.tgz",
+            "integrity": "sha512-IkGZlVpXP+83QpMm4uxEiGqSI7jFizwVtF3+n5Pc3k7sMO+tkd0qxh2OzLhenM0K80xtmAONWGBn082EiBQSDA==",
            "license": "MIT",
            "dependencies": {
                "@kurkle/color": "^0.3.0"
@@ -8901,9 +8901,9 @@
            }
        },
        "node_modules/postcss": {
-            "version": "8.5.2",
-            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.2.tgz",
-            "integrity": "sha512-MjOadfU3Ys9KYoX0AdkBlFEF1Vx37uCCeN4ZHnmwm9FfpbsGWMZeBLMmmpY+6Ocqod7mkdZ0DT31OlbsFrLlkA==",
+            "version": "8.5.3",
+            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.3.tgz",
+            "integrity": "sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==",
            "dev": true,
            "funding": [
                {
@@ -11344,14 +11344,14 @@
            }
        },
        "node_modules/vite": {
-            "version": "6.1.0",
-            "resolved": "https://registry.npmjs.org/vite/-/vite-6.1.0.tgz",
-            "integrity": "sha512-RjjMipCKVoR4hVfPY6GQTgveinjNuyLw+qruksLDvA5ktI1150VmcMBKmQaEWJhg/j6Uaf6dNCNA0AfdzUb/hQ==",
+            "version": "6.1.1",
+            "resolved": "https://registry.npmjs.org/vite/-/vite-6.1.1.tgz",
+            "integrity": "sha512-4GgM54XrwRfrOp297aIYspIti66k56v16ZnqHvrIM7mG+HjDlAwS7p+Srr7J6fGvEdOJ5JcQ/D9T7HhtdXDTzA==",
            "dev": true,
            "license": "MIT",
            "dependencies": {
                "esbuild": "^0.24.2",
-                "postcss": "^8.5.1",
+                "postcss": "^8.5.2",
                "rollup": "^4.30.1"
            },
            "bin": {
--- a/resources/assets/v1/src/locales/it.json
+++ b/resources/assets/v1/src/locales/it.json
@@ -172,8 +172,8 @@
    },
    "list": {
        "title": "Titolo",
-        "active": "Attivo",
-        "native_currency": "Native currency",
+        "active": "\u00c8 attivo?",
+        "native_currency": "Valuta nativa",
        "trigger": "Trigger",
        "response": "Risposta",
        "delivery": "Consegna",