Merge pull request #1769 from roukmoute/fix_map

Fix problems with map option

Author: GuilhemN

Controller/Annotations/AbstractScalarParam.php

@@ -15,6 +15,7 @@
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\Constraints\NotBlank;
 use Symfony\Component\Validator\Constraints\All;
+use Symfony\Component\Validator\Constraints\NotNull;
 
 /**
  * {@inheritdoc}
@@ -65,6 +66,12 @@ public function getConstraints()
             $constraints = array(
                 new All(array('constraints' => $constraints)),
             );
+            if (false === $this->nullable) {
+                $constraints[] = new NotNull();
+            }
+            if (false === $this->allowBlank) {
+                $constraints[] = new NotBlank();
+            }
         }
 
         return $constraints;

Tests/Controller/Annotations/AbstractScalarParamTest.php

@@ -97,7 +97,17 @@ public function testConstraintsTransformWhenParamIsAnArray()
         $this->param->map = true;
         $this->assertEquals(array(new Constraints\All(array(
             new Constraints\NotNull(),
-        ))), $this->param->getConstraints());
+        )), new Constraints\NotNull()), $this->param->getConstraints());
+    }
+
+    public function testArrayWithBlankConstraintsWhenParamIsAnArray()
+    {
+        $this->param->map = true;
+        $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());
     }
 
     public function testArrayWithNoConstraintsDoesNotCreateInvalidConstraint()