Merge pull request #10917 from firefly-iii/release-1758048927

🤖 Automatically merge the PR into the develop branch.
2025-10-12 15:35:15 +00:00 · 2025-09-16 20:55:35 +02:00
parent 090aecb5f5 6a7c35e7bc
commit 956d4e09c3
5 changed files with 111 additions and 37 deletions
--- a/app/Console/Commands/Correction/RemovesLinksToDeletedObjects.php
+++ b/app/Console/Commands/Correction/RemovesLinksToDeletedObjects.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /*
 * RemovesLinksToDeletedObjects.php
 * Copyright (c) 2025 james@firefly-iii.org
@@ -50,7 +52,7 @@ class RemovesLinksToDeletedObjects extends Command
    /**
     * Execute the console command.
     */
-    public function handle()
+    public function handle(): void
    {
        $deletedTags       = Tag::withTrashed()->whereNotNull('deleted_at')->get('tags.id')->pluck('id')->toArray();
        $deletedJournals   = TransactionJournal::withTrashed()->whereNotNull('deleted_at')->get('transaction_journals.id')->pluck('id')->toArray();
--- a/composer.lock
+++ b/composer.lock
@@ -324,16 +324,16 @@
        },
        {
            "name": "dasprid/enum",
-            "version": "1.0.6",
+            "version": "1.0.7",
            "source": {
                "type": "git",
                "url": "https://github.com/DASPRiD/Enum.git",
-                "reference": "8dfd07c6d2cf31c8da90c53b83c026c7696dda90"
+                "reference": "b5874fa9ed0043116c72162ec7f4fb50e02e7cce"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/DASPRiD/Enum/zipball/8dfd07c6d2cf31c8da90c53b83c026c7696dda90",
-                "reference": "8dfd07c6d2cf31c8da90c53b83c026c7696dda90",
+                "url": "https://api.github.com/repos/DASPRiD/Enum/zipball/b5874fa9ed0043116c72162ec7f4fb50e02e7cce",
+                "reference": "b5874fa9ed0043116c72162ec7f4fb50e02e7cce",
                "shasum": ""
            },
            "require": {
@@ -368,9 +368,9 @@
            ],
            "support": {
                "issues": "https://github.com/DASPRiD/Enum/issues",
-                "source": "https://github.com/DASPRiD/Enum/tree/1.0.6"
+                "source": "https://github.com/DASPRiD/Enum/tree/1.0.7"
            },
-            "time": "2024-08-09T14:30:48+00:00"
+            "time": "2025-09-16T12:23:56+00:00"
        },
        {
            "name": "defuse/php-encryption",
@@ -1878,16 +1878,16 @@
        },
        {
            "name": "laravel/framework",
-            "version": "v12.28.1",
+            "version": "v12.29.0",
            "source": {
                "type": "git",
                "url": "https://github.com/laravel/framework.git",
-                "reference": "868c1f2d3dba4df6d21e3a8d818479f094cfd942"
+                "reference": "a9e4c73086f5ba38383e9c1d74b84fe46aac730b"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/868c1f2d3dba4df6d21e3a8d818479f094cfd942",
-                "reference": "868c1f2d3dba4df6d21e3a8d818479f094cfd942",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/a9e4c73086f5ba38383e9c1d74b84fe46aac730b",
+                "reference": "a9e4c73086f5ba38383e9c1d74b84fe46aac730b",
                "shasum": ""
            },
            "require": {
@@ -1915,6 +1915,7 @@
                "monolog/monolog": "^3.0",
                "nesbot/carbon": "^3.8.4",
                "nunomaduro/termwind": "^2.0",
+                "phiki/phiki": "v2.0.0",
                "php": "^8.2",
                "psr/container": "^1.1.1|^2.0.1",
                "psr/log": "^1.0|^2.0|^3.0",
@@ -2024,7 +2025,7 @@
                "ext-pdo": "Required to use all database features.",
                "ext-posix": "Required to use all features of the queue worker.",
                "ext-redis": "Required to use the Redis cache and queue drivers (^4.0|^5.0|^6.0).",
-                "fakerphp/faker": "Required to use the eloquent factory builder (^1.9.1).",
+                "fakerphp/faker": "Required to generate fake data using the fake() helper (^1.23).",
                "filp/whoops": "Required for friendly error pages in development (^2.14.3).",
                "laravel/tinker": "Required to use the tinker console command (^2.0).",
                "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (^3.25.1).",
@@ -2093,7 +2094,7 @@
                "issues": "https://github.com/laravel/framework/issues",
                "source": "https://github.com/laravel/framework"
            },
-            "time": "2025-09-04T14:58:12+00:00"
+            "time": "2025-09-16T14:15:03+00:00"
        },
        {
            "name": "laravel/passport",
@@ -4349,6 +4350,77 @@
            },
            "time": "2020-10-15T08:29:30+00:00"
        },
