Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions UPGRADE.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Upgrade Notes

## 5.3.3
- **[BUGFIX]** Sanitize form field values by removing template tags during output transformation

## 5.3.2
- **[BUGFIX]** Validate and cast formId to integer in RequestListener

Expand Down
21 changes: 17 additions & 4 deletions src/Form/FormValuesOutputApplier.php
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,9 @@ protected function parseField(
mixed $fieldRawValue,
array $ignoreFields
): ?array {

$fieldRawValue = $this->sanitizeString($fieldRawValue);

if ($fieldDefinition instanceof FormFieldContainerDefinitionInterface) {
$subFieldValues = [];
foreach ($this->getFormSubFields($formField) as $index => $subFieldCollection) {
Expand Down Expand Up @@ -124,8 +127,8 @@ protected function parseField(
protected function transformFormBuilderContainerField(FormFieldContainerDefinitionInterface $fieldDefinition, array $subFormFields, ?string $locale): ?array
{
$fieldConfig = $fieldDefinition->getConfiguration();
$containerLabel = isset($fieldConfig['label']) && !empty($fieldConfig['label']) ? $fieldConfig['label'] : false;
$blockLabel = isset($fieldConfig['block_label']) && !empty($fieldConfig['block_label']) ? $fieldConfig['block_label'] : false;
$containerLabel = !empty($fieldConfig['label']) ? $fieldConfig['label'] : false;
$blockLabel = !empty($fieldConfig['block_label']) ? $fieldConfig['block_label'] : false;

return [
'field_type' => FormValuesOutputApplierInterface::FIELD_TYPE_CONTAINER,
Expand All @@ -140,15 +143,15 @@ protected function transformFormBuilderContainerField(FormFieldContainerDefiniti
protected function transformDynamicField(FormFieldDynamicDefinitionInterface $fieldDefinition, FormInterface $formField, mixed $rawValue, ?string $locale): ?array
{
$optionals = $fieldDefinition->getOptional();
$outputTransformerIdentifier = isset($optionals['output_transformer']) && !empty($optionals['output_transformer']) ? $optionals['output_transformer'] : '';
$outputTransformerIdentifier = !empty($optionals['output_transformer']) ? $optionals['output_transformer'] : '';

return $this->parseFieldValueWithOutputTransformer($fieldDefinition, $formField, $outputTransformerIdentifier, $rawValue, $locale);
}

protected function transformFormBuilderField(FormFieldDefinitionInterface $fieldDefinition, FormInterface $formField, mixed $rawValue, ?string $locale): ?array
{
$formType = $this->configuration->getFieldTypeConfig($fieldDefinition->getType());
$outputTransformerIdentifier = isset($formType['output_transformer']) && !empty($formType['output_transformer']) ? $formType['output_transformer'] : '';
$outputTransformerIdentifier = !empty($formType['output_transformer']) ? $formType['output_transformer'] : '';

return $this->parseFieldValueWithOutputTransformer($fieldDefinition, $formField, $outputTransformerIdentifier, $rawValue, $locale);
}
Expand All @@ -160,6 +163,7 @@ protected function parseFieldValueWithOutputTransformer(
mixed $rawValue,
?string $locale
): ?array {

$defaults = [
'field_type' => FormValuesOutputApplierInterface::FIELD_TYPE_SIMPLE,
'name' => $fieldDefinition->getName(),
Expand Down Expand Up @@ -239,4 +243,13 @@ protected function isEmptyValue(mixed $formFieldValue): bool
{
return empty($formFieldValue) && $formFieldValue !== 0 && $formFieldValue !== '0';
}

protected function sanitizeString(mixed $value): mixed
{
if (!is_string($value)) {
return $value;
}

return preg_replace('/\{\{\s*(.*?)\s*\}\}|\{\%\s*(.*?)\s*\%\}/s', '$1$2', $value);
}
}