Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-07 18:44:08 +00:00
Code Issues Actions Projects Releases Wiki Activity

Export: ListPerson: avoid json_decoding the string '_header'

Browse Source
This commit is contained in:
Julien Fastré 2023-11-27 21:02:39 +01:00
parent 5f441eb5ac
commit 4727a57825
Signed by: julienfastre
GPG Key ID: BDE2190974723FCB
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.changes/unreleased/Fixed-20231127-210138.yaml Normal file
View File

@ -0,0 +1,5 @@
kind: Fixed
body: 'Export: fix list person with custom fields'
time: 2023-11-27T21:01:38.260730706+01:00
custom:
Issue: ""

7
src/Bundle/ChillPersonBundle/Export/Export/ListPerson.php
View File

@ -332,7 +332,6 @@ class ListPerson implements ExportElementValidatedInterface, ListInterface, Grou
if (null === $value) { if (null === $value) {
return ''; return '';
} }
$decoded = json_decode((string) $value, true, 512, JSON_THROW_ON_ERROR);
if ('_header' === $value) { if ('_header' === $value) {
$label = $cfType->getChoices($cf)[$slugChoice]; $label = $cfType->getChoices($cf)[$slugChoice];
@ -341,6 +340,12 @@ class ListPerson implements ExportElementValidatedInterface, ListInterface, Grou
.' | '.$label; .' | '.$label;
} }
try {
$decoded = json_decode((string) $value, true, 512, JSON_THROW_ON_ERROR);
} catch (\JsonException $e) {
throw new \RuntimeException(sprintf('unable to decode json: %s, %s', json_last_error(), json_last_error_msg()), $e->getCode(), $e);
}
if ('_other' === $slugChoice && $cfType->isChecked($cf, $slugChoice, $decoded)) { if ('_other' === $slugChoice && $cfType->isChecked($cf, $slugChoice, $decoded)) {
return $cfType->extractOtherValue($cf, $decoded); return $cfType->extractOtherValue($cf, $decoded);
} }