+        {
+            "name": "phiki/phiki",
+            "version": "v2.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phikiphp/phiki.git",
+                "reference": "461f6dd7e91dc3a95463b42f549ac7d0aab4702f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phikiphp/phiki/zipball/461f6dd7e91dc3a95463b42f549ac7d0aab4702f",
+                "reference": "461f6dd7e91dc3a95463b42f549ac7d0aab4702f",
+                "shasum": ""
+            },
+            "require": {
+                "ext-mbstring": "*",
+                "league/commonmark": "^2.5.3",
+                "php": "^8.2",
+                "psr/simple-cache": "^3.0"
+            },
+            "require-dev": {
+                "illuminate/support": "^11.45",
+                "laravel/pint": "^1.18.1",
+                "orchestra/testbench": "^9.15",
+                "pestphp/pest": "^3.5.1",
+                "phpstan/extension-installer": "^1.4.3",
+                "phpstan/phpstan": "^2.0",
+                "symfony/var-dumper": "^7.1.6"
+            },
+            "type": "library",
+            "extra": {
+                "laravel": {
+                    "providers": [
+                        "Phiki\\Adapters\\Laravel\\PhikiServiceProvider"
+                    ]
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Phiki\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Ryan Chandler",
+                    "email": "support@ryangjchandler.co.uk",
+                    "homepage": "https://ryangjchandler.co.uk",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Syntax highlighting using TextMate grammars in PHP.",
+            "support": {
+                "issues": "https://github.com/phikiphp/phiki/issues",
+                "source": "https://github.com/phikiphp/phiki/tree/v2.0.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sponsors/ryangjchandler",
+                    "type": "github"
+                },
+                {
+                    "url": "https://buymeacoffee.com/ryangjchandler",
+                    "type": "other"
+                }
+            ],
+            "time": "2025-08-28T18:20:27+00:00"
+        },
        {
            "name": "php-http/client-common",
            "version": "2.7.2",
@@ -11332,16 +11404,16 @@
        },
        {
            "name": "phpstan/phpstan",
-            "version": "2.1.25",
+            "version": "2.1.26",
            "source": {
                "type": "git",
                "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "4087d28bd252895874e174d65e26b2c202ed893a"
+                "reference": "b13345001a8553ec405b7741be0c6b8d7f8b5bf5"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/4087d28bd252895874e174d65e26b2c202ed893a",
-                "reference": "4087d28bd252895874e174d65e26b2c202ed893a",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/b13345001a8553ec405b7741be0c6b8d7f8b5bf5",
+                "reference": "b13345001a8553ec405b7741be0c6b8d7f8b5bf5",
                "shasum": ""
            },
            "require": {
@@ -11386,7 +11458,7 @@
                    "type": "github"
                }
            ],
