From 94b933c7a491b97eb7e993688b51dfe75ae00de9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Oct 2022 03:00:45 +0000 Subject: [PATCH 1/6] Bump symfony/http-client from 6.0.12 to 6.0.13 Bumps [symfony/http-client](https://github.com/symfony/http-client) from 6.0.12 to 6.0.13. - [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.12...v6.0.13) --- updated-dependencies: - dependency-name: symfony/http-client dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index a39943c71a..e0cbb64eb1 100644 --- a/composer.lock +++ b/composer.lock @@ -6151,16 +6151,16 @@ }, { "name": "symfony/http-client", - "version": "v6.0.12", + "version": "v6.0.13", "source": { "type": "git", "url": "https://github.com/symfony/http-client.git", - "reference": "411f73ad1a797f327d100d27fa5d715b947a8272" + "reference": "2067d3c398d47292f3b413fcc4f56385c1afd0d4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-client/zipball/411f73ad1a797f327d100d27fa5d715b947a8272", - "reference": "411f73ad1a797f327d100d27fa5d715b947a8272", + "url": "https://api.github.com/repos/symfony/http-client/zipball/2067d3c398d47292f3b413fcc4f56385c1afd0d4", + "reference": "2067d3c398d47292f3b413fcc4f56385c1afd0d4", "shasum": "" }, "require": { @@ -6215,7 +6215,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.12" + "source": "https://github.com/symfony/http-client/tree/v6.0.13" }, "funding": [ { @@ -6231,7 +6231,7 @@ "type": "tidelift" } ], - "time": "2022-08-02T16:01:06+00:00" + "time": "2022-09-09T09:33:56+00:00" }, { "name": "symfony/http-client-contracts", From 553c3ec17e4ac8436fee75f455503f017aa33cd5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Oct 2022 03:00:58 +0000 Subject: [PATCH 2/6] Bump laravel/framework from 9.31.0 to 9.33.0 Bumps [laravel/framework](https://github.com/laravel/framework) from 9.31.0 to 9.33.0. - [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.31.0...v9.33.0) --- updated-dependencies: - dependency-name: laravel/framework dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- composer.lock | 110 +++++++++++++++++++++++++------------------------- 1 file changed, 55 insertions(+), 55 deletions(-) diff --git a/composer.lock b/composer.lock index a39943c71a..4a7aae2b97 100644 --- a/composer.lock +++ b/composer.lock @@ -1855,16 +1855,16 @@ }, { "name": "laravel/framework", - "version": "v9.31.0", + "version": "v9.33.0", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "75013d4fffe3b24748d313fbbea53206351214f7" + "reference": "13665b7e15dbcbecb3651acc19ba8818da6fa0a9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/75013d4fffe3b24748d313fbbea53206351214f7", - "reference": "75013d4fffe3b24748d313fbbea53206351214f7", + "url": "https://api.github.com/repos/laravel/framework/zipball/13665b7e15dbcbecb3651acc19ba8818da6fa0a9", + "reference": "13665b7e15dbcbecb3651acc19ba8818da6fa0a9", "shasum": "" }, "require": { @@ -1878,7 +1878,7 @@ "league/commonmark": "^2.2", "league/flysystem": "^3.0.16", "monolog/monolog": "^2.0", - "nesbot/carbon": "^2.53.1", + "nesbot/carbon": "^2.62.1", "nunomaduro/termwind": "^1.13", "php": "^8.0.2", "psr/container": "^1.1.1|^2.0.1", @@ -1953,7 +1953,7 @@ "league/flysystem-read-only": "^3.3", "league/flysystem-sftp-v3": "^3.0", "mockery/mockery": "^1.4.4", - "orchestra/testbench-core": "^7.1", + "orchestra/testbench-core": "^7.8", "pda/pheanstalk": "^4.0", "phpstan/phpstan": "^1.4.7", "phpunit/phpunit": "^9.5.8", @@ -2037,7 +2037,7 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2022-09-20T13:32:50+00:00" + "time": "2022-09-30T12:59:55+00:00" }, { "name": "laravel/passport", @@ -5630,16 +5630,16 @@ }, { "name": "symfony/console", - "version": "v6.0.12", + "version": "v6.0.13", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "c5c2e313aa682530167c25077d6bdff36346251e" + "reference": "8f14753b865651c2aad107ef97475740a9b0730f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/c5c2e313aa682530167c25077d6bdff36346251e", - "reference": "c5c2e313aa682530167c25077d6bdff36346251e", + "url": "https://api.github.com/repos/symfony/console/zipball/8f14753b865651c2aad107ef97475740a9b0730f", + "reference": "8f14753b865651c2aad107ef97475740a9b0730f", "shasum": "" }, "require": { @@ -5705,7 +5705,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v6.0.12" + "source": "https://github.com/symfony/console/tree/v6.0.13" }, "funding": [ { @@ -5721,7 +5721,7 @@ "type": "tidelift" } ], - "time": "2022-08-23T20:52:30+00:00" + "time": "2022-09-03T14:23:25+00:00" }, { "name": "symfony/css-selector", @@ -6313,16 +6313,16 @@ }, { "name": "symfony/http-foundation", - "version": "v6.0.12", + "version": "v6.0.13", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "d50ee4795c981638369dfa0b281107365fab2429" + "reference": "294208f37a73b7ae64b4297d936e890d5b514902" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/d50ee4795c981638369dfa0b281107365fab2429", - "reference": "d50ee4795c981638369dfa0b281107365fab2429", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/294208f37a73b7ae64b4297d936e890d5b514902", + "reference": "294208f37a73b7ae64b4297d936e890d5b514902", "shasum": "" }, "require": { @@ -6368,7 +6368,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.12" + "source": "https://github.com/symfony/http-foundation/tree/v6.0.13" }, "funding": [ { @@ -6384,20 +6384,20 @@ "type": "tidelift" } ], - "time": "2022-08-19T14:25:15+00:00" + "time": "2022-09-17T07:33:45+00:00" }, { "name": "symfony/http-kernel", - "version": "v6.0.12", + "version": "v6.0.13", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "8f3563e4518cfee24a5cc724434cc60e0818abec" + "reference": "5939a039103580d8d86a4c80e245258ad50c91b2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/8f3563e4518cfee24a5cc724434cc60e0818abec", - "reference": "8f3563e4518cfee24a5cc724434cc60e0818abec", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/5939a039103580d8d86a4c80e245258ad50c91b2", + "reference": "5939a039103580d8d86a4c80e245258ad50c91b2", "shasum": "" }, "require": { @@ -6477,7 +6477,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.12" + "source": "https://github.com/symfony/http-kernel/tree/v6.0.13" }, "funding": [ { @@ -6493,20 +6493,20 @@ "type": "tidelift" } ], - "time": "2022-08-26T14:45:39+00:00" + "time": "2022-09-30T08:03:37+00:00" }, { "name": "symfony/mailer", - "version": "v6.0.12", + "version": "v6.0.13", "source": { "type": "git", "url": "https://github.com/symfony/mailer.git", - "reference": "45aad5f8cfb481130e83dc4cb867c0f576182ea9" + "reference": "6269c872ab4792e8facbf8af27a2fbee8429f217" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mailer/zipball/45aad5f8cfb481130e83dc4cb867c0f576182ea9", - "reference": "45aad5f8cfb481130e83dc4cb867c0f576182ea9", + "url": "https://api.github.com/repos/symfony/mailer/zipball/6269c872ab4792e8facbf8af27a2fbee8429f217", + "reference": "6269c872ab4792e8facbf8af27a2fbee8429f217", "shasum": "" }, "require": { @@ -6551,7 +6551,7 @@ "description": "Helps sending emails", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/mailer/tree/v6.0.12" + "source": "https://github.com/symfony/mailer/tree/v6.0.13" }, "funding": [ { @@ -6567,7 +6567,7 @@ "type": "tidelift" } ], - "time": "2022-08-03T05:17:36+00:00" + "time": "2022-08-29T06:49:22+00:00" }, { "name": "symfony/mailgun-mailer", @@ -6636,16 +6636,16 @@ }, { "name": "symfony/mime", - "version": "v6.0.12", + "version": "v6.0.13", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "02a11577f2f9522c783179712bdf6d2d3cb9fc1d" + "reference": "c1d6eba531d956c23b3127dc6ae6f5ac4a90db6c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/02a11577f2f9522c783179712bdf6d2d3cb9fc1d", - "reference": "02a11577f2f9522c783179712bdf6d2d3cb9fc1d", + "url": "https://api.github.com/repos/symfony/mime/zipball/c1d6eba531d956c23b3127dc6ae6f5ac4a90db6c", + "reference": "c1d6eba531d956c23b3127dc6ae6f5ac4a90db6c", "shasum": "" }, "require": { @@ -6697,7 +6697,7 @@ "mime-type" ], "support": { - "source": "https://github.com/symfony/mime/tree/v6.0.12" + "source": "https://github.com/symfony/mime/tree/v6.0.13" }, "funding": [ { @@ -6713,7 +6713,7 @@ "type": "tidelift" } ], - "time": "2022-08-19T14:25:15+00:00" + "time": "2022-09-02T08:05:03+00:00" }, { "name": "symfony/polyfill-ctype", @@ -7773,16 +7773,16 @@ }, { "name": "symfony/string", - "version": "v6.0.12", + "version": "v6.0.13", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "3a975ba1a1508ad97df45f4590f55b7cc4c1a0a0" + "reference": "65e99fb179e7241606377e4042cd2161f3dd1c05" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/3a975ba1a1508ad97df45f4590f55b7cc4c1a0a0", - "reference": "3a975ba1a1508ad97df45f4590f55b7cc4c1a0a0", + "url": "https://api.github.com/repos/symfony/string/zipball/65e99fb179e7241606377e4042cd2161f3dd1c05", + "reference": "65e99fb179e7241606377e4042cd2161f3dd1c05", "shasum": "" }, "require": { @@ -7838,7 +7838,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.0.12" + "source": "https://github.com/symfony/string/tree/v6.0.13" }, "funding": [ { @@ -7854,7 +7854,7 @@ "type": "tidelift" } ], - "time": "2022-08-12T18:05:20+00:00" + "time": "2022-09-02T08:05:03+00:00" }, { "name": "symfony/translation", @@ -8031,16 +8031,16 @@ }, { "name": "symfony/uid", - "version": "v6.0.11", + "version": "v6.0.13", "source": { "type": "git", "url": "https://github.com/symfony/uid.git", - "reference": "7ae9cb6ad0728f9a425499112929575c0b2cc09f" + "reference": "db426b27173f5e2d8b960dd10fa8ce19ea9ca5f3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/uid/zipball/7ae9cb6ad0728f9a425499112929575c0b2cc09f", - "reference": "7ae9cb6ad0728f9a425499112929575c0b2cc09f", + "url": "https://api.github.com/repos/symfony/uid/zipball/db426b27173f5e2d8b960dd10fa8ce19ea9ca5f3", + "reference": "db426b27173f5e2d8b960dd10fa8ce19ea9ca5f3", "shasum": "" }, "require": { @@ -8085,7 +8085,7 @@ "uuid" ], "support": { - "source": "https://github.com/symfony/uid/tree/v6.0.11" + "source": "https://github.com/symfony/uid/tree/v6.0.13" }, "funding": [ { @@ -8101,20 +8101,20 @@ "type": "tidelift" } ], - "time": "2022-07-20T13:45:53+00:00" + "time": "2022-09-09T09:33:56+00:00" }, { "name": "symfony/var-dumper", - "version": "v6.0.11", + "version": "v6.0.13", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "2672bdc01c1971e3d8879ce153ec4c3621be5f07" + "reference": "367522dc769072f2abe554013e073eb079593829" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/2672bdc01c1971e3d8879ce153ec4c3621be5f07", - "reference": "2672bdc01c1971e3d8879ce153ec4c3621be5f07", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/367522dc769072f2abe554013e073eb079593829", + "reference": "367522dc769072f2abe554013e073eb079593829", "shasum": "" }, "require": { @@ -8173,7 +8173,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v6.0.11" + "source": "https://github.com/symfony/var-dumper/tree/v6.0.13" }, "funding": [ { @@ -8189,7 +8189,7 @@ "type": "tidelift" } ], - "time": "2022-07-20T13:45:53+00:00" + "time": "2022-09-08T09:32:44+00:00" }, { "name": "tijsverkoyen/css-to-inline-styles", From 671e93c50fc4f436fce1dc6f1a3063604769dc50 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Oct 2022 03:01:02 +0000 Subject: [PATCH 3/6] Bump nunomaduro/collision from 6.3.0 to 6.3.1 Bumps [nunomaduro/collision](https://github.com/nunomaduro/collision) from 6.3.0 to 6.3.1. - [Release notes](https://github.com/nunomaduro/collision/releases) - [Changelog](https://github.com/nunomaduro/collision/blob/v7.x/CHANGELOG.md) - [Commits](https://github.com/nunomaduro/collision/compare/v6.3.0...v6.3.1) --- updated-dependencies: - dependency-name: nunomaduro/collision dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- composer.json | 2 +- composer.lock | 36 ++++++++++++++++++------------------ 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/composer.json b/composer.json index 6468244681..204643983d 100644 --- a/composer.json +++ b/composer.json @@ -96,7 +96,7 @@ "league/commonmark": "2.*", "league/csv": "^9.7", "league/fractal": "0.*", - "nunomaduro/collision": "^6.2", + "nunomaduro/collision": "^6.3", "pragmarx/google2fa": "^8.0", "predis/predis": "^2.0", "psr/log": "<4", diff --git a/composer.lock b/composer.lock index a39943c71a..1174d3fa96 100644 --- 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": "773f4b8dc111cdbdbdc38a66c6f3a3f9", + "content-hash": "628ed087c46f7638f75cd4cfafdd694d", "packages": [ { "name": "bacon/bacon-qr-code", @@ -3663,16 +3663,16 @@ }, { "name": "nunomaduro/collision", - "version": "v6.3.0", + "version": "v6.3.1", "source": { "type": "git", "url": "https://github.com/nunomaduro/collision.git", - "reference": "17f600e2e8872856ff2846243efb74ad4b6da531" + "reference": "0f6349c3ed5dd28467087b08fb59384bb458a22b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nunomaduro/collision/zipball/17f600e2e8872856ff2846243efb74ad4b6da531", - "reference": "17f600e2e8872856ff2846243efb74ad4b6da531", + "url": "https://api.github.com/repos/nunomaduro/collision/zipball/0f6349c3ed5dd28467087b08fb59384bb458a22b", + "reference": "0f6349c3ed5dd28467087b08fb59384bb458a22b", "shasum": "" }, "require": { @@ -3747,7 +3747,7 @@ "type": "patreon" } ], - "time": "2022-08-29T09:11:20+00:00" + "time": "2022-09-29T12:29:49+00:00" }, { "name": "nunomaduro/termwind", @@ -5630,16 +5630,16 @@ }, { "name": "symfony/console", - "version": "v6.0.12", + "version": "v6.0.13", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "c5c2e313aa682530167c25077d6bdff36346251e" + "reference": "8f14753b865651c2aad107ef97475740a9b0730f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/c5c2e313aa682530167c25077d6bdff36346251e", - "reference": "c5c2e313aa682530167c25077d6bdff36346251e", + "url": "https://api.github.com/repos/symfony/console/zipball/8f14753b865651c2aad107ef97475740a9b0730f", + "reference": "8f14753b865651c2aad107ef97475740a9b0730f", "shasum": "" }, "require": { @@ -5705,7 +5705,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v6.0.12" + "source": "https://github.com/symfony/console/tree/v6.0.13" }, "funding": [ { @@ -5721,7 +5721,7 @@ "type": "tidelift" } ], - "time": "2022-08-23T20:52:30+00:00" + "time": "2022-09-03T14:23:25+00:00" }, { "name": "symfony/css-selector", @@ -7773,16 +7773,16 @@ }, { "name": "symfony/string", - "version": "v6.0.12", + "version": "v6.0.13", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "3a975ba1a1508ad97df45f4590f55b7cc4c1a0a0" + "reference": "65e99fb179e7241606377e4042cd2161f3dd1c05" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/3a975ba1a1508ad97df45f4590f55b7cc4c1a0a0", - "reference": "3a975ba1a1508ad97df45f4590f55b7cc4c1a0a0", + "url": "https://api.github.com/repos/symfony/string/zipball/65e99fb179e7241606377e4042cd2161f3dd1c05", + "reference": "65e99fb179e7241606377e4042cd2161f3dd1c05", "shasum": "" }, "require": { @@ -7838,7 +7838,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.0.12" + "source": "https://github.com/symfony/string/tree/v6.0.13" }, "funding": [ { @@ -7854,7 +7854,7 @@ "type": "tidelift" } ], - "time": "2022-08-12T18:05:20+00:00" + "time": "2022-09-02T08:05:03+00:00" }, { "name": "symfony/translation", From 73b98612a53bc319fb4ce6570189d4a0e2ea628d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Oct 2022 03:01:36 +0000 Subject: [PATCH 4/6] Bump @vue/compiler-sfc from 3.2.39 to 3.2.40 Bumps [@vue/compiler-sfc](https://github.com/vuejs/core/tree/HEAD/packages/compiler-sfc) from 3.2.39 to 3.2.40. - [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.40/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] --- package.json | 2 +- yarn.lock | 72 ++++++++++++++++++++++++++-------------------------- 2 files changed, 37 insertions(+), 37 deletions(-) diff --git a/package.json b/package.json index c1fd890153..07e75e1c71 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ }, "devDependencies": { "@johmun/vue-tags-input": "^2", - "@vue/compiler-sfc": "^3.2.37", + "@vue/compiler-sfc": "^3.2.40", "axios": "^0.27", "bootstrap-sass": "^3", "cross-env": "^7.0", diff --git a/yarn.lock b/yarn.lock index 0753f5cb21..a78858d6d9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1252,23 +1252,23 @@ dependencies: "@types/node" "*" -"@vue/compiler-core@3.2.39": - version "3.2.39" - resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.2.39.tgz#0d77e635f4bdb918326669155a2dc977c053943e" - integrity sha512-mf/36OWXqWn0wsC40nwRRGheR/qoID+lZXbIuLnr4/AngM0ov8Xvv8GHunC0rKRIkh60bTqydlqTeBo49rlbqw== +"@vue/compiler-core@3.2.40": + version "3.2.40" + resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.2.40.tgz#c785501f09536748121e937fb87605bbb1ada8e5" + integrity sha512-2Dc3Stk0J/VyQ4OUr2yEC53kU28614lZS+bnrCbFSAIftBJ40g/2yQzf4mPBiFuqguMB7hyHaujdgZAQ67kZYA== dependencies: "@babel/parser" "^7.16.4" - "@vue/shared" "3.2.39" + "@vue/shared" "3.2.40" estree-walker "^2.0.2" source-map "^0.6.1" -"@vue/compiler-dom@3.2.39": - version "3.2.39" - resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.2.39.tgz#bd69d35c1a48fe2cea4ab9e96d2a3a735d146fdf" - integrity sha512-HMFI25Be1C8vLEEv1hgEO1dWwG9QQ8LTTPmCkblVJY/O3OvWx6r1+zsox5mKPMGvqYEZa6l8j+xgOfUspgo7hw== +"@vue/compiler-dom@3.2.40": + version "3.2.40" + resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.2.40.tgz#c225418773774db536174d30d3f25ba42a33e7e4" + integrity sha512-OZCNyYVC2LQJy4H7h0o28rtk+4v+HMQygRTpmibGoG9wZyomQiS5otU7qo3Wlq5UfHDw2RFwxb9BJgKjVpjrQw== dependencies: - "@vue/compiler-core" "3.2.39" - "@vue/shared" "3.2.39" + "@vue/compiler-core" "3.2.40" + "@vue/shared" "3.2.40" "@vue/compiler-sfc@2.7.10": version "2.7.10" @@ -1279,29 +1279,29 @@ postcss "^8.4.14" source-map "^0.6.1" -"@vue/compiler-sfc@^3.2.37": - version "3.2.39" - resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.2.39.tgz#8fe29990f672805b7c5a2ecfa5b05e681c862ea2" - integrity sha512-fqAQgFs1/BxTUZkd0Vakn3teKUt//J3c420BgnYgEOoVdTwYpBTSXCMJ88GOBCylmUBbtquGPli9tVs7LzsWIA== +"@vue/compiler-sfc@^3.2.40": + version "3.2.40" + resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.2.40.tgz#61823283efc84d25d9d2989458f305d32a2ed141" + integrity sha512-tzqwniIN1fu1PDHC3CpqY/dPCfN/RN1thpBC+g69kJcrl7mbGiHKNwbA6kJ3XKKy8R6JLKqcpVugqN4HkeBFFg== dependencies: "@babel/parser" "^7.16.4" - "@vue/compiler-core" "3.2.39" - "@vue/compiler-dom" "3.2.39" - "@vue/compiler-ssr" "3.2.39" - "@vue/reactivity-transform" "3.2.39" - "@vue/shared" "3.2.39" + "@vue/compiler-core" "3.2.40" + "@vue/compiler-dom" "3.2.40" + "@vue/compiler-ssr" "3.2.40" + "@vue/reactivity-transform" "3.2.40" + "@vue/shared" "3.2.40" estree-walker "^2.0.2" magic-string "^0.25.7" postcss "^8.1.10" source-map "^0.6.1" -"@vue/compiler-ssr@3.2.39": - version "3.2.39" - resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.2.39.tgz#4f3bfb535cb98b764bee45e078700e03ccc60633" - integrity sha512-EoGCJ6lincKOZGW+0Ky4WOKsSmqL7hp1ZYgen8M7u/mlvvEQUaO9tKKOy7K43M9U2aA3tPv0TuYYQFrEbK2eFQ== +"@vue/compiler-ssr@3.2.40": + version "3.2.40" + resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.2.40.tgz#67df95a096c63e9ec4b50b84cc6f05816793629c" + integrity sha512-80cQcgasKjrPPuKcxwuCx7feq+wC6oFl5YaKSee9pV3DNq+6fmCVwEEC3vvkf/E2aI76rIJSOYHsWSEIxK74oQ== dependencies: - "@vue/compiler-dom" "3.2.39" - "@vue/shared" "3.2.39" + "@vue/compiler-dom" "3.2.40" + "@vue/shared" "3.2.40" "@vue/component-compiler-utils@^3.1.0": version "3.3.0" @@ -1319,21 +1319,21 @@ optionalDependencies: prettier "^1.18.2 || ^2.0.0" -"@vue/reactivity-transform@3.2.39": - version "3.2.39" - resolved "https://registry.yarnpkg.com/@vue/reactivity-transform/-/reactivity-transform-3.2.39.tgz#da6ae6c8fd77791b9ae21976720d116591e1c4aa" - integrity sha512-HGuWu864zStiWs9wBC6JYOP1E00UjMdDWIG5W+FpUx28hV3uz9ODOKVNm/vdOy/Pvzg8+OcANxAVC85WFBbl3A== +"@vue/reactivity-transform@3.2.40": + version "3.2.40" + resolved "https://registry.yarnpkg.com/@vue/reactivity-transform/-/reactivity-transform-3.2.40.tgz#dc24b9074b26f0d9dd2034c6349f5bb2a51c86ac" + integrity sha512-HQUCVwEaacq6fGEsg2NUuGKIhUveMCjOk8jGHqLXPI2w6zFoPrlQhwWEaINTv5kkZDXKEnCijAp+4gNEHG03yw== dependencies: "@babel/parser" "^7.16.4" - "@vue/compiler-core" "3.2.39" - "@vue/shared" "3.2.39" + "@vue/compiler-core" "3.2.40" + "@vue/shared" "3.2.40" estree-walker "^2.0.2" magic-string "^0.25.7" -"@vue/shared@3.2.39": - version "3.2.39" - resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.39.tgz#302df167559a1a5156da162d8cc6760cef67f8e3" - integrity sha512-D3dl2ZB9qE6mTuWPk9RlhDeP1dgNRUKC3NJxji74A4yL8M2MwlhLKUC/49WHjrNzSPug58fWx/yFbaTzGAQSBw== +"@vue/shared@3.2.40": + version "3.2.40" + resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.40.tgz#e57799da2a930b975321981fcee3d1e90ed257ae" + integrity sha512-0PLQ6RUtZM0vO3teRfzGi4ltLUO5aO+kLgwh4Um3THSR03rpQWLTuRCkuO5A41ITzwdWeKdPHtSARuPkoo5pCQ== "@webassemblyjs/ast@1.11.1": version "1.11.1" From 321c8fca67c87eea71c0e9b30eb1ad0cc1dff4f5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Oct 2022 03:01:52 +0000 Subject: [PATCH 5/6] Bump postcss from 8.4.16 to 8.4.17 Bumps [postcss](https://github.com/postcss/postcss) from 8.4.16 to 8.4.17. - [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.16...8.4.17) --- updated-dependencies: - dependency-name: postcss dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 0753f5cb21..34462e4482 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4288,9 +4288,9 @@ postcss@^7.0.36: source-map "^0.6.1" postcss@^8.1.10, postcss@^8.2.15, postcss@^8.4, postcss@^8.4.14: - version "8.4.16" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.16.tgz#33a1d675fac39941f5f445db0de4db2b6e01d43c" - integrity sha512-ipHE1XBvKzm5xI7hiHCZJCSugxvsdq2mPnsq5+UF+VHCjiBvtDrlxJfMBToWaP9D5XlgNmcFGqoHmUn0EYEaRQ== + version "8.4.17" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.17.tgz#f87863ec7cd353f81f7ab2dec5d67d861bbb1be5" + integrity sha512-UNxNOLQydcOFi41yHNMcKRZ39NeXlr8AxGuZJsdub8vIb12fHzcq37DTU/QtbI6WLxNg2gF9Z+8qtRwTj1UI1Q== dependencies: nanoid "^3.3.4" picocolors "^1.0.0" From bab4c05e5f7de236633d3e6ba2f2b8b4f5410391 Mon Sep 17 00:00:00 2001 From: James Cole Date: Tue, 4 Oct 2022 19:12:57 +0200 Subject: [PATCH 6/6] Fix https://github.com/firefly-iii/firefly-iii/issues/6471 --- .../Models/Transaction/UpdateRequest.php | 36 ++++++++++++++++--- app/Http/Requests/RecurrenceFormRequest.php | 6 ++-- .../Internal/Support/JournalServiceTrait.php | 1 + .../Internal/Update/GroupUpdateService.php | 3 ++ .../Internal/Update/JournalUpdateService.php | 3 ++ app/Support/Request/ConvertsDataTypes.php | 2 +- 6 files changed, 43 insertions(+), 8 deletions(-) diff --git a/app/Api/V1/Requests/Models/Transaction/UpdateRequest.php b/app/Api/V1/Requests/Models/Transaction/UpdateRequest.php index 54bc859473..9cbe848241 100644 --- a/app/Api/V1/Requests/Models/Transaction/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/Transaction/UpdateRequest.php @@ -48,6 +48,7 @@ class UpdateRequest extends FormRequest private array $dateFields; private array $integerFields; private array $stringFields; + private array $floatFields; private array $textareaFields; /** @@ -84,12 +85,15 @@ class UpdateRequest extends FormRequest 'notes', ]; - $this->convertStringFields = [ + $this->floatFields = [ + 'amount', + 'foreign_amount', + ]; + + $this->stringFields = [ 'type', 'currency_code', 'foreign_currency_code', - 'amount', - 'foreign_amount', 'description', 'source_name', 'source_iban', @@ -163,6 +167,7 @@ class UpdateRequest extends FormRequest $current = $this->getDateData($current, $transaction); $current = $this->getBooleanData($current, $transaction); $current = $this->getArrayData($current, $transaction); + $current = $this->getFloatData($current, $transaction); $return[] = $current; } @@ -196,7 +201,7 @@ class UpdateRequest extends FormRequest */ private function getStringData(array $current, array $transaction): array { - foreach ($this->convertStringFields as $fieldName) { + foreach ($this->stringFields as $fieldName) { if (array_key_exists($fieldName, $transaction)) { $current[$fieldName] = $this->clearString((string) $transaction[$fieldName], false); } @@ -389,4 +394,27 @@ class UpdateRequest extends FormRequest } ); } + + /** + * @param array $current + * @param array $transaction + * @return array + */ + private function getFloatData(array $current, array $transaction): array + { + foreach ($this->floatFields as $fieldName) { + if (array_key_exists($fieldName, $transaction)) { + $value = $transaction[$fieldName]; + if (is_float($value)) { + // TODO this effectively limits the max number of decimals in currencies to 14. + $current[$fieldName] = sprintf('%.14f', $value); + } + if (!is_float($value)) { + $current[$fieldName] = (string) $value; + } + } + } + + return $current; + } } diff --git a/app/Http/Requests/RecurrenceFormRequest.php b/app/Http/Requests/RecurrenceFormRequest.php index e2bf43d001..41e5c010ab 100644 --- a/app/Http/Requests/RecurrenceFormRequest.php +++ b/app/Http/Requests/RecurrenceFormRequest.php @@ -99,7 +99,7 @@ class RecurrenceFormRequest extends FormRequest ]; // fill in foreign currency data - if (null !== $this->float('foreign_amount')) { + if (null !== $this->convertFloat('foreign_amount')) { $return['transactions'][0]['foreign_amount'] = $this->convertString('foreign_amount'); $return['transactions'][0]['foreign_currency_id'] = $this->convertInteger('foreign_currency_id'); } @@ -228,7 +228,7 @@ class RecurrenceFormRequest extends FormRequest $rules['repetitions'] = 'required|numeric|between:0,254'; } // if foreign amount, currency must be different. - if (null !== $this->float('foreign_amount')) { + if (null !== $this->convertFloat('foreign_amount')) { $rules['foreign_currency_id'] = 'exists:transaction_currencies,id|different:transaction_currency_id'; } @@ -237,7 +237,7 @@ class RecurrenceFormRequest extends FormRequest $rules['repeat_until'] = 'required|date|after:' . $tomorrow->format('Y-m-d'); } - // switchc on type to expand rules for source and destination accounts: + // switch on type to expand rules for source and destination accounts: switch ($this->convertString('transaction_type')) { case strtolower(TransactionType::WITHDRAWAL): $rules['source_id'] = 'required|exists:accounts,id|belongsToUser:accounts'; diff --git a/app/Services/Internal/Support/JournalServiceTrait.php b/app/Services/Internal/Support/JournalServiceTrait.php index f9907647f5..24777d11e1 100644 --- a/app/Services/Internal/Support/JournalServiceTrait.php +++ b/app/Services/Internal/Support/JournalServiceTrait.php @@ -293,6 +293,7 @@ trait JournalServiceTrait if ('' === $amount) { throw new FireflyException(sprintf('The amount cannot be an empty string: "%s"', $amount)); } + Log::debug(sprintf('Now in getAmount("%s")', $amount)); if (0 === bccomp('0', $amount)) { throw new FireflyException(sprintf('The amount seems to be zero: "%s"', $amount)); } diff --git a/app/Services/Internal/Update/GroupUpdateService.php b/app/Services/Internal/Update/GroupUpdateService.php index c97f6daf78..9a7e1151d2 100644 --- a/app/Services/Internal/Update/GroupUpdateService.php +++ b/app/Services/Internal/Update/GroupUpdateService.php @@ -48,6 +48,7 @@ class GroupUpdateService */ public function update(TransactionGroup $transactionGroup, array $data): TransactionGroup { + Log::debug(sprintf('Now in %s', __METHOD__)); Log::debug('Now in group update service', $data); /** @var array $transactions */ $transactions = $data['transactions'] ?? []; @@ -117,6 +118,7 @@ class GroupUpdateService */ private function updateTransactionJournal(TransactionGroup $transactionGroup, TransactionJournal $journal, array $data): void { + Log::debug(sprintf('Now in %s', __METHOD__)); if (empty($data)) { return; } @@ -141,6 +143,7 @@ class GroupUpdateService */ private function updateTransactions(TransactionGroup $transactionGroup, array $transactions): array { + Log::debug(sprintf('Now in %s', __METHOD__)); // updated or created transaction journals: $updated = []; /** diff --git a/app/Services/Internal/Update/JournalUpdateService.php b/app/Services/Internal/Update/JournalUpdateService.php index 61ed19b2f2..adb6525aaa 100644 --- a/app/Services/Internal/Update/JournalUpdateService.php +++ b/app/Services/Internal/Update/JournalUpdateService.php @@ -126,6 +126,7 @@ class JournalUpdateService */ public function update(): void { + Log::debug(sprintf('Now in %s', __METHOD__)); Log::debug(sprintf('Now in JournalUpdateService for journal #%d.', $this->transactionJournal->id)); if ($this->removeReconciliation()) { @@ -690,11 +691,13 @@ class JournalUpdateService */ private function updateAmount(): void { + Log::debug(sprintf('Now in %s', __METHOD__)); if (!$this->hasFields(['amount'])) { return; } $value = $this->data['amount'] ?? ''; + Log::debug(sprintf('Amount is now "%s"', $value)); try { $amount = $this->getAmount($value); } catch (FireflyException $e) { diff --git a/app/Support/Request/ConvertsDataTypes.php b/app/Support/Request/ConvertsDataTypes.php index cc0d51b459..d01a141854 100644 --- a/app/Support/Request/ConvertsDataTypes.php +++ b/app/Support/Request/ConvertsDataTypes.php @@ -216,7 +216,7 @@ trait ConvertsDataTypes * * @return float|null */ - protected function float(string $field): ?float + protected function convertFloat(string $field): ?float { $res = $this->get($field); if (null === $res) {