Merge pull request #10075 from firefly-iii/release-1743484026

🤖 Automatically merge the PR into the develop branch.

.ci/php-cs-fixer/composer.lock

@@ -406,16 +406,16 @@
         },
         {
             "name": "friendsofphp/php-cs-fixer",
-            "version": "v3.74.0",
+            "version": "v3.75.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
-                "reference": "6b7cb12a6cf592fd9a2b46a2d5d4c3b44003973d"
+                "reference": "399a128ff2fdaf4281e4e79b755693286cdf325c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/6b7cb12a6cf592fd9a2b46a2d5d4c3b44003973d",
-                "reference": "6b7cb12a6cf592fd9a2b46a2d5d4c3b44003973d",
+                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/399a128ff2fdaf4281e4e79b755693286cdf325c",
+                "reference": "399a128ff2fdaf4281e4e79b755693286cdf325c",
                 "shasum": ""
             },
             "require": {
@@ -498,7 +498,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.74.0"
+                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.75.0"
             },
             "funding": [
                 {
@@ -506,7 +506,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-03-27T22:31:30+00:00"
+            "time": "2025-03-31T18:40:42+00:00"
         },
         {
             "name": "psr/container",

app/Notifications/Admin/UnknownUserLoginAttempt.php

@@ -112,11 +112,12 @@ class UnknownUserLoginAttempt extends Notification
      */
     public function via(OwnerNotifiable $notifiable): array
     {
-        $channels = ReturnsAvailableChannels::returnChannels('owner');
-        $isDemoSite  = FireflyConfig::get('is_demo_site');
-        if(true === $isDemoSite) {
+        $channels   = ReturnsAvailableChannels::returnChannels('owner');
+        $isDemoSite = FireflyConfig::get('is_demo_site');
+        if (true === $isDemoSite) {
             return array_diff($channels, ['mail']);
         }
+
         return $channels;
     }
 }

app/Notifications/Security/UserFailedLoginAttempt.php

@@ -104,11 +104,12 @@ class UserFailedLoginAttempt extends Notification
      */
     public function via(User $notifiable): array
     {
-        $channels = ReturnsAvailableChannels::returnChannels('user', $notifiable);
-        $isDemoSite  = FireflyConfig::get('is_demo_site');
-        if(true === $isDemoSite) {
+        $channels   = ReturnsAvailableChannels::returnChannels('user', $notifiable);
+        $isDemoSite = FireflyConfig::get('is_demo_site');
+        if (true === $isDemoSite) {
             return array_diff($channels, ['mail']);
         }
+
         return $channels;
     }
 }

app/Notifications/Test/OwnerTestNotificationEmail.php

@@ -64,10 +64,11 @@ class OwnerTestNotificationEmail extends Notification
      */
     public function via(OwnerNotifiable $notifiable): array
     {
-        $isDemoSite  = FireflyConfig::get('is_demo_site');
-        if(true === $isDemoSite) {
+        $isDemoSite = FireflyConfig::get('is_demo_site');
+        if (true === $isDemoSite) {
             return [];
         }
+
         return ['mail'];
     }
 }

app/Notifications/Test/UserTestNotificationEmail.php

@@ -61,10 +61,11 @@ class UserTestNotificationEmail extends Notification
      */
     public function via(User $notifiable): array
     {
-        $isDemoSite  = FireflyConfig::get('is_demo_site');
-        if(true === $isDemoSite) {
+        $isDemoSite = FireflyConfig::get('is_demo_site');
+        if (true === $isDemoSite) {
             return [];
         }
+
         return ['mail'];
     }
 }

app/Notifications/User/NewAccessToken.php

@@ -102,11 +102,12 @@ class NewAccessToken extends Notification
      */
     public function via(User $notifiable): array
     {
-        $channels = ReturnsAvailableChannels::returnChannels('user', $notifiable);
-        $isDemoSite  = FireflyConfig::get('is_demo_site');
-        if(true === $isDemoSite) {
+        $channels   = ReturnsAvailableChannels::returnChannels('user', $notifiable);
+        $isDemoSite = FireflyConfig::get('is_demo_site');
+        if (true === $isDemoSite) {
             return array_diff($channels, ['mail']);
         }
+
         return $channels;
     }
 }

composer.lock

@@ -12828,7 +12828,7 @@
     ],
     "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": [],
+    "stability-flags": {},
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
@@ -12849,6 +12849,6 @@
         "ext-xml": "*",
         "ext-xmlwriter": "*"
     },
