From a725a2e2ea59d98386d2ec5da259ee9ceb0aeb7e Mon Sep 17 00:00:00 2001 From: Charllie Quadros <charllie@zoocha.com> Date: Sat, 15 Mar 2025 13:09:45 -0300 Subject: [PATCH 1/2] Enforce ASCII character encoding on string items --- .../Drupal/Core/Field/Plugin/Field/FieldType/StringItem.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/StringItem.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/StringItem.php index cbe14fab7378..19d46fbb35b3 100644 --- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/StringItem.php +++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/StringItem.php @@ -66,6 +66,9 @@ public function getConstraints() { '%name' => $label, '@max' => $max_length, ]); + if ($this->getFieldDefinition()->getSetting('is_ascii') === TRUE) { + $length_constraint_config['charset'] = 'ASCII'; + } } $constraints[] = $constraint_manager->create('ComplexData', [ 'value' => [ -- GitLab From 1b8d3354994b9debfe7f7ea8509b86590cb5a7ea Mon Sep 17 00:00:00 2001 From: Charllie Quadros <charllie@zoocha.com> Date: Sat, 15 Mar 2025 13:36:42 -0300 Subject: [PATCH 2/2] Fix variable name to the correct one --- .../Drupal/Core/Field/Plugin/Field/FieldType/StringItem.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/StringItem.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/StringItem.php index 19d46fbb35b3..fc7d08acf69c 100644 --- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/StringItem.php +++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/StringItem.php @@ -66,9 +66,9 @@ public function getConstraints() { '%name' => $label, '@max' => $max_length, ]); - if ($this->getFieldDefinition()->getSetting('is_ascii') === TRUE) { - $length_constraint_config['charset'] = 'ASCII'; - } + } + if ($this->getFieldDefinition()->getSetting('is_ascii') === TRUE) { + $options['charset'] = 'ASCII'; } $constraints[] = $constraint_manager->create('ComplexData', [ 'value' => [ -- GitLab