[Validator] Update NotBlankValidator "trim" option to be Unicode aware

renan-taranto · renan-taranto · commit 4194fcf90008 · 2018-03-12T20:25:33.000-03:00
diff --git a/src/Symfony/Component/Validator/Constraints/NotBlankValidator.php b/src/Symfony/Component/Validator/Constraints/NotBlankValidator.php
@@ -29,7 +29,7 @@ public function validate($value, Constraint $constraint)
             throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\NotBlank');
         }
 
-        $normalizedValue = $constraint->trim ? trim($value) : $value;
+        $normalizedValue = $constraint->trim && is_string($value) ? preg_replace('/[\pZ\pC]+/u', '', $value) : $value;
 
         if (false === $normalizedValue || (empty($normalizedValue) && '0' != $normalizedValue)) {
             $this->context->buildViolation($constraint->message)
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/NotBlankValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/NotBlankValidatorTest.php
@@ -46,11 +46,11 @@ public function getValidValues()
     public function getWhitespaces()
     {
         return array(
-            array("\x20"),
-            array("\x09"),
-            array("\x0A"),
-            array("\x0D"),
-            array("\x0B"),
+            array("\u{0020}"),
+            array("\u{00A0}\u{00A0}"),
+            array("\u{1680}\u{1680}"),
+            array("\u{200B}"),
+            array("\u{FEFF}"),
         );
     }
 

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public function validate($value, Constraint $constraint)`
`29`	`29`	`throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\NotBlank');`
`30`	`30`	`}`
`31`	`31`
`32`		`- $normalizedValue = $constraint->trim ? trim($value) : $value;`
	`32`	`+ $normalizedValue = $constraint->trim && is_string($value) ? preg_replace('/[\pZ\pC]+/u', '', $value) : $value;`
`33`	`33`
`34`	`34`	`if (false === $normalizedValue \|\| (empty($normalizedValue) && '0' != $normalizedValue)) {`
`35`	`35`	`$this->context->buildViolation($constraint->message)`