Apply NotBlank only to the whole array

FriendsOfSymfony · Dec 9, 2018 · 682ca1a · 682ca1a
1 parent 558b149
commit 682ca1a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/Controller/Annotations/AbstractScalarParam.php b/Controller/Annotations/AbstractScalarParam.php
@@ -56,10 +56,6 @@ public function getConstraints()
             ));
         }
 
-        if (false === $this->allowBlank) {
-            $constraints[] = new NotBlank();
-        }
-
         // If the user wants to map the value, apply all constraints to every
         // value of the map
         if ($this->map) {
@@ -69,9 +65,10 @@ public function getConstraints()
             if (false === $this->nullable) {
                 $constraints[] = new NotNull();
             }
-            if (false === $this->allowBlank) {
-                $constraints[] = new NotBlank();
-            }
+        }
+
+        if (false === $this->allowBlank) {
+            $constraints[] = new NotBlank();
         }
 
         return $constraints;

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