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
+5-10Lines changed: 5 additions & 10 deletions b/‎src/Symfony/Component/Validator/Constraints/LengthValidator.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Constraints/LengthValidator.php
+5-10Lines changed: 5 additions & 10 deletions
diff --git a/‎src/Symfony/Component/Validator/Constraints/NotBlank.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Constraints/NotBlank.php
+1Lines changed: 1 addition & 0 deletions b/‎src/Symfony/Component/Validator/Constraints/NotBlank.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Constraints/NotBlank.php
+1Lines changed: 1 addition & 0 deletions
diff --git a/‎src/Symfony/Component/Validator/Constraints/NotBlankValidator.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Constraints/NotBlankValidator.php
+3-1Lines changed: 3 additions & 1 deletion b/‎src/Symfony/Component/Validator/Constraints/NotBlankValidator.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Constraints/NotBlankValidator.php
+3-1Lines changed: 3 additions & 1 deletion
diff --git a/‎src/Symfony/Component/Validator/Tests/Constraints/NotBlankValidatorTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Tests/Constraints/NotBlankValidatorTest.php
+29Lines changed: 29 additions & 0 deletions b/‎src/Symfony/Component/Validator/Tests/Constraints/NotBlankValidatorTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Tests/Constraints/NotBlankValidatorTest.php
+29Lines changed: 29 additions & 0 deletions
@@ -38,20 +38,15 @@ public function validate($value, Constraint $constraint)
         }
 
         $stringValue = (string) $value;
+        $normalizedString = $stringValue;
 
-        $stringValue = $constraint->ltrim ? ltrim($stringValue) : $stringValue;
-        $stringValue = $constraint->rtrim ? rtrim($stringValue) : $stringValue;
+        $normalizedString = $constraint->ltrim ? ltrim($normalizedString) : $normalizedString;
+        $normalizedString = $constraint->rtrim ? rtrim($normalizedString) : $normalizedString;
 
-        if ($constraint->mergeConsecutiveWhitespaces) {
-            $stringValue = preg_replace(
-                array('/[\r\n]+/', '/\t+/', '/\x0B+/', '/ +/'),
-                array("\n", "\t", "\x0B", ' '),
-                $stringValue
-            );
-        }
+        $normalizedString = $constraint->mergeConsecutiveWhitespaces ? preg_replace('/\s+/', ' ', $normalizedString) : $normalizedString;
 
         if (!$invalidCharset = !@mb_check_encoding($stringValue, $constraint->charset)) {
-            $length = mb_strlen($stringValue, $constraint->charset);
+            $length = mb_strlen($normalizedString, $constraint->charset);
         }
 
         if ($invalidCharset) {
 
@@ -28,4 +28,5 @@ class NotBlank extends Constraint
     );
 
     public $message = 'This value should not be blank.';
+    public $trim;
 }
@@ -29,7 +29,9 @@ public function validate($value, Constraint $constraint)
             throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\NotBlank');
         }
 
-        if (false === $value || (empty($value) && '0' != $value)) {
+        $normalizedValue = $constraint->trim ? trim($value) : $value;
+
+        if (false === $normalizedValue || (empty($normalizedValue) && '0' != $normalizedValue)) {
             $this->context->buildViolation($constraint->message)
                 ->setParameter('{{ value }}', $this->formatValue($value))
                 ->setCode(NotBlank::IS_BLANK_ERROR)
 
@@ -43,6 +43,17 @@ public function getValidValues()
         );
     }
 
+    public function getWhitespaces()
+    {
+        return array(
+            array("\x20"),
+            array("\x09"),
+            array("\x0A"),
+            array("\x0D"),
+            array("\x0B"),
+        );
+    }
+
     public function testNullIsInvalid()
     {
         $constraint = new NotBlank(array(
@@ -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 }}', '"'.$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`	`}`