Merge branch 'release/5.7.9'

Sloppy requirement would push Symfony to PHP 8.1.
Merge branch 'release/5.7.8'
2025-08-24 05:57:36 +00:00 · 2022-05-31 06:17:35 +02:00 · 2022-05-31 06:17:16 +02:00 · 2022-05-31 06:13:18 +02:00 · 2022-05-31 06:13:18 +02:00 · 2022-05-31 06:12:56 +02:00
21 changed files with 543 additions and 510 deletions
--- a/.github/workflows/depsreview.yaml
+++ b/.github/workflows/depsreview.yaml
@@ -0,0 +1,14 @@
+name: 'Dependency Review'
+on: [pull_request]
+
+permissions:
+  contents: read
+
+jobs:
+  dependency-review:
+    runs-on: ubuntu-latest
+    steps:
+      - name: 'Checkout Repository'
+        uses: actions/checkout@v3
+      - name: 'Dependency Review'
+        uses: actions/dependency-review-action@v1
--- a/app/Handlers/Events/UserEventHandler.php
+++ b/app/Handlers/Events/UserEventHandler.php
@@ -338,6 +338,12 @@ class UserEventHandler
        Log::debug('Now in storeUserIPAddress');
        $user = $event->user;
        /** @var array $preference */
+
+        if($user->hasRole('demo')) {
+            Log::debug('Do not log demo user logins');
+            return;
+        }
+
        try {
            $preference = app('preferences')->getForUser($user, 'login_ip_history', [])->data;
        } catch (FireflyException $e) {
--- a/app/Support/Steam.php
+++ b/app/Support/Steam.php
@@ -99,7 +99,9 @@ class Steam
        $sum = '0';
        /** @var array $transaction */
        foreach ($transactions as $transaction) {
-            $sum = bcadd($sum, $transaction[$key] ?? '0');
+            $value = (string) ($transaction[$key] ?? '0');
+            $value = '' === $value ? '0' : $value;
+            $sum   = bcadd($sum, $value);
        }

        return $sum;
--- a/changelog.md
+++ b/changelog.md
@@ -2,6 +2,26 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).

+## 5.7.9 - 2022-06-01
+
+### Fixed
+- Symfony 6.1 requires PHP 8.1, so back to 6.0 for the time being.
+
+## 5.7.8 - 2022-06-01
+
+### Fixed
+- Symfony 6.1 requires PHP 8.1, so back to 6.0 for the time being.
+
+## 5.7.7 - 2022-06-01
+
+### Fixed
+- Fixed an issue where the login form would overflow a database field.
+- [Issue 6113](https://github.com/firefly-iii/firefly-iii/issues/6113) Fix issue with number formatting.
+- [Issue 5996](https://github.com/firefly-iii/firefly-iii/issues/5996) Catch bad library
+
+### Added
+- @turrisxyz added a dependency review, thanks!
+
 ## 5.7.6 - 2022-05-19

 ### Fixed
--- a/composer.json
+++ b/composer.json
@@ -203,6 +203,9 @@
    ]
  },
  "config": {
+    "platform": {
+      "php": "8.0.19"
+    },
    "preferred-install": "dist",
    "sort-packages": true,
    "optimize-autoloader": true,
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
        "This file is @generated automatically"
    ],
