symfony
diff --git a/‎src/Symfony/Component/Validator/Constraints/Iban.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Constraints/Iban.php
+6Lines changed: 6 additions & 0 deletions b/‎src/Symfony/Component/Validator/Constraints/Iban.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Constraints/Iban.php
+6Lines changed: 6 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Validator/Constraints/IbanValidator.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Constraints/IbanValidator.php
+18Lines changed: 18 additions & 0 deletions b/‎src/Symfony/Component/Validator/Constraints/IbanValidator.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Constraints/IbanValidator.php
+18Lines changed: 18 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Validator/Tests/Constraints/IbanValidatorTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Tests/Constraints/IbanValidatorTest.php
+33Lines changed: 33 additions & 0 deletions b/‎src/Symfony/Component/Validator/Tests/Constraints/IbanValidatorTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Tests/Constraints/IbanValidatorTest.php
+33Lines changed: 33 additions & 0 deletions
@@ -28,14 +28,20 @@ class Iban extends Constraint
     const CHECKSUM_FAILED_ERROR = 'b9401321-f9bf-4dcb-83c1-f31094440795';
     const INVALID_FORMAT_ERROR = 'c8d318f1-2ecc-41ba-b983-df70d225cf5a';
     const NOT_SUPPORTED_COUNTRY_CODE_ERROR = 'e2c259f3-4b46-48e6-b72e-891658158ec8';
+    const INVALID_CASE_ERROR = 'd58f8108-22b8-4a4b-a151-09b40fa416a6';
+    const INVALID_SPACES_ERROR = 'cf0325f4-5c35-47a8-a360-51dac05b6540';
 
     protected static $errorNames = [
         self::INVALID_COUNTRY_CODE_ERROR => 'INVALID_COUNTRY_CODE_ERROR',
         self::INVALID_CHARACTERS_ERROR => 'INVALID_CHARACTERS_ERROR',
         self::CHECKSUM_FAILED_ERROR => 'CHECKSUM_FAILED_ERROR',
         self::INVALID_FORMAT_ERROR => 'INVALID_FORMAT_ERROR',
         self::NOT_SUPPORTED_COUNTRY_CODE_ERROR => 'NOT_SUPPORTED_COUNTRY_CODE_ERROR',
+        self::INVALID_CASE_ERROR => 'INVALID_CASE_ERROR',
+        self::INVALID_SPACES_ERROR => 'INVALID_SPACES_ERROR',
     ];
 
     public $message = 'This is not a valid International Bank Account Number (IBAN).';
+    public $allowLowerCase = true;
+    public $allowSpaces = true;
 }
@@ -156,6 +156,24 @@ public function validate($value, Constraint $constraint)
 
         $value = (string) $value;
 
+        if(!$constraint->allowSpaces && preg_match('/\s/', $value)){
+            $this->context->buildViolation($constraint->message)
+                ->setParameter('{{ value }}', $this->formatValue($value))
+                ->setCode(Iban::INVALID_SPACES_ERROR)
+                ->addViolation();
+
+            return;
+        }
+
+        if (!$constraint->allowLowerCase && strtoupper($value) !== $value) {
+            $this->context->buildViolation($constraint->message)
+                ->setParameter('{{ value }}', $this->formatValue($value))
+                ->setCode(Iban::INVALID_CASE_ERROR)
+                ->addViolation();
+
+            return;
+        }
+
         // Remove spaces and convert to uppercase
         $canonicalized = str_replace(' ', '', strtoupper($value));
 
 
@@ -51,6 +51,7 @@ public function getValidIbans()
         return [
             ['CH9300762011623852957'], // Switzerland without spaces
             ['CH93  0076 2011 6238 5295 7'], // Switzerland with multiple spaces
+            ['ch93  0076 2011 6238 5295 7'], // Switzerland in lower case
 
             // Country list
             // http://www.rbs.co.uk/corporate/international/g0/guide-to-international-business/regulatory-information/iban/iban-example.ashx
@@ -432,6 +433,38 @@ public function getIbansWithInvalidCountryCode()
         ];
     }
 
+    public function testInvalidIbanDisallowLowerCase(){
+        $iban = "fr14 2004 1010 0505 0001 3M02 606";
+
+        $constraint = new Iban([
+            'message' => 'myMessage',
+            'allowLowerCase' => false,
+        ]);
+
+        $this->validator->validate($iban, $constraint);
+
+        $this->buildViolation('myMessage')
+            ->setParameter('{{ value }}', '"'.$iban.'"')
+            ->setCode(Iban::INVALID_CASE_ERROR)
+            ->assertRaised();
+    }
+
+    public function testInvalidIbanDisallowSpaces(){
+        $iban = "FR14 2004 1010 0505 0001 3M02 605";
+
+        $constraint = new Iban([
+            'message' => 'myMessage',
+            'allowSpaces' => false,
+        ]);
+
+        $this->validator->validate($iban, $constraint);
+
+        $this->buildViolation('myMessage')
+            ->setParameter('{{ value }}', '"'.$iban.'"')
+            ->setCode(Iban::INVALID_SPACES_ERROR)
+            ->assertRaised();
+    }
+
     private function assertViolationRaised($iban, $code)
     {
         $constraint = new Iban([