-            "time": "2025-09-12T14:26:42+00:00"
+            "time": "2025-09-16T11:33:46+00:00"
        },
        {
            "name": "phpstan/phpstan-deprecation-rules",
--- 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-09-15',
-    'build_time'                   => 1757957039,
+    'version'                      => 'develop/2025-09-16',
+    'build_time'                   => 1758048808,
    'api_version'                  => '2.1.0', // field is no longer used.
    'db_version'                   => 26,

--- a/package-lock.json
+++ b/package-lock.json
@@ -3159,13 +3159,13 @@
            "license": "MIT"
        },
        "node_modules/@types/node": {
-            "version": "24.4.0",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-24.4.0.tgz",
-            "integrity": "sha512-gUuVEAK4/u6F9wRLznPUU4WGUacSEBDPoC2TrBkw3GAnOLHBL45QdfHOXp1kJ4ypBGLxTOB+t7NJLpKoC3gznQ==",
+            "version": "24.5.0",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-24.5.0.tgz",
+            "integrity": "sha512-y1dMvuvJspJiPSDZUQ+WMBvF7dpnEqN4x9DDC9ie5Fs/HUZJA3wFp7EhHoVaKX/iI0cRoECV8X2jL8zi0xrHCg==",
            "dev": true,
            "license": "MIT",
            "dependencies": {
-                "undici-types": "~7.11.0"
+                "undici-types": "~7.12.0"
            }
        },
        "node_modules/@types/node-forge": {
@@ -4347,9 +4347,9 @@
            }
        },
        "node_modules/browserslist": {
-            "version": "4.26.0",
-            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.26.0.tgz",
-            "integrity": "sha512-P9go2WrP9FiPwLv3zqRD/Uoxo0RSHjzFCiQz7d4vbmwNqQFo9T9WCeP/Qn5EbcKQY6DBbkxEXNcpJOmncNrb7A==",
+            "version": "4.26.2",
+            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.26.2.tgz",
+            "integrity": "sha512-ECFzp6uFOSB+dcZ5BK/IBaGWssbSYBHvuMeMt3MMFyhI0Z8SqGgEkBLARgpRH3hutIgPVsALcMwbDrJqPxQ65A==",
            "dev": true,
            "funding": [
                {
@@ -4367,7 +4367,7 @@
            ],
            "license": "MIT",
            "dependencies": {
-                "baseline-browser-mapping": "^2.8.2",
+                "baseline-browser-mapping": "^2.8.3",
                "caniuse-lite": "^1.0.30001741",
                "electron-to-chromium": "^1.5.218",
                "node-releases": "^2.0.21",
@@ -4508,9 +4508,9 @@
            }
        },
        "node_modules/caniuse-lite": {
-            "version": "1.0.30001741",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001741.tgz",
-            "integrity": "sha512-QGUGitqsc8ARjLdgAfxETDhRbJ0REsP6O3I96TAth/mVjh2cYzN2u+3AzPP3aVSm2FehEItaJw1xd+IGBXWeSw==",
+            "version": "1.0.30001743",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001743.tgz",
+            "integrity": "sha512-e6Ojr7RV14Un7dz6ASD0aZDmQPT/A+eZU+nuTNfjqmRrmkmQlnTNWH0SKmqagx9PeW87UVqapSurtAXifmtdmw==",
            "dev": true,
            "funding": [
                {
@@ -11357,9 +11357,9 @@
            }
        },
        "node_modules/undici-types": {
-            "version": "7.11.0",
-            "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.11.0.tgz",
-            "integrity": "sha512-kt1ZriHTi7MU+Z/r9DOdAI3ONdaR3M3csEaRc6ewa4f4dTvX4cQCbJ4NkEn0ohE4hHtq85+PhPSTY+pO/1PwgA==",
+            "version": "7.12.0",
+            "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.12.0.tgz",
+            "integrity": "sha512-goOacqME2GYyOZZfb5Lgtu+1IDmAlAEu5xnD3+xTzS10hT0vzpf0SPjkXwAw9Jm+4n/mQGDP3LO8CPbYROeBfQ==",
            "dev": true,
            "license": "MIT"
        },
--- a/resources/assets/v1/src/locales/it.json
+++ b/resources/assets/v1/src/locales/it.json
@@ -160,7 +160,7 @@
        "url": "URL",
        "active": "Attivo",
        "interest_date": "Data di valuta",
-        "administration_currency": "Primary currency",
+        "administration_currency": "Valuta primaria",
        "title": "Titolo",
        "date": "Data",
        "book_date": "Data contabile",
@@ -180,7 +180,7 @@
    "list": {
        "title": "Titolo",
        "active": "\u00c8 attivo?",
-        "primary_currency": "Primary currency",
+        "primary_currency": "Valuta primaria",
        "trigger": "Trigger",
        "response": "Risposta",
        "delivery": "Consegna",