-    "content-hash": "3e2b5b26154ac5fa507410856ceef4b9",
+    "content-hash": "48fa72f0e1f3b7e9ee36832e5bea685c",
    "packages": [
        {
            "name": "bacon/bacon-qr-code",
@@ -381,16 +381,16 @@
        },
        {
            "name": "doctrine/cache",
-            "version": "2.1.1",
+            "version": "2.2.0",
            "source": {
                "type": "git",
                "url": "https://github.com/doctrine/cache.git",
-                "reference": "331b4d5dbaeab3827976273e9356b3b453c300ce"
+                "reference": "1ca8f21980e770095a31456042471a57bc4c68fb"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/cache/zipball/331b4d5dbaeab3827976273e9356b3b453c300ce",
-                "reference": "331b4d5dbaeab3827976273e9356b3b453c300ce",
+                "url": "https://api.github.com/repos/doctrine/cache/zipball/1ca8f21980e770095a31456042471a57bc4c68fb",
+                "reference": "1ca8f21980e770095a31456042471a57bc4c68fb",
                "shasum": ""
            },
            "require": {
@@ -400,18 +400,12 @@
                "doctrine/common": ">2.2,<2.4"
            },
            "require-dev": {
-                "alcaeus/mongo-php-adapter": "^1.1",
                "cache/integration-tests": "dev-master",
-                "doctrine/coding-standard": "^8.0",
-                "mongodb/mongodb": "^1.1",
-                "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0",
-                "predis/predis": "~1.0",
+                "doctrine/coding-standard": "^9",
+                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
                "psr/cache": "^1.0 || ^2.0 || ^3.0",
-                "symfony/cache": "^4.4 || ^5.2 || ^6.0@dev",
-                "symfony/var-exporter": "^4.4 || ^5.2 || ^6.0@dev"
-            },
-            "suggest": {
-                "alcaeus/mongo-php-adapter": "Required to use legacy MongoDB driver"
+                "symfony/cache": "^4.4 || ^5.4 || ^6",
+                "symfony/var-exporter": "^4.4 || ^5.4 || ^6"
            },
            "type": "library",
            "autoload": {
@@ -460,7 +454,7 @@
            ],
            "support": {
                "issues": "https://github.com/doctrine/cache/issues",
-                "source": "https://github.com/doctrine/cache/tree/2.1.1"
+                "source": "https://github.com/doctrine/cache/tree/2.2.0"
            },
            "funding": [
                {
@@ -476,7 +470,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2021-07-17T14:49:29+00:00"
+            "time": "2022-05-20T20:07:39+00:00"
        },
        {
            "name": "doctrine/dbal",
@@ -956,16 +950,16 @@
        },
        {
            "name": "egulias/email-validator",
-            "version": "3.1.2",
+            "version": "3.2",
            "source": {
                "type": "git",
                "url": "https://github.com/egulias/EmailValidator.git",
-                "reference": "ee0db30118f661fb166bcffbf5d82032df484697"
+                "reference": "a5ed8d58ed0c340a7c2109f587951b1c84cf6286"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/ee0db30118f661fb166bcffbf5d82032df484697",
-                "reference": "ee0db30118f661fb166bcffbf5d82032df484697",
+                "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/a5ed8d58ed0c340a7c2109f587951b1c84cf6286",
+                "reference": "a5ed8d58ed0c340a7c2109f587951b1c84cf6286",
                "shasum": ""
            },
            "require": {
@@ -1012,7 +1006,7 @@
            ],
            "support": {
                "issues": "https://github.com/egulias/EmailValidator/issues",
-                "source": "https://github.com/egulias/EmailValidator/tree/3.1.2"
+                "source": "https://github.com/egulias/EmailValidator/tree/3.2"
            },
            "funding": [
                {
@@ -1020,7 +1014,7 @@
                    "type": "github"
                }
            ],
-            "time": "2021-10-11T09:18:27+00:00"
+            "time": "2022-05-28T22:19:18+00:00"
        },
        {
            "name": "facade/ignition-contracts",
@@ -1382,16 +1376,16 @@
        },
        {
            "name": "guzzlehttp/guzzle",
-            "version": "7.4.2",
+            "version": "7.4.3",
            "source": {
                "type": "git",
                "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "ac1ec1cd9b5624694c3a40be801d94137afb12b4"
+                "reference": "74a8602c6faec9ef74b7a9391ac82c5e65b1cdab"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/ac1ec1cd9b5624694c3a40be801d94137afb12b4",
-                "reference": "ac1ec1cd9b5624694c3a40be801d94137afb12b4",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/74a8602c6faec9ef74b7a9391ac82c5e65b1cdab",
+                "reference": "74a8602c6faec9ef74b7a9391ac82c5e65b1cdab",
                "shasum": ""
            },
            "require": {
@@ -1486,7 +1480,7 @@
            ],
            "support": {
                "issues": "https://github.com/guzzle/guzzle/issues",
-                "source": "https://github.com/guzzle/guzzle/tree/7.4.2"
+                "source": "https://github.com/guzzle/guzzle/tree/7.4.3"
            },
            "funding": [
                {
@@ -1502,7 +1496,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-03-20T14:16:28+00:00"
+            "time": "2022-05-25T13:24:33+00:00"
        },
        {
            "name": "guzzlehttp/promises",
@@ -1860,16 +1854,16 @@
        },
        {
            "name": "laravel/framework",
-            "version": "v9.13.0",
+            "version": "v9.14.1",
            "source": {
                "type": "git",
                "url": "https://github.com/laravel/framework.git",
-                "reference": "87b6cc8bc41d1cf85c7c1401cddde8570a3b95bb"
+                "reference": "2ca86f96118635a79ee3389013ccab110ae14bea"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/87b6cc8bc41d1cf85c7c1401cddde8570a3b95bb",
-                "reference": "87b6cc8bc41d1cf85c7c1401cddde8570a3b95bb",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/2ca86f96118635a79ee3389013ccab110ae14bea",
+                "reference": "2ca86f96118635a79ee3389013ccab110ae14bea",
                "shasum": ""
            },
            "require": {
@@ -2035,7 +2029,7 @@
                "issues": "https://github.com/laravel/framework/issues",
                "source": "https://github.com/laravel/framework"
            },
-            "time": "2022-05-17T14:07:43+00:00"
+            "time": "2022-05-25T18:18:07+00:00"
        },
        {
            "name": "laravel/passport",
@@ -2240,16 +2234,16 @@
        },
        {
            "name": "laravel/ui",
-            "version": "v3.4.5",
+            "version": "v3.4.6",
            "source": {
                "type": "git",
                "url": "https://github.com/laravel/ui.git",
-                "reference": "f11d295de1508c5bb56206a620b00b6616de414c"
+                "reference": "65ec5c03f7fee2c8ecae785795b829a15be48c2c"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/ui/zipball/f11d295de1508c5bb56206a620b00b6616de414c",
-                "reference": "f11d295de1508c5bb56206a620b00b6616de414c",
+                "url": "https://api.github.com/repos/laravel/ui/zipball/65ec5c03f7fee2c8ecae785795b829a15be48c2c",
+                "reference": "65ec5c03f7fee2c8ecae785795b829a15be48c2c",
                "shasum": ""
            },
            "require": {
@@ -2295,9 +2289,9 @@
                "ui"
            ],
            "support": {
-                "source": "https://github.com/laravel/ui/tree/v3.4.5"
+                "source": "https://github.com/laravel/ui/tree/v3.4.6"
            },
-            "time": "2022-02-21T14:59:16+00:00"
+            "time": "2022-05-20T13:38:08+00:00"
        },
        {
            "name": "laravelcollective/html",
@@ -2834,16 +2828,16 @@
        },
        {
            "name": "league/flysystem",
-            "version": "3.0.19",
+            "version": "3.0.20",
            "source": {
                "type": "git",
                "url": "https://github.com/thephpleague/flysystem.git",
-                "reference": "670df21225d68d165a8df38587ac3f41caf608f8"
+                "reference": "42a2f47dcf39944e2aee1b660ee55ab6ef69b535"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/670df21225d68d165a8df38587ac3f41caf608f8",
-                "reference": "670df21225d68d165a8df38587ac3f41caf608f8",
+                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/42a2f47dcf39944e2aee1b660ee55ab6ef69b535",
+                "reference": "42a2f47dcf39944e2aee1b660ee55ab6ef69b535",
                "shasum": ""
            },
            "require": {
@@ -2904,7 +2898,7 @@
            ],
            "support": {
                "issues": "https://github.com/thephpleague/flysystem/issues",
-                "source": "https://github.com/thephpleague/flysystem/tree/3.0.19"
+                "source": "https://github.com/thephpleague/flysystem/tree/3.0.20"
            },
            "funding": [
                {
@@ -2920,7 +2914,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-05-03T21:19:02+00:00"
+            "time": "2022-05-25T19:18:39+00:00"
        },
        {
            "name": "league/fractal",
@@ -3138,33 +3132,35 @@
        },
        {
            "name": "league/uri",
-            "version": "6.5.0",
+            "version": "6.6.0",
            "source": {
                "type": "git",
                "url": "https://github.com/thephpleague/uri.git",
-                "reference": "c68ca445abb04817d740ddd6d0b3551826ef0c5a"
+                "reference": "4147f19b9de3b5af6a258f35d7a0efbbf9963298"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/uri/zipball/c68ca445abb04817d740ddd6d0b3551826ef0c5a",
-                "reference": "c68ca445abb04817d740ddd6d0b3551826ef0c5a",
+                "url": "https://api.github.com/repos/thephpleague/uri/zipball/4147f19b9de3b5af6a258f35d7a0efbbf9963298",
+                "reference": "4147f19b9de3b5af6a258f35d7a0efbbf9963298",
                "shasum": ""
            },
            "require": {
                "ext-json": "*",
                "league/uri-interfaces": "^2.3",
-                "php": "^7.3 || ^8.0",
+                "php": "^7.4 || ^8.0",
                "psr/http-message": "^1.0"
            },
            "conflict": {
                "league/uri-schemes": "^1.0"
            },
            "require-dev": {
-                "friendsofphp/php-cs-fixer": "^2.19 || ^3.0",
-                "phpstan/phpstan": "^0.12.90",
-                "phpstan/phpstan-phpunit": "^0.12.22",
-                "phpstan/phpstan-strict-rules": "^0.12.11",
-                "phpunit/phpunit": "^8.0 || ^9.0",
+                "friendsofphp/php-cs-fixer": "^v3.3.2",
+                "php-http/psr7-integration-tests": "^1.1",
+                "phpstan/phpstan": "^1.2.0",
+                "phpstan/phpstan-deprecation-rules": "^1.0",
+                "phpstan/phpstan-phpunit": "^1.0.0",
+                "phpstan/phpstan-strict-rules": "^1.1.0",
+                "phpunit/phpunit": "^9.5.10",
                "psr/http-factory": "^1.0"
            },
            "suggest": {
@@ -3196,7 +3192,7 @@
                }
            ],
            "description": "URI manipulation library",
-            "homepage": "http://uri.thephpleague.com",
+            "homepage": "https://uri.thephpleague.com",
            "keywords": [
                "data-uri",
                "file-uri",
@@ -3222,7 +3218,7 @@
                "docs": "https://uri.thephpleague.com",
                "forum": "https://thephpleague.slack.com",
                "issues": "https://github.com/thephpleague/uri/issues",
-                "source": "https://github.com/thephpleague/uri/tree/6.5.0"
+                "source": "https://github.com/thephpleague/uri/tree/6.6.0"
            },
            "funding": [
                {
@@ -3230,7 +3226,7 @@
                    "type": "github"
                }
            ],
-            "time": "2021-08-27T09:54:07+00:00"
+            "time": "2022-05-28T05:44:35+00:00"
        },
        {
            "name": "league/uri-interfaces",
@@ -5527,16 +5523,16 @@
        },
        {
            "name": "symfony/console",
-            "version": "v6.0.8",
+            "version": "v6.0.9",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/console.git",
-                "reference": "0d00aa289215353aa8746a31d101f8e60826285c"
+                "reference": "9b190bc7a19d19add1dbb3382721973836e59b50"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/0d00aa289215353aa8746a31d101f8e60826285c",
-                "reference": "0d00aa289215353aa8746a31d101f8e60826285c",
+                "url": "https://api.github.com/repos/symfony/console/zipball/9b190bc7a19d19add1dbb3382721973836e59b50",
+                "reference": "9b190bc7a19d19add1dbb3382721973836e59b50",
                "shasum": ""
            },
            "require": {
@@ -5602,7 +5598,7 @@
                "terminal"
            ],
            "support": {
-                "source": "https://github.com/symfony/console/tree/v6.0.8"
+                "source": "https://github.com/symfony/console/tree/v6.0.9"
            },
            "funding": [
                {
@@ -5618,7 +5614,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-04-20T15:01:42+00:00"
+            "time": "2022-05-27T06:40:13+00:00"
        },
        {
            "name": "symfony/css-selector",
@@ -5754,16 +5750,16 @@
        },
        {
            "name": "symfony/error-handler",
-            "version": "v6.0.8",
+            "version": "v6.0.9",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/error-handler.git",
-                "reference": "5e2795163acbd13b3cd46835c9f8f6c5d0a3a280"
+                "reference": "732ca203b3222cde3378d5ddf5e2883211acc53e"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/error-handler/zipball/5e2795163acbd13b3cd46835c9f8f6c5d0a3a280",
-                "reference": "5e2795163acbd13b3cd46835c9f8f6c5d0a3a280",
+                "url": "https://api.github.com/repos/symfony/error-handler/zipball/732ca203b3222cde3378d5ddf5e2883211acc53e",
+                "reference": "732ca203b3222cde3378d5ddf5e2883211acc53e",
                "shasum": ""
            },
            "require": {
@@ -5805,7 +5801,7 @@
            "description": "Provides tools to manage errors and ease debugging PHP code",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/error-handler/tree/v6.0.8"
+                "source": "https://github.com/symfony/error-handler/tree/v6.0.9"
            },
            "funding": [
                {
@@ -5821,20 +5817,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-04-12T16:11:42+00:00"
+            "time": "2022-05-23T10:32:42+00:00"
        },
        {
            "name": "symfony/event-dispatcher",
-            "version": "v6.0.3",
+            "version": "v6.0.9",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "6472ea2dd415e925b90ca82be64b8bc6157f3934"
+                "reference": "5c85b58422865d42c6eb46f7693339056db098a8"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/6472ea2dd415e925b90ca82be64b8bc6157f3934",
-                "reference": "6472ea2dd415e925b90ca82be64b8bc6157f3934",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/5c85b58422865d42c6eb46f7693339056db098a8",
+                "reference": "5c85b58422865d42c6eb46f7693339056db098a8",
                "shasum": ""
            },
            "require": {
@@ -5888,7 +5884,7 @@
            "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/event-dispatcher/tree/v6.0.3"
+                "source": "https://github.com/symfony/event-dispatcher/tree/v6.0.9"
            },
            "funding": [
                {
@@ -5904,7 +5900,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-01-02T09:55:41+00:00"
+            "time": "2022-05-05T16:45:52+00:00"
        },
        {
            "name": "symfony/event-dispatcher-contracts",
@@ -6048,16 +6044,16 @@
        },
        {
            "name": "symfony/http-client",
-            "version": "v6.0.8",
+            "version": "v6.0.9",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/http-client.git",
-                "reference": "d347895193283e08b4c3ebf2f2974a1df3e1f670"
+                "reference": "3c6fc53a3deed2d3c1825d41ad8b3f23a6b038b5"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-client/zipball/d347895193283e08b4c3ebf2f2974a1df3e1f670",
-                "reference": "d347895193283e08b4c3ebf2f2974a1df3e1f670",
+                "url": "https://api.github.com/repos/symfony/http-client/zipball/3c6fc53a3deed2d3c1825d41ad8b3f23a6b038b5",
+                "reference": "3c6fc53a3deed2d3c1825d41ad8b3f23a6b038b5",
                "shasum": ""
            },
            "require": {
@@ -6112,7 +6108,7 @@
            "description": "Provides powerful methods to fetch HTTP resources synchronously or asynchronously",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/http-client/tree/v6.0.8"
+                "source": "https://github.com/symfony/http-client/tree/v6.0.9"
            },
            "funding": [
                {
@@ -6128,7 +6124,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-04-12T16:11:42+00:00"
+            "time": "2022-05-21T13:33:31+00:00"
        },
        {
            "name": "symfony/http-client-contracts",
@@ -6210,16 +6206,16 @@
        },
        {
            "name": "symfony/http-foundation",
-            "version": "v6.0.8",
+            "version": "v6.0.9",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "c9c86b02d7ef6f44f3154acc7de42831518afe7c"
+                "reference": "05abe9aab47decfd793632787d0c6a25268e2a5b"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/c9c86b02d7ef6f44f3154acc7de42831518afe7c",
-                "reference": "c9c86b02d7ef6f44f3154acc7de42831518afe7c",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/05abe9aab47decfd793632787d0c6a25268e2a5b",
+                "reference": "05abe9aab47decfd793632787d0c6a25268e2a5b",
                "shasum": ""
            },
            "require": {
@@ -6262,7 +6258,7 @@
            "description": "Defines an object-oriented layer for the HTTP specification",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/http-foundation/tree/v6.0.8"
+                "source": "https://github.com/symfony/http-foundation/tree/v6.0.9"
            },
            "funding": [
                {
@@ -6278,20 +6274,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-04-22T08:18:02+00:00"
+            "time": "2022-05-21T13:33:31+00:00"
        },
        {
            "name": "symfony/http-kernel",
-            "version": "v6.0.8",
+            "version": "v6.0.9",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "7aaf1cdc9cc2ad47e926f624efcb679883a39ca7"
+                "reference": "e78407f2a7b683fd1269057aa39355d77ddbcff9"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/7aaf1cdc9cc2ad47e926f624efcb679883a39ca7",
-                "reference": "7aaf1cdc9cc2ad47e926f624efcb679883a39ca7",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/e78407f2a7b683fd1269057aa39355d77ddbcff9",
+                "reference": "e78407f2a7b683fd1269057aa39355d77ddbcff9",
                "shasum": ""
            },
            "require": {
@@ -6371,7 +6367,7 @@
            "description": "Provides a structured process for converting a Request into a Response",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/http-kernel/tree/v6.0.8"
+                "source": "https://github.com/symfony/http-kernel/tree/v6.0.9"
            },
            "funding": [
                {
@@ -6387,7 +6383,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-04-27T17:26:02+00:00"
+            "time": "2022-05-27T07:14:30+00:00"
        },
        {
            "name": "symfony/mailer",
@@ -6530,16 +6526,16 @@
        },
        {
            "name": "symfony/mime",
-            "version": "v6.0.8",
+            "version": "v6.0.9",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/mime.git",
-                "reference": "c1701e88ad0ca49fc6ad6cdf360bc0e1209fb5e1"
+                "reference": "e17bae63d437b3e21942dcc47ccca802d3573dd8"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mime/zipball/c1701e88ad0ca49fc6ad6cdf360bc0e1209fb5e1",
-                "reference": "c1701e88ad0ca49fc6ad6cdf360bc0e1209fb5e1",
+                "url": "https://api.github.com/repos/symfony/mime/zipball/e17bae63d437b3e21942dcc47ccca802d3573dd8",
+                "reference": "e17bae63d437b3e21942dcc47ccca802d3573dd8",
                "shasum": ""
            },
            "require": {
@@ -6591,7 +6587,7 @@
                "mime-type"
            ],
            "support": {
-                "source": "https://github.com/symfony/mime/tree/v6.0.8"
+                "source": "https://github.com/symfony/mime/tree/v6.0.9"
            },
            "funding": [
                {
@@ -6607,7 +6603,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-04-12T16:11:42+00:00"
+            "time": "2022-05-21T13:33:31+00:00"
        },
        {
            "name": "symfony/polyfill-ctype",
@@ -7585,16 +7581,16 @@
        },
        {
            "name": "symfony/string",
-            "version": "v6.0.8",
+            "version": "v6.0.9",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/string.git",
-                "reference": "ac0aa5c2282e0de624c175b68d13f2c8f2e2649d"
+                "reference": "df9f03d595aa2d446498ba92fe803a519b2c43cc"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/ac0aa5c2282e0de624c175b68d13f2c8f2e2649d",
-                "reference": "ac0aa5c2282e0de624c175b68d13f2c8f2e2649d",
+                "url": "https://api.github.com/repos/symfony/string/zipball/df9f03d595aa2d446498ba92fe803a519b2c43cc",
+                "reference": "df9f03d595aa2d446498ba92fe803a519b2c43cc",
                "shasum": ""
            },
            "require": {
@@ -7650,7 +7646,7 @@
                "utf8"
            ],
            "support": {
-                "source": "https://github.com/symfony/string/tree/v6.0.8"
+                "source": "https://github.com/symfony/string/tree/v6.0.9"
            },
            "funding": [
                {
@@ -7670,16 +7666,16 @@
        },
        {
            "name": "symfony/translation",
-            "version": "v6.0.8",
+            "version": "v6.0.9",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/translation.git",
-                "reference": "3d38cf8f8834148c4457681d539bc204de701501"
+                "reference": "9ba011309943955a3807b8236c17cff3b88f67b6"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/3d38cf8f8834148c4457681d539bc204de701501",
-                "reference": "3d38cf8f8834148c4457681d539bc204de701501",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/9ba011309943955a3807b8236c17cff3b88f67b6",
+                "reference": "9ba011309943955a3807b8236c17cff3b88f67b6",
                "shasum": ""
            },
            "require": {
@@ -7745,7 +7741,7 @@
            "description": "Provides tools to internationalize your application",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/translation/tree/v6.0.8"
+                "source": "https://github.com/symfony/translation/tree/v6.0.9"
            },
            "funding": [
                {
@@ -7761,7 +7757,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-04-22T08:18:02+00:00"
+            "time": "2022-05-06T14:27:17+00:00"
        },
        {
            "name": "symfony/translation-contracts",
@@ -7843,16 +7839,16 @@
        },
        {
            "name": "symfony/var-dumper",
-            "version": "v6.0.8",
+            "version": "v6.0.9",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "fa61dfb4bd3068df2492013dc65f3190e9f550c0"
+                "reference": "ac81072464221e73ee994d12f0b8a2af4a9ed798"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/fa61dfb4bd3068df2492013dc65f3190e9f550c0",
-                "reference": "fa61dfb4bd3068df2492013dc65f3190e9f550c0",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/ac81072464221e73ee994d12f0b8a2af4a9ed798",
+                "reference": "ac81072464221e73ee994d12f0b8a2af4a9ed798",
                "shasum": ""
            },
            "require": {
@@ -7911,7 +7907,7 @@
                "dump"
            ],
            "support": {
-                "source": "https://github.com/symfony/var-dumper/tree/v6.0.8"
+                "source": "https://github.com/symfony/var-dumper/tree/v6.0.9"
            },
            "funding": [
                {
@@ -7927,7 +7923,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-04-26T13:22:23+00:00"
+            "time": "2022-05-21T13:33:31+00:00"
        },
        {
            "name": "tijsverkoyen/css-to-inline-styles",
@@ -10662,5 +10658,8 @@
        "ext-xmlwriter": "*"
    },
    "platform-dev": [],
+    "platform-overrides": {
+        "php": "8.0.19"
+    },
    "plugin-api-version": "2.3.0"
 }
--- a/config/firefly.php
+++ b/config/firefly.php
@@ -101,7 +101,7 @@ return [
        'webhooks'     => false,
        'handle_debts' => true,
    ],
-    'version'                      => '5.7.6',
+    'version'                      => '5.7.9',
    'api_version'                  => '1.5.6',
    'db_version'                   => 18,

@@ -283,6 +283,12 @@ return [
        'application/vnd.oasis.opendocument.formula',
        'application/vnd.oasis.opendocument.database',
        'application/vnd.oasis.opendocument.image',
+
+        /* EML */
+        'message/rfc822',
+
+        /* JSON */
+        'application/json',
    ],
    'accountRoles'                 => ['defaultAsset', 'sharedAsset', 'savingAsset', 'ccAsset', 'cashWalletAsset'],
    'valid_liabilities'            => [AccountType::DEBT, AccountType::LOAN, AccountType::MORTGAGE],
--- a/config/mail.php
+++ b/config/mail.php
@@ -44,6 +44,7 @@ return [
            'username'   => env('MAIL_USERNAME'),
            'password'   => env('MAIL_PASSWORD'),
            'timeout'    => null,
+            'verify_peer' => null !== env('MAIL_ENCRYPTION')
        ],

        'ses' => [
--- a/frontend/src/i18n/el_GR/index.js
+++ b/frontend/src/i18n/el_GR/index.js
@@ -7,7 +7,7 @@ export default {
        "name": "\u038c\u03bd\u03bf\u03bc\u03b1",
        "amount_min": "\u0395\u03bb\u03ac\u03c7\u03b9\u03c3\u03c4\u03bf \u03c0\u03bf\u03c3\u03cc",
        "amount_max": "\u039c\u03ad\u03b3\u03b9\u03c3\u03c4\u03bf \u03c0\u03bf\u03c3\u03cc",
-        "url": "URL",
+        "url": "\u0394\u03b9\u03b5\u03cd\u03b8\u03c5\u03bd\u03c3\u03b7 URL",
        "title": "\u03a4\u03af\u03c4\u03bb\u03bf\u03c2",
        "first_date": "\u03a0\u03c1\u03ce\u03c4\u03b7 \u03b7\u03bc\u03b5\u03c1\u03bf\u03bc\u03b7\u03bd\u03af\u03b1",
        "repetitions": "\u0395\u03c0\u03b1\u03bd\u03b1\u03bb\u03ae\u03c8\u03b5\u03b9\u03c2",
@@ -18,26 +18,26 @@ export default {
    },
    "list": {
        "name": "\u038c\u03bd\u03bf\u03bc\u03b1",
-        "account_number": "Account number",
+        "account_number": "\u0391\u03c1\u03b9\u03b8\u03bc\u03cc\u03c2 \u03bb\u03bf\u03b3\u03b1\u03c1\u03b9\u03b1\u03c3\u03bc\u03bf\u03cd",
        "currentBalance": "\u03a4\u03c1\u03ad\u03c7\u03bf\u03bd \u03c5\u03c0\u03cc\u03bb\u03bf\u03b9\u03c0\u03bf",
        "lastActivity": "\u03a4\u03b5\u03bb\u03b5\u03c5\u03c4\u03b1\u03af\u03b1 \u03b4\u03c1\u03b1\u03c3\u03c4\u03b7\u03c1\u03b9\u03cc\u03c4\u03b7\u03c4\u03b1",
        "active": "\u0395\u03af\u03bd\u03b1\u03b9 \u03b5\u03bd\u03b5\u03c1\u03b3\u03cc;"
    },
    "breadcrumbs": {
        "placeholder": "[Placeholder]",
-        "budgets": "Budgets",
-        "subscriptions": "Subscriptions",
-        "transactions": "Transactions",
-        "title_expenses": "Expenses",
-        "title_withdrawal": "Expenses",
-        "title_revenue": "Revenue \/ income",
-        "title_deposit": "Revenue \/ income",
-        "title_transfer": "Transfers",
-        "title_transfers": "Transfers",
-        "asset_accounts": "Asset accounts",
-        "expense_accounts": "Expense accounts",
-        "revenue_accounts": "Revenue accounts",
-        "liabilities_accounts": "Liabilities"
+        "budgets": "\u03a0\u03c1\u03bf\u03cb\u03c0\u03bf\u03bb\u03bf\u03b3\u03b9\u03c3\u03bc\u03bf\u03af",
+        "subscriptions": "\u03a3\u03c5\u03bd\u03b4\u03c1\u03bf\u03bc\u03ad\u03c2",
+        "transactions": "\u03a3\u03c5\u03bd\u03b1\u03bb\u03bb\u03b1\u03b3\u03ad\u03c2",
+        "title_expenses": "\u0394\u03b1\u03c0\u03ac\u03bd\u03b5\u03c2",
+        "title_withdrawal": "\u0394\u03b1\u03c0\u03ac\u03bd\u03b5\u03c2",
+        "title_revenue": "\u0388\u03c3\u03bf\u03b4\u03b1",
+        "title_deposit": "\u0388\u03c3\u03bf\u03b4\u03b1",
+        "title_transfer": "\u039c\u03b5\u03c4\u03b1\u03c6\u03bf\u03c1\u03ad\u03c2",
+        "title_transfers": "\u039c\u03b5\u03c4\u03b1\u03c6\u03bf\u03c1\u03ad\u03c2",
+        "asset_accounts": "\u039b\u03bf\u03b3\u03b1\u03c1\u03b9\u03b1\u03c3\u03bc\u03bf\u03af \u03ba\u03b5\u03c6\u03b1\u03bb\u03b1\u03af\u03bf\u03c5",
+        "expense_accounts": "\u039b\u03bf\u03b3\u03b1\u03c1\u03b9\u03b1\u03c3\u03bc\u03bf\u03af \u03b4\u03b1\u03c0\u03b1\u03bd\u03ce\u03bd",
+        "revenue_accounts": "\u039b\u03bf\u03b3\u03b1\u03c1\u03b9\u03b1\u03c3\u03bc\u03bf\u03af \u03b5\u03c3\u03cc\u03b4\u03c9\u03bd",
+        "liabilities_accounts": "\u03a5\u03c0\u03bf\u03c7\u03c1\u03b5\u03ce\u03c3\u03b5\u03b9\u03c2"
    },
    "firefly": {
        "actions": "\u0395\u03bd\u03ad\u03c1\u03b3\u03b5\u03b9\u03b5\u03c2",
@@ -150,7 +150,7 @@ export default {
        "asset_accounts": "\u039a\u03b5\u03c6\u03ac\u03bb\u03b1\u03b9\u03b1",
        "expense_accounts": "\u0394\u03b1\u03c0\u03ac\u03bd\u03b5\u03c2",
        "liabilities_accounts": "\u03a5\u03c0\u03bf\u03c7\u03c1\u03b5\u03ce\u03c3\u03b5\u03b9\u03c2",
-        "undefined_accounts": "Accounts",
+        "undefined_accounts": "\u039b\u03bf\u03b3\u03b1\u03c1\u03b9\u03b1\u03c3\u03bc\u03bf\u03af",
        "name": "\u038c\u03bd\u03bf\u03bc\u03b1",
        "revenue_accounts": "\u0388\u03c3\u03bf\u03b4\u03b1",
        "description": "\u03a0\u03b5\u03c1\u03b9\u03b3\u03c1\u03b1\u03c6\u03ae",
--- a/frontend/src/i18n/zh_CN/index.js
+++ b/frontend/src/i18n/zh_CN/index.js
@@ -50,7 +50,7 @@ export default {
        "rule_trigger_source_account_ends_choice": "\u6765\u6e90\u8d26\u6237\u7ed3\u5c3e\u4e3a\u2026",
        "rule_trigger_source_account_is_choice": "\u6765\u6e90\u8d26\u6237\u540d\u79f0\u4e3a...",
        "rule_trigger_source_account_contains_choice": "\u6765\u6e90\u8d26\u6237\u540d\u79f0\u5305\u542b...",
-        "rule_trigger_account_id_choice": "\u4efb\u4f55\u4e00\u4e2a\u8d26\u6237ID\u4e3a",
+        "rule_trigger_account_id_choice": "\u5176\u4e2d\u4e00\u4e2a\u8d26\u6237ID\u4e3a...",
        "rule_trigger_source_account_id_choice": "\u6765\u6e90\u8d26\u6237 ID \u4e3a...",
        "rule_trigger_destination_account_id_choice": "\u76ee\u6807\u8d26\u6237 ID \u4e3a...",
        "rule_trigger_account_is_cash_choice": "\u5176\u4e2d\u4e00\u4e2a\u8d26\u6237\u662f\u73b0\u91d1\u8d26\u6237",
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
    },
    "devDependencies": {
        "@johmun/vue-tags-input": "^2",
-        "@vue/compiler-sfc": "^3.2.33",
+        "@vue/compiler-sfc": "^3.2.36",
        "axios": "^0.27",
        "bootstrap-sass": "^3",
        "cross-env": "^7.0",
--- a/resources/lang/el_GR/breadcrumbs.php
+++ b/resources/lang/el_GR/breadcrumbs.php
@@ -24,15 +24,15 @@ declare(strict_types=1);

 return [
    'home'                   => 'Αρχική',
-    'budgets'                => 'Budgets',
-    'subscriptions'          => 'Subscriptions',
-    'transactions'           => 'Transactions',
-    'title_expenses'         => 'Expenses',
-    'title_withdrawal'       => 'Expenses',
-    'title_revenue'          => 'Revenue / income',
-    'title_deposit'          => 'Revenue / income',
-    'title_transfer'         => 'Transfers',
-    'title_transfers'        => 'Transfers',
+    'budgets'                => 'Προϋπολογισμοί',
+    'subscriptions'          => 'Συνδρομές',
+    'transactions'           => 'Συναλλαγές',
+    'title_expenses'         => 'Δαπάνες',
+    'title_withdrawal'       => 'Δαπάνες',
+    'title_revenue'          => 'Έσοδα',
+    'title_deposit'          => 'Έσοδα',
+    'title_transfer'         => 'Μεταφορές',
+    'title_transfers'        => 'Μεταφορές',
    'edit_currency'          => 'Επεξεργασία νομίσματος ":name"',
    'delete_currency'        => 'Διαγραφή νομίσματος ":name"',
    'newPiggyBank'           => 'Δημιουργία ενός νέου κουμπαρά',
@@ -70,9 +70,9 @@ return [
    'edit_object_group'      => 'Επεξεργασία ομάδας ":title"',
    'delete_object_group'    => 'Διαγραφή ομάδας ":title"',
    'logout_others'          => 'Αποσυνδέσετε τις άλλες συνεδρίες',
-    'asset_accounts'         => 'Asset accounts',
-    'expense_accounts'       => 'Expense accounts',
-    'revenue_accounts'       => 'Revenue accounts',
-    'liabilities_accounts'   => 'Liabilities',
+    'asset_accounts'         => 'Λογαριασμοί κεφαλαίου',
+    'expense_accounts'       => 'Λογαριασμοί δαπανών',
+    'revenue_accounts'       => 'Λογαριασμοί εσόδων',
+    'liabilities_accounts'   => 'Υποχρεώσεις',
    'placeholder'            => '[Placeholder]',
 ];
--- a/resources/lang/el_GR/config.php
+++ b/resources/lang/el_GR/config.php
@@ -34,10 +34,10 @@ return [
    'month_and_day_js'         => 'Do MMMM YYYY',

    //'month_and_date_day'      => '%A %B %e, %Y',
-    'month_and_date_day_js'    => 'dddd MMMM Do, YYYY',
+    'month_and_date_day_js'    => 'dddd Do MMMM YYYY',

    //'month_and_day_no_year'   => '%B %e',
-    'month_and_day_no_year_js' => 'MMMM Do',
+    'month_and_day_no_year_js' => 'Do MMMM',

    //'date_time'               => '%B %e, %Y, @ %T',
    'date_time_js'             => 'Do MMMM YYYY, HH:mm:ss',
--- a/resources/lang/el_GR/firefly.php
+++ b/resources/lang/el_GR/firefly.php
@@ -1394,7 +1394,7 @@ return [
    'make_new_revenue_account'                  => 'Δημιουργία νέου λογαριασμού εσόδων',
    'make_new_liabilities_account'              => 'Δημιουργία νέας υποχρέωσης',
    'asset_accounts'                            => 'Κεφάλαια',
-    'undefined_accounts'                        => 'Accounts',
+    'undefined_accounts'                        => 'Λογαριασμοί',
    'asset_accounts_inactive'                   => 'Λογαριασμοί κεφαλαίου (ανενεργοί)',
    'expense_accounts'                          => 'Δαπάνες',
    'expense_accounts_inactive'                 => 'Λογαριασμοί δαπανών (ανενεργοί)',
--- a/resources/lang/el_GR/form.php
+++ b/resources/lang/el_GR/form.php
@@ -180,8 +180,8 @@ return [
    'blocked_code'                => 'Αιτία αποκλεισμού',
    'login_name'                  => 'Είσοδος',
    'is_owner'                    => 'Είναι διαχειριστής;',
-    'url'                         => 'URL',
-    'bill_end_date'               => 'End date',
+    'url'                         => 'Διεύθυνση URL',
+    'bill_end_date'               => 'Ημερομηνία λήξης',

    // import
    'apply_rules'                 => 'Εφαρμογή κανόνων',
--- a/resources/lang/el_GR/list.php
+++ b/resources/lang/el_GR/list.php
@@ -76,7 +76,7 @@ return [
    'type'                    => 'Τύπος',
    'completed'               => 'Ολοκληρώθηκε',
    'iban'                    => 'IBAN',
-    'account_number'              => 'Account number',
+    'account_number'              => 'Αριθμός λογαριασμού',
    'paid_current_period'     => 'Πληρώθηκαν αυτή την περίοδο',
    'email'                   => 'Email',
    'registered_at'           => 'Εγγράφηκε στις',
--- a/resources/lang/el_GR/validation.php
+++ b/resources/lang/el_GR/validation.php
@@ -61,9 +61,9 @@ return [
    'accepted'                       => 'Το :attribute πρέπει να γίνει αποδεκτό.',
    'bic'                            => 'Αυτό δεν είναι έγκυρο IBAN.',
    'at_least_one_trigger'           => 'Ο κανόνας πρέπει να έχει τουλάχιστον ένα κριτήριο ενεργοποίησης.',
-    'at_least_one_active_trigger'    => 'Rule must have at least one active trigger.',
+    'at_least_one_active_trigger'    => 'Ο κανόνας πρέπει να έχει τουλάχιστον ένα ενεργό κριτήριο ενεργοποίησης.',
    'at_least_one_action'            => 'Ο κανόνας πρέπει να έχει τουλάχιστον μία λειτουργία.',
-    'at_least_one_active_action'     => 'Rule must have at least one active action.',
+    'at_least_one_active_action'     => 'Ο κανόνας πρέπει να έχει τουλάχιστον μία ενεργή λειτουργία.',
    'base64'                         => 'Αυτά δεν είναι έγκυρα base64 κωδικοποιημένα δεδομένα.',
    'model_id_invalid'               => 'Το παραχωρημένο αναγνωριστικό δε φαίνεται έγκυρο για αυτό το μοντέλο.',
    'less'                           => 'Το :attribute πρέπει να είναι μικρότερο από 10,000,000',
--- a/resources/lang/es_ES/email.php
+++ b/resources/lang/es_ES/email.php
@@ -44,12 +44,12 @@ return [
    // access token created
    'access_token_created_subject'            => 'Se ha creado un nuevo token de acceso',
    'access_token_created_body'               => 'Alguien (esperemos que usted) acaba de crear un nuevo token de acceso a la API de Firefly III para tu cuenta de usuario.',
-    'access_token_created_explanation'        => 'With this token, they can access **all** of your financial records through the Firefly III API.',
-    'access_token_created_revoke'             => 'If this wasn\'t you, please revoke this token as soon as possible at :url',
+    'access_token_created_explanation'        => 'Con este token, pueden acceder a **todos** sus registros financieros a través de la API de Firefly III.',
+    'access_token_created_revoke'             => 'Si no era usted, por favor, revoque este token tan pronto como sea posible, en :url',

    // registered
    'registered_subject'                      => 'Bienvenido a Firefly III!',
-    'registered_welcome'                      => 'Welcome to [Firefly III](:address). Your registration has made it, and this email is here to confirm it. Yay!',
+    'registered_welcome'                      => 'Bienvenido/a a [Firefly III](:address). Su registro se ha realizado correctamente, y este correo electrónico está aquí para confirmarlo. ¡Yeah!',
    'registered_pw'                           => 'If you have forgotten your password already, please reset it using [the password reset tool](:address/password/reset).',
    'registered_help'                         => 'Hay un icono de ayuda en la esquina superior derecha de cada página. Si necesita ayuda, ¡Haga clic en él!',
    'registered_doc_html'                     => 'If you haven\'t already, please read the [grand theory](https://docs.firefly-iii.org/about-firefly-iii/personal-finances).',
--- a/resources/lang/zh_CN/firefly.php
+++ b/resources/lang/zh_CN/firefly.php
@@ -491,7 +491,7 @@ return [
    'search_modifier_updated_at_on'                       => 'Transaction was updated on ":value"',
    'search_modifier_updated_at_before'                   => 'Transaction was updated on or before ":value"',
    'search_modifier_updated_at_after'                    => 'Transaction was updated on or after ":value"',
-    'search_modifier_attachment_name_is'                  => '任何一个附件名称为":value"',
+    'search_modifier_attachment_name_is'                  => '任意一个附件名称为":value"',
    'search_modifier_attachment_name_contains'            => '任何附件的名称包含":value"',
    'search_modifier_attachment_name_starts'              => '任何附件的名称开头为":value"',
    'search_modifier_attachment_name_ends'                => '任何附件的名称结尾为":value"',
@@ -605,7 +605,7 @@ return [
    'rule_trigger_source_account_is'                      => '来源账户名称为“:trigger_value”',
    'rule_trigger_source_account_contains_choice'         => '来源账户名称包含...',
    'rule_trigger_source_account_contains'                => '来源账户名称包含“:trigger_value”',
-    'rule_trigger_account_id_choice'                      => '任何一个账户ID为',
+    'rule_trigger_account_id_choice'                      => '其中一个账户ID为...',
    'rule_trigger_account_id'                             => '其中一个账户ID是:trigger_value',
    'rule_trigger_source_account_id_choice'               => '来源账户 ID 为...',
    'rule_trigger_source_account_id'                      => '来源账户 ID 为 :trigger_value',
@@ -726,18 +726,18 @@ return [
    'rule_trigger_user_action_choice'                     => 'User action is ":trigger_value"',
    'rule_trigger_tag_is_not_choice'                      => '标签不为":trigger_value"',
    'rule_trigger_tag_is_not'                             => '标签不为...',
-    'rule_trigger_account_is_choice'                      => '任何一个账户为',
-    'rule_trigger_account_is'                             => '任何一个账户为":trigger_value"',
-    'rule_trigger_account_contains_choice'                => '任何一个账户包含',
-    'rule_trigger_account_contains'                       => '任何一个账户包含":trigger_value"',
+    'rule_trigger_account_is_choice'                      => '其中一个账户为...',
+    'rule_trigger_account_is'                             => '其中一个账户为":trigger_value"',
+    'rule_trigger_account_contains_choice'                => '其中一个账户包含...',
+    'rule_trigger_account_contains'                       => '其中一个账户包含":trigger_value"',
    'rule_trigger_account_ends_choice'                    => '其中一个账户结尾为...',
    'rule_trigger_account_ends'                           => '其中一个账户结尾为":trigger_value"',
    'rule_trigger_account_starts_choice'                  => '其中一个账户开头为...',
    'rule_trigger_account_starts'                         => '其中一个账户开头为":trigger_value"',
-    'rule_trigger_account_nr_is_choice'                   => '任何一个账户编号/IBAN为',
-    'rule_trigger_account_nr_is'                          => '任何一个账户编号/IBAN为":trigger_value"',
-    'rule_trigger_account_nr_contains_choice'             => '任何一个账户编号/IBAN包含',
-    'rule_trigger_account_nr_contains'                    => '任何一个账户编号/IBAN包含":trigger_value"',
+    'rule_trigger_account_nr_is_choice'                   => '其中一个账户编号/IBAN为...',
+    'rule_trigger_account_nr_is'                          => '其中一个账户编号/IBAN为":trigger_value"',
+    'rule_trigger_account_nr_contains_choice'             => '其中一个账户编号/IBAN包含...',
+    'rule_trigger_account_nr_contains'                    => '其中一个账户编号/IBAN包含":trigger_value"',
    'rule_trigger_account_nr_ends_choice'                 => '其中一个账户编号/IBAN结尾为...',
    'rule_trigger_account_nr_ends'                        => '其中一个账户编号/IBAN结尾为":trigger_value"',
    'rule_trigger_account_nr_starts_choice'               => '其中一个账户编号/IBAN开头为...',
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -12,6 +12,6 @@ sonar.organization=firefly-iii
 #sonar.sourceEncoding=UTF-8


-sonar.projectVersion=5.7.6
+sonar.projectVersion=5.7.9
 sonar.sources=app,bootstrap,database,resources/assets,resources/views,routes,tests
 sonar.sourceEncoding=UTF-8
--- a/yarn.lock
+++ b/yarn.lock
Author	SHA1	Message	Date
James Cole	986863f1d2	Merge branch 'release/5.7.9'	2022-05-31 06:17:35 +02:00
James Cole	f3ceba5325	Sloppy requirement would push Symfony to PHP 8.1.	2022-05-31 06:17:16 +02:00
James Cole	711b4c62b5	Merge branch 'release/5.7.8'	2022-05-31 06:13:18 +02:00
James Cole	f441f68da6	Merge tag '5.7.8' into develop 5.7.8	2022-05-31 06:13:18 +02:00
James Cole	2cf8bb2537	Update meta files for new release.	2022-05-31 06:12:56 +02:00
James Cole	bf434e5d42	Sloppy requirement would push Symfony to PHP 8.1.	2022-05-31 06:10:53 +02:00
James Cole	b1ea36ae5b	Merge branch 'release/5.7.7'	2022-05-31 06:05:39 +02:00
James Cole	5f3524c5aa	Merge tag '5.7.7' into develop 5.7.7	2022-05-31 06:05:39 +02:00
James Cole	2f75437ac1	Code for new release.	2022-05-31 06:05:21 +02:00
James Cole	6c945bfd60	Fix https://github.com/firefly-iii/firefly-iii/issues/5996	2022-05-31 05:56:38 +02:00
James Cole	82f993f0ff	Merge branch 'main' into develop	2022-05-31 05:54:51 +02:00
James Cole	08f3f2aeb9	Small fix	2022-05-31 05:27:47 +02:00
James Cole	099fc49c4b	Fix #6113	2022-05-30 20:48:56 +02:00
James Cole	6f2c46cb36	Merge pull request #6109 from firefly-iii/dependabot/composer/develop/guzzlehttp/guzzle-7.4.3 Bump guzzlehttp/guzzle from 7.4.2 to 7.4.3	2022-05-30 17:09:06 +00:00
James Cole	135424f8b8	Merge pull request #6110 from firefly-iii/dependabot/composer/develop/laravel/framework-9.14.1 Bump laravel/framework from 9.13.0 to 9.14.1	2022-05-30 17:08:55 +00:00
James Cole	9534fa59d6	Merge pull request #6111 from firefly-iii/dependabot/composer/develop/laravel/ui-3.4.6 Bump laravel/ui from 3.4.5 to 3.4.6	2022-05-30 17:08:44 +00:00
James Cole	51ae15a650	Merge pull request #6112 from firefly-iii/dependabot/composer/develop/symfony/http-client-6.0.9 Bump symfony/http-client from 6.0.8 to 6.0.9	2022-05-30 17:07:59 +00:00
dependabot[bot]	29776fa98c	Bump symfony/http-client from 6.0.8 to 6.0.9 Bumps [symfony/http-client](https://github.com/symfony/http-client) from 6.0.8 to 6.0.9. - [Release notes](https://github.com/symfony/http-client/releases) - [Changelog](https://github.com/symfony/http-client/blob/6.1/CHANGELOG.md) - [Commits](https://github.com/symfony/http-client/compare/v6.0.8...v6.0.9) --- updated-dependencies: - dependency-name: symfony/http-client dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2022-05-30 03:01:24 +00:00
dependabot[bot]	7ddffb9251	Bump laravel/ui from 3.4.5 to 3.4.6 Bumps [laravel/ui](https://github.com/laravel/ui) from 3.4.5 to 3.4.6. - [Release notes](https://github.com/laravel/ui/releases) - [Changelog](https://github.com/laravel/ui/blob/3.x/CHANGELOG.md) - [Commits](https://github.com/laravel/ui/compare/v3.4.5...v3.4.6) --- updated-dependencies: - dependency-name: laravel/ui dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2022-05-30 03:01:18 +00:00
dependabot[bot]	069770b39e	Bump laravel/framework from 9.13.0 to 9.14.1 Bumps [laravel/framework](https://github.com/laravel/framework) from 9.13.0 to 9.14.1. - [Release notes](https://github.com/laravel/framework/releases) - [Changelog](https://github.com/laravel/framework/blob/9.x/CHANGELOG.md) - [Commits](https://github.com/laravel/framework/compare/v9.13.0...v9.14.1) --- updated-dependencies: - dependency-name: laravel/framework dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2022-05-30 03:01:08 +00:00
dependabot[bot]	626119d774	Bump guzzlehttp/guzzle from 7.4.2 to 7.4.3 Bumps [guzzlehttp/guzzle](https://github.com/guzzle/guzzle) from 7.4.2 to 7.4.3. - [Release notes](https://github.com/guzzle/guzzle/releases) - [Changelog](https://github.com/guzzle/guzzle/blob/master/CHANGELOG.md) - [Commits](https://github.com/guzzle/guzzle/compare/7.4.2...7.4.3) --- updated-dependencies: - dependency-name: guzzlehttp/guzzle dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2022-05-30 03:00:53 +00:00
James Cole	993d18d508	Merge pull request #6104 from firefly-iii/dependabot/composer/guzzlehttp/guzzle-7.4.3 Bump guzzlehttp/guzzle from 7.4.2 to 7.4.3	2022-05-26 04:09:31 +00:00
dependabot[bot]	7b84c7c2dc	Bump guzzlehttp/guzzle from 7.4.2 to 7.4.3 Bumps [guzzlehttp/guzzle](https://github.com/guzzle/guzzle) from 7.4.2 to 7.4.3. - [Release notes](https://github.com/guzzle/guzzle/releases) - [Changelog](https://github.com/guzzle/guzzle/blob/master/CHANGELOG.md) - [Commits](https://github.com/guzzle/guzzle/compare/7.4.2...7.4.3) --- updated-dependencies: - dependency-name: guzzlehttp/guzzle dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>	2022-05-25 22:27:32 +00:00
James Cole	76429c923e	Merge pull request #6101 from LuxChanLu/develop feat: add the ability to disable mime check on attachement upload	2022-05-25 14:49:43 +00:00
Hugo Meyronneinc	ca1b048758	add eml and json allowed mime types	2022-05-25 14:32:25 +02:00
James Cole	fb11971b84	Merge pull request #6091 from firefly-iii/dependabot/npm_and_yarn/develop/vue/compiler-sfc-3.2.36 Bump @vue/compiler-sfc from 3.2.33 to 3.2.36	2022-05-23 06:45:38 +00:00
James Cole	465542b0f5	Merge pull request #6092 from firefly-iii/dependabot/npm_and_yarn/develop/postcss-8.4.14 Bump postcss from 8.4.13 to 8.4.14	2022-05-23 06:45:29 +00:00
dependabot[bot]	5185a3ed5a	Bump postcss from 8.4.13 to 8.4.14 Bumps [postcss](https://github.com/postcss/postcss) from 8.4.13 to 8.4.14. - [Release notes](https://github.com/postcss/postcss/releases) - [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md) - [Commits](https://github.com/postcss/postcss/compare/8.4.13...8.4.14) --- updated-dependencies: - dependency-name: postcss dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2022-05-23 03:02:07 +00:00
dependabot[bot]	4d1615197d	Bump @vue/compiler-sfc from 3.2.33 to 3.2.36 Bumps [@vue/compiler-sfc](https://github.com/vuejs/core/tree/HEAD/packages/compiler-sfc) from 3.2.33 to 3.2.36. - [Release notes](https://github.com/vuejs/core/releases) - [Changelog](https://github.com/vuejs/core/blob/main/CHANGELOG.md) - [Commits](https://github.com/vuejs/core/commits/v3.2.36/packages/compiler-sfc) --- updated-dependencies: - dependency-name: "@vue/compiler-sfc" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2022-05-23 03:01:56 +00:00
James Cole	83c6887ed0	Merge pull request #6085 from turrisxyz/Dependency-GitHub	2022-05-19 05:37:55 +02:00
naveen	9d1e20192d	chore(deps): Included dependency review > Dependency Review GitHub Action in your repository to enforce dependency > reviews on your pull requests. > The action scans for vulnerable versions of dependencies introduced by package version > changes in pull requests, > and warns you about the associated security vulnerabilities. > This gives you better visibility of what's changing in a pull request, > and helps prevent vulnerabilities being added to your repository. https://docs.github.com/en/code-security/supply-chain-security/understanding-your-software-supply-chain/about-dependency-review#dependency-review-enforcement Signed-off-by: naveen <172697+naveensrinivasan@users.noreply.github.com>	2022-05-19 00:12:46 +00:00
James Cole	40ec63ddb9	Merge tag '5.7.6' into develop 5.7.6	2022-05-18 06:53:04 +02:00