symfony
diff --git a/‎src/Symfony/Component/Validator/Constraints/LengthValidator.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Constraints/LengthValidator.php
+3-3Lines changed: 3 additions & 3 deletions b/‎src/Symfony/Component/Validator/Constraints/LengthValidator.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Constraints/LengthValidator.php
+3-3Lines changed: 3 additions & 3 deletions
diff --git a/‎src/Symfony/Component/Validator/Tests/Constraints/LengthValidatorTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Tests/Constraints/LengthValidatorTest.php
+11-15Lines changed: 11 additions & 15 deletions b/‎src/Symfony/Component/Validator/Tests/Constraints/LengthValidatorTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Tests/Constraints/LengthValidatorTest.php
+11-15Lines changed: 11 additions & 15 deletions
@@ -40,10 +40,10 @@ public function validate($value, Constraint $constraint)
         $stringValue = (string) $value;
         $normalizedString = $stringValue;
 
-        $normalizedString = $constraint->ltrim ? ltrim($normalizedString) : $normalizedString;
-        $normalizedString = $constraint->rtrim ? rtrim($normalizedString) : $normalizedString;
+        $normalizedString = $constraint->ltrim ? preg_replace('/^[\pZ\pC]+/u', '', $normalizedString) : $normalizedString;
+        $normalizedString = $constraint->rtrim ? preg_replace('/[\pZ\pC]+$/u', '', $normalizedString) : $normalizedString;
 
-        $normalizedString = $constraint->mergeConsecutiveWhitespaces ? preg_replace('/\s+/', ' ', $normalizedString) : $normalizedString;
+        $normalizedString = $constraint->mergeConsecutiveWhitespaces ? preg_replace('/[\pZ\pC]+/u', ' ', $normalizedString) : $normalizedString;
 
         if (!$invalidCharset = !@mb_check_encoding($stringValue, $constraint->charset)) {
             $length = mb_strlen($normalizedString, $constraint->charset);
 
@@ -95,33 +95,29 @@ public function getOneCharset()
     public function getThreeCharactersWithLeadingWhitespaces()
     {
         return array(
-            array("\x20123"),
-            array("\x09üüü"),
-            array("\x0Aééé"),
-            array("\x0D123"),
-            array("\x0Bééé"),
+            array("\u{0020}ccc"),
+            array("\u{00A0}c\u{00A0}c"),
+            array("\u{1680}cc\u{1680}"),
+            array("\u{200B}\u{200B}ccc"),
         );
     }
 
     public function getThreeCharactersWithTrailingWhitespaces()
     {
         return array(
-            array("123\x20"),
-            array("üüü\x09"),
-            array("ééé\x0A"),
-            array("123\x0D"),
-            array("ééé\x0B"),
+            array("ccc\u{0020}"),
+            array("c\u{00A0}c\u{00A0}"),
+            array("\u{1680}cc\u{1680}"),
+            array("ccc\u{200B}\u{200B}"),
         );
     }
 
     public function getThreeCharactersWithConsecutiveWhitespaces()
     {
         return array(
-            array("123\x20\x20"),
-            array("\x09\x09üüü"),
-            array("é\x0A\x0Aéé"),
-            array("123\x0D\x0D"),
-            array("éé\x0B\x0Bé"),
+            array("ccc\u{0020}\u{0020}"),
+            array("\u{00A0}\u{00A0}ccc"),
+            array("c\u{1680}\u{1680}c\u{1680}"),
         );
     }