[Validator] Add string normalization options to the LengthValidator

renan-taranto · renan-taranto · commit d1d6e22bdf57 · 2018-03-10T22:36:16.000-03:00
Add three new options to the LengthValidator:
- ltrim
- rtrim
- mergeConsecutiveWhitespaces
diff --git a/src/Symfony/Component/Validator/Constraints/Length.php b/src/Symfony/Component/Validator/Constraints/Length.php
@@ -39,6 +39,9 @@ class Length extends Constraint
     public $max;
     public $min;
     public $charset = 'UTF-8';
+    public $ltrim;
+    public $rtrim;
+    public $mergeConsecutiveWhitespaces;
 
     public function __construct($options = null)
     {
diff --git a/src/Symfony/Component/Validator/Constraints/LengthValidator.php b/src/Symfony/Component/Validator/Constraints/LengthValidator.php
@@ -39,6 +39,17 @@ public function validate($value, Constraint $constraint)
 
         $stringValue = (string) $value;
 
+        $stringValue = $constraint->ltrim ? ltrim($stringValue) : $stringValue;
+        $stringValue = $constraint->rtrim ? rtrim($stringValue) : $stringValue;
+
+        if ($constraint->mergeConsecutiveWhitespaces) {
+            $stringValue = preg_replace(
+                array('/[\r\n]+/', '/\t+/', '/\x0B+/', '/ +/'),
+                array("\n", "\t", "\x0B", ' '),
+                $stringValue
+            );
+        }
+
         if (!$invalidCharset = !@mb_check_encoding($stringValue, $constraint->charset)) {
             $length = mb_strlen($stringValue, $constraint->charset);
         }
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LengthValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LengthValidatorTest.php
@@ -92,6 +92,39 @@ public function getOneCharset()
         );
     }
 
+    public function getThreeCharactersWithLeadingWhitespaces()
+    {
+        return array(
+            array("\x20123"),
+            array("\x09üüü"),
+            array("\x0Aééé"),
+            array("\x0D123"),
+            array("\x0Bééé"),
+        );
+    }
+
+    public function getThreeCharactersWithTrailingWhitespaces()
+    {
+        return array(
+            array("123\x20"),
+            array("üüü\x09"),
+            array("ééé\x0A"),
+            array("123\x0D"),
+            array("ééé\x0B"),
+        );
+    }
+
+    public function getThreeCharactersWithConsecutiveWhitespaces()
+    {
+        return array(
+            array("123\x20\x20"),
+            array("\x09\x09üüü"),
+            array("é\x0A\x0Aéé"),
+            array("123\x0D\x0D"),
+            array("éé\x0B\x0Bé"),
+        );
+    }
+
     /**
      * @dataProvider getFiveOrMoreCharacters
      */
@@ -125,6 +158,39 @@ public function testValidValuesExact($value)
         $this->assertNoViolation();
     }
 
+    /**
+     * @dataProvider getThreeCharactersWithLeadingWhitespaces
+     */
+    public function testValidValuesLtrim($value)
+    {
+        $constraint = new Length(array('min' => 3, 'max' => 3, 'ltrim' => true));
+        $this->validator->validate($value, $constraint);
+
+        $this->assertNoViolation();
+    }
+
+    /**
+     * @dataProvider getThreeCharactersWithTrailingWhitespaces
+     */
+    public function testValidValuesRtrim($value)
+    {
+        $constraint = new Length(array('min' => 3, 'max' => 3, 'rtrim' => true));
+        $this->validator->validate($value, $constraint);
+
+        $this->assertNoViolation();
+    }
+
+    /**
+     * @dataProvider getThreeCharactersWithConsecutiveWhitespaces
+     */
+    public function testValidValuesMergeConsecutiveWhitespaces($value)
+    {
+        $constraint = new Length(array('min' => 4, 'max' => 4, 'mergeConsecutiveWhitespaces' => true));
+        $this->validator->validate($value, $constraint);
+
+        $this->assertNoViolation();
+    }
+
     /**
      * @dataProvider getThreeOrLessCharacters
      */

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,9 @@ class Length extends Constraint`
`39`	`39`	`public $max;`
`40`	`40`	`public $min;`
`41`	`41`	`public $charset = 'UTF-8';`
	`42`	`+ public $ltrim;`
	`43`	`+ public $rtrim;`
	`44`	`+ public $mergeConsecutiveWhitespaces;`
`42`	`45`
`43`	`46`	`public function __construct($options = null)`
`44`	`47`	`{`