This commit is contained in:
James Cole 2022-10-04 20:31:57 +02:00
commit 44637dfaab
No known key found for this signature in database
GPG Key ID: B49A324B7EAD6D80
9 changed files with 274 additions and 46 deletions

View File

@ -48,6 +48,7 @@ class UpdateRequest extends FormRequest
private array $dateFields; private array $dateFields;
private array $integerFields; private array $integerFields;
private array $stringFields; private array $stringFields;
private array $floatFields;
private array $textareaFields; private array $textareaFields;
/** /**
@ -84,12 +85,15 @@ class UpdateRequest extends FormRequest
'notes', 'notes',
]; ];
$this->convertStringFields = [ $this->floatFields = [
'amount',
'foreign_amount',
];
$this->stringFields = [
'type', 'type',
'currency_code', 'currency_code',
'foreign_currency_code', 'foreign_currency_code',
'amount',
'foreign_amount',
'description', 'description',
'source_name', 'source_name',
'source_iban', 'source_iban',
@ -163,6 +167,7 @@ class UpdateRequest extends FormRequest
$current = $this->getDateData($current, $transaction); $current = $this->getDateData($current, $transaction);
$current = $this->getBooleanData($current, $transaction); $current = $this->getBooleanData($current, $transaction);
$current = $this->getArrayData($current, $transaction); $current = $this->getArrayData($current, $transaction);
$current = $this->getFloatData($current, $transaction);
$return[] = $current; $return[] = $current;
} }
@ -196,7 +201,7 @@ class UpdateRequest extends FormRequest
*/ */
private function getStringData(array $current, array $transaction): array private function getStringData(array $current, array $transaction): array
{ {
foreach ($this->convertStringFields as $fieldName) { foreach ($this->stringFields as $fieldName) {
if (array_key_exists($fieldName, $transaction)) { if (array_key_exists($fieldName, $transaction)) {
$current[$fieldName] = $this->clearString((string) $transaction[$fieldName], false); $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;
}
} }

View File

@ -237,7 +237,7 @@ class RecurrenceFormRequest extends FormRequest
$rules['repeat_until'] = 'required|date|after:' . $tomorrow->format('Y-m-d'); $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')) { switch ($this->convertString('transaction_type')) {
case strtolower(TransactionType::WITHDRAWAL): case strtolower(TransactionType::WITHDRAWAL):
$rules['source_id'] = 'required|exists:accounts,id|belongsToUser:accounts'; $rules['source_id'] = 'required|exists:accounts,id|belongsToUser:accounts';

View File

@ -293,6 +293,7 @@ trait JournalServiceTrait
if ('' === $amount) { if ('' === $amount) {
throw new FireflyException(sprintf('The amount cannot be an empty string: "%s"', $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)) { if (0 === bccomp('0', $amount)) {
throw new FireflyException(sprintf('The amount seems to be zero: "%s"', $amount)); throw new FireflyException(sprintf('The amount seems to be zero: "%s"', $amount));
} }

View File

@ -48,6 +48,7 @@ class GroupUpdateService
*/ */
public function update(TransactionGroup $transactionGroup, array $data): TransactionGroup public function update(TransactionGroup $transactionGroup, array $data): TransactionGroup
{ {
Log::debug(sprintf('Now in %s', __METHOD__));
Log::debug('Now in group update service', $data); Log::debug('Now in group update service', $data);
/** @var array $transactions */ /** @var array $transactions */
$transactions = $data['transactions'] ?? []; $transactions = $data['transactions'] ?? [];
@ -117,6 +118,7 @@ class GroupUpdateService
*/ */
private function updateTransactionJournal(TransactionGroup $transactionGroup, TransactionJournal $journal, array $data): void private function updateTransactionJournal(TransactionGroup $transactionGroup, TransactionJournal $journal, array $data): void
{ {
Log::debug(sprintf('Now in %s', __METHOD__));
if (empty($data)) { if (empty($data)) {
return; return;
} }
@ -141,6 +143,7 @@ class GroupUpdateService
*/ */
private function updateTransactions(TransactionGroup $transactionGroup, array $transactions): array private function updateTransactions(TransactionGroup $transactionGroup, array $transactions): array
{ {
Log::debug(sprintf('Now in %s', __METHOD__));
// updated or created transaction journals: // updated or created transaction journals:
$updated = []; $updated = [];
/** /**

View File

@ -126,6 +126,7 @@ class JournalUpdateService
*/ */
public function update(): void public function update(): void
{ {
Log::debug(sprintf('Now in %s', __METHOD__));
Log::debug(sprintf('Now in JournalUpdateService for journal #%d.', $this->transactionJournal->id)); Log::debug(sprintf('Now in JournalUpdateService for journal #%d.', $this->transactionJournal->id));
if ($this->removeReconciliation()) { if ($this->removeReconciliation()) {
@ -690,11 +691,13 @@ class JournalUpdateService
*/ */
private function updateAmount(): void private function updateAmount(): void
{ {
Log::debug(sprintf('Now in %s', __METHOD__));
if (!$this->hasFields(['amount'])) { if (!$this->hasFields(['amount'])) {
return; return;
} }
$value = $this->data['amount'] ?? ''; $value = $this->data['amount'] ?? '';
Log::debug(sprintf('Amount is now "%s"', $value));
try { try {
$amount = $this->getAmount($value); $amount = $this->getAmount($value);
} catch (FireflyException $e) { } catch (FireflyException $e) {

View File

@ -97,7 +97,7 @@
"league/commonmark": "2.*", "league/commonmark": "2.*",
"league/csv": "^9.7", "league/csv": "^9.7",
"league/fractal": "0.*", "league/fractal": "0.*",
"nunomaduro/collision": "^6.2", "nunomaduro/collision": "^6.3",
"pragmarx/google2fa": "^8.0", "pragmarx/google2fa": "^8.0",
"predis/predis": "^2.0", "predis/predis": "^2.0",
"psr/log": "<4", "psr/log": "<4",

193
composer.lock generated
View File

@ -4,7 +4,11 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
<<<<<<< HEAD
"content-hash": "52586741d36cfca38d55abc69842d452", "content-hash": "52586741d36cfca38d55abc69842d452",
=======
"content-hash": "628ed087c46f7638f75cd4cfafdd694d",
>>>>>>> develop
"packages": [ "packages": [
{ {
"name": "bacon/bacon-qr-code", "name": "bacon/bacon-qr-code",
@ -5696,6 +5700,7 @@
}, },
{ {
"name": "symfony/console", "name": "symfony/console",
<<<<<<< HEAD
"version": "v6.1.5", "version": "v6.1.5",
"source": { "source": {
"type": "git", "type": "git",
@ -5706,6 +5711,18 @@
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/console/zipball/17524a64ebcfab68d237bbed247e9a9917747096", "url": "https://api.github.com/repos/symfony/console/zipball/17524a64ebcfab68d237bbed247e9a9917747096",
"reference": "17524a64ebcfab68d237bbed247e9a9917747096", "reference": "17524a64ebcfab68d237bbed247e9a9917747096",
=======
"version": "v6.0.13",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
"reference": "8f14753b865651c2aad107ef97475740a9b0730f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/console/zipball/8f14753b865651c2aad107ef97475740a9b0730f",
"reference": "8f14753b865651c2aad107ef97475740a9b0730f",
>>>>>>> develop
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -5772,7 +5789,11 @@
"terminal" "terminal"
], ],
"support": { "support": {
<<<<<<< HEAD
"source": "https://github.com/symfony/console/tree/v6.1.5" "source": "https://github.com/symfony/console/tree/v6.1.5"
=======
"source": "https://github.com/symfony/console/tree/v6.0.13"
>>>>>>> develop
}, },
"funding": [ "funding": [
{ {
@ -5788,7 +5809,11 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
<<<<<<< HEAD
"time": "2022-09-03T14:24:42+00:00" "time": "2022-09-03T14:24:42+00:00"
=======
"time": "2022-09-03T14:23:25+00:00"
>>>>>>> develop
}, },
{ {
"name": "symfony/css-selector", "name": "symfony/css-selector",
@ -6221,6 +6246,7 @@
}, },
{ {
"name": "symfony/http-client", "name": "symfony/http-client",
<<<<<<< HEAD
"version": "v6.1.5", "version": "v6.1.5",
"source": { "source": {
"type": "git", "type": "git",
@ -6231,6 +6257,18 @@
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/http-client/zipball/565b0f2ce2c5882e89b3ef5e255d7e0478b9c675", "url": "https://api.github.com/repos/symfony/http-client/zipball/565b0f2ce2c5882e89b3ef5e255d7e0478b9c675",
"reference": "565b0f2ce2c5882e89b3ef5e255d7e0478b9c675", "reference": "565b0f2ce2c5882e89b3ef5e255d7e0478b9c675",
=======
"version": "v6.0.13",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-client.git",
"reference": "2067d3c398d47292f3b413fcc4f56385c1afd0d4"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/http-client/zipball/2067d3c398d47292f3b413fcc4f56385c1afd0d4",
"reference": "2067d3c398d47292f3b413fcc4f56385c1afd0d4",
>>>>>>> develop
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -6285,7 +6323,11 @@
"description": "Provides powerful methods to fetch HTTP resources synchronously or asynchronously", "description": "Provides powerful methods to fetch HTTP resources synchronously or asynchronously",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"support": { "support": {
<<<<<<< HEAD
"source": "https://github.com/symfony/http-client/tree/v6.1.5" "source": "https://github.com/symfony/http-client/tree/v6.1.5"
=======
"source": "https://github.com/symfony/http-client/tree/v6.0.13"
>>>>>>> develop
}, },
"funding": [ "funding": [
{ {
@ -6301,7 +6343,11 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
<<<<<<< HEAD
"time": "2022-09-09T09:34:27+00:00" "time": "2022-09-09T09:34:27+00:00"
=======
"time": "2022-09-09T09:33:56+00:00"
>>>>>>> develop
}, },
{ {
"name": "symfony/http-client-contracts", "name": "symfony/http-client-contracts",
@ -6386,6 +6432,7 @@
}, },
{ {
"name": "symfony/http-foundation", "name": "symfony/http-foundation",
<<<<<<< HEAD
"version": "v6.1.5", "version": "v6.1.5",
"source": { "source": {
"type": "git", "type": "git",
@ -6396,6 +6443,18 @@
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/90f5d9726942db69490fe467a3acb5e7154fd555", "url": "https://api.github.com/repos/symfony/http-foundation/zipball/90f5d9726942db69490fe467a3acb5e7154fd555",
"reference": "90f5d9726942db69490fe467a3acb5e7154fd555", "reference": "90f5d9726942db69490fe467a3acb5e7154fd555",
=======
"version": "v6.0.13",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-foundation.git",
"reference": "294208f37a73b7ae64b4297d936e890d5b514902"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/294208f37a73b7ae64b4297d936e890d5b514902",
"reference": "294208f37a73b7ae64b4297d936e890d5b514902",
>>>>>>> develop
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -6441,7 +6500,11 @@
"description": "Defines an object-oriented layer for the HTTP specification", "description": "Defines an object-oriented layer for the HTTP specification",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"support": { "support": {
<<<<<<< HEAD
"source": "https://github.com/symfony/http-foundation/tree/v6.1.5" "source": "https://github.com/symfony/http-foundation/tree/v6.1.5"
=======
"source": "https://github.com/symfony/http-foundation/tree/v6.0.13"
>>>>>>> develop
}, },
"funding": [ "funding": [
{ {
@ -6457,6 +6520,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
<<<<<<< HEAD
"time": "2022-09-17T07:55:45+00:00" "time": "2022-09-17T07:55:45+00:00"
}, },
{ {
@ -6471,6 +6535,22 @@
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/bf433ef30c2dfbf1f47449d5dce8be243e8a0012", "url": "https://api.github.com/repos/symfony/http-kernel/zipball/bf433ef30c2dfbf1f47449d5dce8be243e8a0012",
"reference": "bf433ef30c2dfbf1f47449d5dce8be243e8a0012", "reference": "bf433ef30c2dfbf1f47449d5dce8be243e8a0012",
=======
"time": "2022-09-17T07:33:45+00:00"
},
{
"name": "symfony/http-kernel",
"version": "v6.0.13",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-kernel.git",
"reference": "5939a039103580d8d86a4c80e245258ad50c91b2"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/5939a039103580d8d86a4c80e245258ad50c91b2",
"reference": "5939a039103580d8d86a4c80e245258ad50c91b2",
>>>>>>> develop
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -6551,7 +6631,11 @@
"description": "Provides a structured process for converting a Request into a Response", "description": "Provides a structured process for converting a Request into a Response",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"support": { "support": {
<<<<<<< HEAD
"source": "https://github.com/symfony/http-kernel/tree/v6.1.5" "source": "https://github.com/symfony/http-kernel/tree/v6.1.5"
=======
"source": "https://github.com/symfony/http-kernel/tree/v6.0.13"
>>>>>>> develop
}, },
"funding": [ "funding": [
{ {
@ -6567,6 +6651,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
<<<<<<< HEAD
"time": "2022-09-30T08:10:57+00:00" "time": "2022-09-30T08:10:57+00:00"
}, },
{ {
@ -6581,6 +6666,22 @@
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/mailer/zipball/e1b32deb9efc48def0c76b876860ad36f2123e89", "url": "https://api.github.com/repos/symfony/mailer/zipball/e1b32deb9efc48def0c76b876860ad36f2123e89",
"reference": "e1b32deb9efc48def0c76b876860ad36f2123e89", "reference": "e1b32deb9efc48def0c76b876860ad36f2123e89",
=======
"time": "2022-09-30T08:03:37+00:00"
},
{
"name": "symfony/mailer",
"version": "v6.0.13",
"source": {
"type": "git",
"url": "https://github.com/symfony/mailer.git",
"reference": "6269c872ab4792e8facbf8af27a2fbee8429f217"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/mailer/zipball/6269c872ab4792e8facbf8af27a2fbee8429f217",
"reference": "6269c872ab4792e8facbf8af27a2fbee8429f217",
>>>>>>> develop
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -6625,7 +6726,11 @@
"description": "Helps sending emails", "description": "Helps sending emails",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"support": { "support": {
<<<<<<< HEAD
"source": "https://github.com/symfony/mailer/tree/v6.1.5" "source": "https://github.com/symfony/mailer/tree/v6.1.5"
=======
"source": "https://github.com/symfony/mailer/tree/v6.0.13"
>>>>>>> develop
}, },
"funding": [ "funding": [
{ {
@ -6641,7 +6746,11 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
<<<<<<< HEAD
"time": "2022-08-29T06:58:39+00:00" "time": "2022-08-29T06:58:39+00:00"
=======
"time": "2022-08-29T06:49:22+00:00"
>>>>>>> develop
}, },
{ {
"name": "symfony/mailgun-mailer", "name": "symfony/mailgun-mailer",
@ -6710,6 +6819,7 @@
}, },
{ {
"name": "symfony/mime", "name": "symfony/mime",
<<<<<<< HEAD
"version": "v6.1.5", "version": "v6.1.5",
"source": { "source": {
"type": "git", "type": "git",
@ -6720,6 +6830,18 @@
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/mime/zipball/d521b2204f7dcebe81c1b5fb99ed70dfb6f34b4b", "url": "https://api.github.com/repos/symfony/mime/zipball/d521b2204f7dcebe81c1b5fb99ed70dfb6f34b4b",
"reference": "d521b2204f7dcebe81c1b5fb99ed70dfb6f34b4b", "reference": "d521b2204f7dcebe81c1b5fb99ed70dfb6f34b4b",
=======
"version": "v6.0.13",
"source": {
"type": "git",
"url": "https://github.com/symfony/mime.git",
"reference": "c1d6eba531d956c23b3127dc6ae6f5ac4a90db6c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/mime/zipball/c1d6eba531d956c23b3127dc6ae6f5ac4a90db6c",
"reference": "c1d6eba531d956c23b3127dc6ae6f5ac4a90db6c",
>>>>>>> develop
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -6771,7 +6893,11 @@
"mime-type" "mime-type"
], ],
"support": { "support": {
<<<<<<< HEAD
"source": "https://github.com/symfony/mime/tree/v6.1.5" "source": "https://github.com/symfony/mime/tree/v6.1.5"
=======
"source": "https://github.com/symfony/mime/tree/v6.0.13"
>>>>>>> develop
}, },
"funding": [ "funding": [
{ {
@ -6787,7 +6913,11 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
<<<<<<< HEAD
"time": "2022-09-02T08:05:20+00:00" "time": "2022-09-02T08:05:20+00:00"
=======
"time": "2022-09-02T08:05:03+00:00"
>>>>>>> develop
}, },
{ {
"name": "symfony/polyfill-ctype", "name": "symfony/polyfill-ctype",
@ -7850,6 +7980,7 @@
}, },
{ {
"name": "symfony/string", "name": "symfony/string",
<<<<<<< HEAD
"version": "v6.1.5", "version": "v6.1.5",
"source": { "source": {
"type": "git", "type": "git",
@ -7860,6 +7991,18 @@
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/string/zipball/17c08b068176996a1d7db8d00ffae3c248267016", "url": "https://api.github.com/repos/symfony/string/zipball/17c08b068176996a1d7db8d00ffae3c248267016",
"reference": "17c08b068176996a1d7db8d00ffae3c248267016", "reference": "17c08b068176996a1d7db8d00ffae3c248267016",
=======
"version": "v6.0.13",
"source": {
"type": "git",
"url": "https://github.com/symfony/string.git",
"reference": "65e99fb179e7241606377e4042cd2161f3dd1c05"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/string/zipball/65e99fb179e7241606377e4042cd2161f3dd1c05",
"reference": "65e99fb179e7241606377e4042cd2161f3dd1c05",
>>>>>>> develop
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -7915,7 +8058,11 @@
"utf8" "utf8"
], ],
"support": { "support": {
<<<<<<< HEAD
"source": "https://github.com/symfony/string/tree/v6.1.5" "source": "https://github.com/symfony/string/tree/v6.1.5"
=======
"source": "https://github.com/symfony/string/tree/v6.0.13"
>>>>>>> develop
}, },
"funding": [ "funding": [
{ {
@ -7931,7 +8078,11 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
<<<<<<< HEAD
"time": "2022-09-02T08:05:20+00:00" "time": "2022-09-02T08:05:20+00:00"
=======
"time": "2022-09-02T08:05:03+00:00"
>>>>>>> develop
}, },
{ {
"name": "symfony/translation", "name": "symfony/translation",
@ -8112,6 +8263,7 @@
}, },
{ {
"name": "symfony/uid", "name": "symfony/uid",
<<<<<<< HEAD
"version": "v6.1.5", "version": "v6.1.5",
"source": { "source": {
"type": "git", "type": "git",
@ -8122,6 +8274,18 @@
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/uid/zipball/e03519f7b1ce1d3c0b74f751892bb41d549a2d98", "url": "https://api.github.com/repos/symfony/uid/zipball/e03519f7b1ce1d3c0b74f751892bb41d549a2d98",
"reference": "e03519f7b1ce1d3c0b74f751892bb41d549a2d98", "reference": "e03519f7b1ce1d3c0b74f751892bb41d549a2d98",
=======
"version": "v6.0.13",
"source": {
"type": "git",
"url": "https://github.com/symfony/uid.git",
"reference": "db426b27173f5e2d8b960dd10fa8ce19ea9ca5f3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/uid/zipball/db426b27173f5e2d8b960dd10fa8ce19ea9ca5f3",
"reference": "db426b27173f5e2d8b960dd10fa8ce19ea9ca5f3",
>>>>>>> develop
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -8166,7 +8330,11 @@
"uuid" "uuid"
], ],
"support": { "support": {
<<<<<<< HEAD
"source": "https://github.com/symfony/uid/tree/v6.1.5" "source": "https://github.com/symfony/uid/tree/v6.1.5"
=======
"source": "https://github.com/symfony/uid/tree/v6.0.13"
>>>>>>> develop
}, },
"funding": [ "funding": [
{ {
@ -8182,6 +8350,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
<<<<<<< HEAD
"time": "2022-09-09T09:34:27+00:00" "time": "2022-09-09T09:34:27+00:00"
}, },
{ {
@ -8196,6 +8365,22 @@
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/d0833493fb2413a86f522fb54a1896a7718e98ec", "url": "https://api.github.com/repos/symfony/var-dumper/zipball/d0833493fb2413a86f522fb54a1896a7718e98ec",
"reference": "d0833493fb2413a86f522fb54a1896a7718e98ec", "reference": "d0833493fb2413a86f522fb54a1896a7718e98ec",
=======
"time": "2022-09-09T09:33:56+00:00"
},
{
"name": "symfony/var-dumper",
"version": "v6.0.13",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-dumper.git",
"reference": "367522dc769072f2abe554013e073eb079593829"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/367522dc769072f2abe554013e073eb079593829",
"reference": "367522dc769072f2abe554013e073eb079593829",
>>>>>>> develop
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -8254,7 +8439,11 @@
"dump" "dump"
], ],
"support": { "support": {
<<<<<<< HEAD
"source": "https://github.com/symfony/var-dumper/tree/v6.1.5" "source": "https://github.com/symfony/var-dumper/tree/v6.1.5"
=======
"source": "https://github.com/symfony/var-dumper/tree/v6.0.13"
>>>>>>> develop
}, },
"funding": [ "funding": [
{ {
@ -8270,7 +8459,11 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
<<<<<<< HEAD
"time": "2022-09-08T09:34:40+00:00" "time": "2022-09-08T09:34:40+00:00"
=======
"time": "2022-09-08T09:32:44+00:00"
>>>>>>> develop
}, },
{ {
"name": "tijsverkoyen/css-to-inline-styles", "name": "tijsverkoyen/css-to-inline-styles",

View File

@ -13,7 +13,7 @@
}, },
"devDependencies": { "devDependencies": {
"@johmun/vue-tags-input": "^2", "@johmun/vue-tags-input": "^2",
"@vue/compiler-sfc": "^3.2.37", "@vue/compiler-sfc": "^3.2.40",
"axios": "^0.27", "axios": "^0.27",
"bootstrap-sass": "^3", "bootstrap-sass": "^3",
"cross-env": "^7.0", "cross-env": "^7.0",

View File

@ -1252,23 +1252,23 @@
dependencies: dependencies:
"@types/node" "*" "@types/node" "*"
"@vue/compiler-core@3.2.39": "@vue/compiler-core@3.2.40":
version "3.2.39" version "3.2.40"
resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.2.39.tgz#0d77e635f4bdb918326669155a2dc977c053943e" resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.2.40.tgz#c785501f09536748121e937fb87605bbb1ada8e5"
integrity sha512-mf/36OWXqWn0wsC40nwRRGheR/qoID+lZXbIuLnr4/AngM0ov8Xvv8GHunC0rKRIkh60bTqydlqTeBo49rlbqw== integrity sha512-2Dc3Stk0J/VyQ4OUr2yEC53kU28614lZS+bnrCbFSAIftBJ40g/2yQzf4mPBiFuqguMB7hyHaujdgZAQ67kZYA==
dependencies: dependencies:
"@babel/parser" "^7.16.4" "@babel/parser" "^7.16.4"
"@vue/shared" "3.2.39" "@vue/shared" "3.2.40"
estree-walker "^2.0.2" estree-walker "^2.0.2"
source-map "^0.6.1" source-map "^0.6.1"
"@vue/compiler-dom@3.2.39": "@vue/compiler-dom@3.2.40":
version "3.2.39" version "3.2.40"
resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.2.39.tgz#bd69d35c1a48fe2cea4ab9e96d2a3a735d146fdf" resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.2.40.tgz#c225418773774db536174d30d3f25ba42a33e7e4"
integrity sha512-HMFI25Be1C8vLEEv1hgEO1dWwG9QQ8LTTPmCkblVJY/O3OvWx6r1+zsox5mKPMGvqYEZa6l8j+xgOfUspgo7hw== integrity sha512-OZCNyYVC2LQJy4H7h0o28rtk+4v+HMQygRTpmibGoG9wZyomQiS5otU7qo3Wlq5UfHDw2RFwxb9BJgKjVpjrQw==
dependencies: dependencies:
"@vue/compiler-core" "3.2.39" "@vue/compiler-core" "3.2.40"
"@vue/shared" "3.2.39" "@vue/shared" "3.2.40"
"@vue/compiler-sfc@2.7.10": "@vue/compiler-sfc@2.7.10":
version "2.7.10" version "2.7.10"
@ -1279,29 +1279,29 @@
postcss "^8.4.14" postcss "^8.4.14"
source-map "^0.6.1" source-map "^0.6.1"
"@vue/compiler-sfc@^3.2.37": "@vue/compiler-sfc@^3.2.40":
version "3.2.39" version "3.2.40"
resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.2.39.tgz#8fe29990f672805b7c5a2ecfa5b05e681c862ea2" resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.2.40.tgz#61823283efc84d25d9d2989458f305d32a2ed141"
integrity sha512-fqAQgFs1/BxTUZkd0Vakn3teKUt//J3c420BgnYgEOoVdTwYpBTSXCMJ88GOBCylmUBbtquGPli9tVs7LzsWIA== integrity sha512-tzqwniIN1fu1PDHC3CpqY/dPCfN/RN1thpBC+g69kJcrl7mbGiHKNwbA6kJ3XKKy8R6JLKqcpVugqN4HkeBFFg==
dependencies: dependencies:
"@babel/parser" "^7.16.4" "@babel/parser" "^7.16.4"
"@vue/compiler-core" "3.2.39" "@vue/compiler-core" "3.2.40"
"@vue/compiler-dom" "3.2.39" "@vue/compiler-dom" "3.2.40"
"@vue/compiler-ssr" "3.2.39" "@vue/compiler-ssr" "3.2.40"
"@vue/reactivity-transform" "3.2.39" "@vue/reactivity-transform" "3.2.40"
"@vue/shared" "3.2.39" "@vue/shared" "3.2.40"
estree-walker "^2.0.2" estree-walker "^2.0.2"
magic-string "^0.25.7" magic-string "^0.25.7"
postcss "^8.1.10" postcss "^8.1.10"
source-map "^0.6.1" source-map "^0.6.1"
"@vue/compiler-ssr@3.2.39": "@vue/compiler-ssr@3.2.40":
version "3.2.39" version "3.2.40"
resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.2.39.tgz#4f3bfb535cb98b764bee45e078700e03ccc60633" resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.2.40.tgz#67df95a096c63e9ec4b50b84cc6f05816793629c"
integrity sha512-EoGCJ6lincKOZGW+0Ky4WOKsSmqL7hp1ZYgen8M7u/mlvvEQUaO9tKKOy7K43M9U2aA3tPv0TuYYQFrEbK2eFQ== integrity sha512-80cQcgasKjrPPuKcxwuCx7feq+wC6oFl5YaKSee9pV3DNq+6fmCVwEEC3vvkf/E2aI76rIJSOYHsWSEIxK74oQ==
dependencies: dependencies:
"@vue/compiler-dom" "3.2.39" "@vue/compiler-dom" "3.2.40"
"@vue/shared" "3.2.39" "@vue/shared" "3.2.40"
"@vue/component-compiler-utils@^3.1.0": "@vue/component-compiler-utils@^3.1.0":
version "3.3.0" version "3.3.0"
@ -1319,21 +1319,21 @@
optionalDependencies: optionalDependencies:
prettier "^1.18.2 || ^2.0.0" prettier "^1.18.2 || ^2.0.0"
"@vue/reactivity-transform@3.2.39": "@vue/reactivity-transform@3.2.40":
version "3.2.39" version "3.2.40"
resolved "https://registry.yarnpkg.com/@vue/reactivity-transform/-/reactivity-transform-3.2.39.tgz#da6ae6c8fd77791b9ae21976720d116591e1c4aa" resolved "https://registry.yarnpkg.com/@vue/reactivity-transform/-/reactivity-transform-3.2.40.tgz#dc24b9074b26f0d9dd2034c6349f5bb2a51c86ac"
integrity sha512-HGuWu864zStiWs9wBC6JYOP1E00UjMdDWIG5W+FpUx28hV3uz9ODOKVNm/vdOy/Pvzg8+OcANxAVC85WFBbl3A== integrity sha512-HQUCVwEaacq6fGEsg2NUuGKIhUveMCjOk8jGHqLXPI2w6zFoPrlQhwWEaINTv5kkZDXKEnCijAp+4gNEHG03yw==
dependencies: dependencies:
"@babel/parser" "^7.16.4" "@babel/parser" "^7.16.4"
"@vue/compiler-core" "3.2.39" "@vue/compiler-core" "3.2.40"
"@vue/shared" "3.2.39" "@vue/shared" "3.2.40"
estree-walker "^2.0.2" estree-walker "^2.0.2"
magic-string "^0.25.7" magic-string "^0.25.7"
"@vue/shared@3.2.39": "@vue/shared@3.2.40":
version "3.2.39" version "3.2.40"
resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.39.tgz#302df167559a1a5156da162d8cc6760cef67f8e3" resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.40.tgz#e57799da2a930b975321981fcee3d1e90ed257ae"
integrity sha512-D3dl2ZB9qE6mTuWPk9RlhDeP1dgNRUKC3NJxji74A4yL8M2MwlhLKUC/49WHjrNzSPug58fWx/yFbaTzGAQSBw== integrity sha512-0PLQ6RUtZM0vO3teRfzGi4ltLUO5aO+kLgwh4Um3THSR03rpQWLTuRCkuO5A41ITzwdWeKdPHtSARuPkoo5pCQ==
"@webassemblyjs/ast@1.11.1": "@webassemblyjs/ast@1.11.1":
version "1.11.1" version "1.11.1"
@ -4293,9 +4293,9 @@ postcss@^7.0.36:
source-map "^0.6.1" source-map "^0.6.1"
postcss@^8.1.10, postcss@^8.2.15, postcss@^8.4, postcss@^8.4.14: postcss@^8.1.10, postcss@^8.2.15, postcss@^8.4, postcss@^8.4.14:
version "8.4.16" version "8.4.17"
resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.16.tgz#33a1d675fac39941f5f445db0de4db2b6e01d43c" resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.17.tgz#f87863ec7cd353f81f7ab2dec5d67d861bbb1be5"
integrity sha512-ipHE1XBvKzm5xI7hiHCZJCSugxvsdq2mPnsq5+UF+VHCjiBvtDrlxJfMBToWaP9D5XlgNmcFGqoHmUn0EYEaRQ== integrity sha512-UNxNOLQydcOFi41yHNMcKRZ39NeXlr8AxGuZJsdub8vIb12fHzcq37DTU/QtbI6WLxNg2gF9Z+8qtRwTj1UI1Q==
dependencies: dependencies:
nanoid "^3.3.4" nanoid "^3.3.4"
picocolors "^1.0.0" picocolors "^1.0.0"