Skip to content

Commit e340c3c

Browse files
authored
solidify check for empty value in output transformer, fixes #486 (#513)
1 parent 80a5651 commit e340c3c

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

UPGRADE.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
## 5.3.0
44
- **[IMPROVEMENT]** New field added to `form_builder_form_attributes`: `autocomplete`
5+
- **[BUGFIX]** Solidify check for empty value in output transformer [#486](https://github.com/dachcom-digital/pimcore-formbuilder/issues/508)
56

67
## 5.2.0
78
- **[LICENSE]** Dual-License with GPL and Dachcom Commercial License (DCL) added

src/Transformer/Output/FallbackTransformer.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ protected function parseDynamicField(FormFieldDynamicDefinitionInterface $field,
7070

7171
protected function parseDefaultField(mixed $value, FormInterface $formField, ?string $locale): mixed
7272
{
73-
if (empty($value)) {
73+
if ($value === null || $value === '') {
7474
return $value;
7575
}
7676

@@ -164,15 +164,15 @@ protected function parseDynamicLabel(FormFieldDynamicDefinitionInterface $field,
164164
$label = $formField->getConfig()->hasOption('label') ? $formField->getConfig()->getOption('label') : $field->getName();
165165
$optionalOptions = $field->getOptional();
166166

167-
$emailLabel = isset($optionalOptions['email_label']) && !empty($optionalOptions['email_label'])
167+
$emailLabel = !empty($optionalOptions['email_label'])
168168
? $this->translator->trans($optionalOptions['email_label'], [], null, $locale)
169169
: null;
170170

171171
if (!empty($emailLabel)) {
172172
return $emailLabel;
173173
}
174174

175-
return isset($label) && !empty($label)
175+
return !empty($label)
176176
? $this->translator->trans($label, [], null, $locale)
177177
: $label;
178178
}
@@ -186,15 +186,15 @@ protected function parseDefaultLabel(FieldDefinitionInterface $field, ?string $l
186186
$fieldOptions = $field->getOptions();
187187
$optionalOptions = $field->getOptional();
188188

189-
$emailLabel = isset($optionalOptions['email_label']) && !empty($optionalOptions['email_label'])
189+
$emailLabel = !empty($optionalOptions['email_label'])
190190
? $this->translator->trans($optionalOptions['email_label'], [], null, $locale)
191191
: null;
192192

193193
if (!empty($emailLabel)) {
194194
return $emailLabel;
195195
}
196196

197-
return isset($fieldOptions['label']) && !empty($fieldOptions['label'])
197+
return !empty($fieldOptions['label'])
198198
? $this->translator->trans($fieldOptions['label'], [], null, $locale)
199199
: $field->getName();
200200
}

0 commit comments

Comments
 (0)