Merge pull request #1970 from FriendsOfSymfony/fix

GuilhemN · web-flow · commit ce2abfc59a84 · 2019-01-03T00:02:41.000+01:00
Apply NotBlank only to the whole array
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()

Original file line number	Diff line number	Diff line change
`@@ -69,9 +69,6 @@ public function getConstraints()`
`69`	`69`	`if (false === $this->nullable) {`
`70`	`70`	`$constraints[] = new NotNull();`
`71`	`71`	`}`
`72`		`- if (false === $this->allowBlank) {`
`73`		`- $constraints[] = new NotBlank();`
`74`		`- }`
`75`	`72`	`}`
`76`	`73`
`77`	`74`	`return $constraints;`
Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ public function testArrayWithBlankConstraintsWhenParamIsAnArray()`
`107`	`107`	`$this->assertEquals(array(new Constraints\All(array(`
`108`	`108`	`new Constraints\NotNull(),`
`109`	`109`	`new Constraints\NotBlank(),`
`110`		`- )), new Constraints\NotNull(), new Constraints\NotBlank()), $this->param->getConstraints());`
	`110`	`+ )), new Constraints\NotNull()), $this->param->getConstraints());`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`public function testArrayWithNoConstraintsDoesNotCreateInvalidConstraint()`