Merge pull request #1970 from FriendsOfSymfony/fix

Apply NotBlank only to the whole array
FriendsOfSymfony · Jan 2, 2019 · ce2abfc · ce2abfc
2 parents 5701cb9 + 193161d
commit ce2abfc
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/Controller/Annotations/AbstractScalarParam.php b/Controller/Annotations/AbstractScalarParam.php
@@ -69,9 +69,6 @@ public function getConstraints()
             if (false === $this->nullable) {
                 $constraints[] = new NotNull();
             }
-            if (false === $this->allowBlank) {
-                $constraints[] = new NotBlank();
-            }
         }
 
         return $constraints;

diff --git a/Tests/Controller/Annotations/AbstractScalarParamTest.php b/Tests/Controller/Annotations/AbstractScalarParamTest.php
@@ -107,7 +107,7 @@ public function testArrayWithBlankConstraintsWhenParamIsAnArray()
         $this->assertEquals(array(new Constraints\All(array(
             new Constraints\NotNull(),
             new Constraints\NotBlank(),
-        )), new Constraints\NotNull(), new Constraints\NotBlank()), $this->param->getConstraints());
+        )), new Constraints\NotNull()), $this->param->getConstraints());
     }
 
     public function testArrayWithNoConstraintsDoesNotCreateInvalidConstraint()