-    "platform-dev": [],
-    "plugin-api-version": "2.3.0"
+    "platform-dev": {},
+    "plugin-api-version": "2.6.0"
 }

config/firefly.php

@@ -78,7 +78,7 @@ return [
         'running_balance_column' => env('USE_RUNNING_BALANCE', false),
         // see cer.php for exchange rates feature flag.
     ],
-    'version'                      => 'develop/2025-03-31',
+    'version'                      => 'develop/2025-04-01',
     'api_version'                  => '2.1.0', // field is no longer used.
     'db_version'                   => 25,
 

package-lock.json

@@ -3209,9 +3209,9 @@
             "license": "MIT"
         },
         "node_modules/@types/ws": {
-            "version": "8.18.0",
-            "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.18.0.tgz",
-            "integrity": "sha512-8svvI3hMyvN0kKCJMvTJP/x6Y/EoQbepff882wL+Sn5QsXb3etnamgrJq4isrBxSJj5L2AuXcI0+bgkoAXGUJw==",
+            "version": "8.18.1",
+            "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.18.1.tgz",
+            "integrity": "sha512-ThVF6DCVhA8kUGy+aazFQ4kXQ7E1Ty7A3ypFOe0IcJV8O/M511G99AW24irKrW56Wt44yG9+ij8FaqoBGkuBXg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -5635,9 +5635,9 @@
             "license": "MIT"
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.5.128",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.128.tgz",
-            "integrity": "sha512-bo1A4HH/NS522Ws0QNFIzyPcyUUNV/yyy70Ho1xqfGYzPUme2F/xr4tlEOuM6/A538U1vDA7a4XfCd1CKRegKQ==",
+            "version": "1.5.129",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.129.tgz",
+            "integrity": "sha512-JlXUemX4s0+9f8mLqib/bHH8gOHf5elKS6KeWG3sk3xozb/JTq/RLXIv8OKUWiK4Ah00Wm88EFj5PYkFr4RUPA==",
             "dev": true,
             "license": "ISC"
         },
@@ -10083,9 +10083,9 @@
             "license": "MIT"
         },
         "node_modules/sass": {
-            "version": "1.86.0",
-            "resolved": "https://registry.npmjs.org/sass/-/sass-1.86.0.tgz",
-            "integrity": "sha512-zV8vGUld/+mP4KbMLJMX7TyGCuUp7hnkOScgCMsWuHtns8CWBoz+vmEhoGMXsaJrbUP8gj+F1dLvVe79sK8UdA==",
+            "version": "1.86.1",
+            "resolved": "https://registry.npmjs.org/sass/-/sass-1.86.1.tgz",
+            "integrity": "sha512-Yaok4XELL1L9Im/ZUClKu//D2OP1rOljKj0Gf34a+GzLbMveOzL7CfqYo+JUa5Xt1nhTCW+OcKp/FtR7/iqj1w==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -11304,9 +11304,9 @@
             }
         },
         "node_modules/vite": {
-            "version": "6.2.3",
-            "resolved": "https://registry.npmjs.org/vite/-/vite-6.2.3.tgz",
-            "integrity": "sha512-IzwM54g4y9JA/xAeBPNaDXiBF8Jsgl3VBQ2YQ/wOY6fyW3xMdSoltIV3Bo59DErdqdE6RxUfv8W69DvUorE4Eg==",
+            "version": "6.2.4",
+            "resolved": "https://registry.npmjs.org/vite/-/vite-6.2.4.tgz",
+            "integrity": "sha512-veHMSew8CcRzhL5o8ONjy8gkfmFJAd5Ac16oxBUjlwgX3Gq2Wqr+qNC3TjPIpy7TPV/KporLga5GT9HqdrCizw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {

resources/assets/v1/src/locales/es.json

@@ -46,7 +46,7 @@
         "tags": "Etiquetas",
         "no_budget": "(sin presupuesto)",
         "no_bill": "(no subscription)",
-        "category": "Categoria",
+        "category": "Categor\u00eda",
         "attachments": "Archivos adjuntos",
         "notes": "Notas",
         "external_url": "URL externa",