[Validator] Add "trim" option to the NotBlankValidator

renan-taranto · renan-taranto · commit df450ee5550c · 2018-03-10T22:36:16.000-03:00
diff --git a/src/Symfony/Component/Validator/Constraints/NotBlank.php b/src/Symfony/Component/Validator/Constraints/NotBlank.php
@@ -28,4 +28,5 @@ class NotBlank extends Constraint
     );
 
     public $message = 'This value should not be blank.';
+    public $trim;
 }
diff --git a/src/Symfony/Component/Validator/Constraints/NotBlankValidator.php b/src/Symfony/Component/Validator/Constraints/NotBlankValidator.php
@@ -29,6 +29,8 @@ public function validate($value, Constraint $constraint)
             throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\NotBlank');
         }
 
+        $value = $constraint->trim ? trim($value) : $value;
+        
         if (false === $value || (empty($value) && '0' != $value)) {
             $this->context->buildViolation($constraint->message)
                 ->setParameter('{{ value }}', $this->formatValue($value))
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/NotBlankValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/NotBlankValidatorTest.php
@@ -31,7 +31,7 @@ public function testValidValues($value)
 
         $this->assertNoViolation();
     }
-
+    
     public function getValidValues()
     {
         return array(
@@ -42,6 +42,17 @@ public function getValidValues()
             array(1234),
         );
     }
+    
+    public function getWhitespaces()
+    {
+        return array(
+            array("\x20"),
+            array("\x09"),
+            array("\x0A"),
+            array("\x0D"),
+            array("\x0B"),
+        );
+    }
 
     public function testNullIsInvalid()
     {
@@ -98,4 +109,22 @@ public function testEmptyArrayIsInvalid()
             ->setCode(NotBlank::IS_BLANK_ERROR)
             ->assertRaised();
     }
+    
+    /**
+     * @dataProvider getWhitespaces
+     */
+    public function testInvalidTrimmedValues($value)
+    {
+        $constraint = new NotBlank(array(
+            'message' => 'myMessage',
+            'trim' => true
+        ));
+
+        $this->validator->validate($value, $constraint);
+
+        $this->buildViolation('myMessage')
+            ->setParameter('{{ value }}', '""')
+            ->setCode(NotBlank::IS_BLANK_ERROR)
+            ->assertRaised();
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -28,4 +28,5 @@ class NotBlank extends Constraint`
`28`	`28`	`);`
`29`	`29`
`30`	`30`	`public $message = 'This value should not be blank.';`
	`31`	`+ public $trim;`
`31`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,8 @@ public function validate($value, Constraint $constraint)`
`29`	`29`	`throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\NotBlank');`
`30`	`30`	`}`
`31`	`31`
	`32`	`+ $value = $constraint->trim ? trim($value) : $value;`
	`33`	`+`
`32`	`34`	`if (false === $value \|\| (empty($value) && '0' != $value)) {`
`33`	`35`	`$this->context->buildViolation($constraint->message)`
`34`	`36`	`->setParameter('{{ value }}', $this->formatValue($value))`