Updated to consider the Optional constraint wrapper by group.

symfony · gator92 · May 30, 2012 · Jun 1, 2012 · Jun 1, 2012 · May 5, 2013
commit 2d22358fb7dcdbd508d7cc3859a35b041cd4e344
diff --git a/src/Symfony/Component/Validator/Constraints/CollectionValidator.php b/src/Symfony/Component/Validator/Constraints/CollectionValidator.php
@@ -41,16 +41,17 @@ public function validate($value, Constraint $constraint)
         $map = new ValueMetadata();
 
         foreach ($constraint->fields as $field => $fieldConstraint) {
+            $map->setConstraints($fieldConstraint->constraints);
+
             if (
                 // bug fix issue #2779
                 (is_array($value) && array_key_exists($field, $value)) ||
                 ($value instanceof \ArrayAccess && $value->offsetExists($field))
             ) {
-                foreach ($fieldConstraint->constraints as $constr) {
+                foreach ($map->findConstraints($group) as $constr) {
                     $this->context->validateValue($value[$field], $constr, '['.$field.']', $group);
-                foreach ($map->setConstraints($constraints)->findConstraints($group) as $constr) {
                 }
-            } elseif (!$fieldConstraint instanceof Optional && !$constraint->allowMissingFields) {
+            } elseif ($map->hasConstraints($group) && !$fieldConstraint instanceof Optional && !$constraint->allowMissingFields) {
                 $this->context->addViolationAt('['.$field.']', $constraint->missingFieldsMessage, array(
                     '{{ field }}' => $field
                 ), null);

diff --git a/src/Symfony/Component/Validator/Mapping/ValueMetadata.php b/src/Symfony/Component/Validator/Mapping/ValueMetadata.php
@@ -13,11 +13,11 @@
 
 class ValueMetadata extends ElementMetadata
 {
-/**
- * Sets the constraint(s) for this value.
- *
- * @param array $constraints
- */
+    /**
+    * Sets the constraint(s) for this value.
+    *
+    * @param array $constraints
+    */
 	public function setConstraints(array $constraints)
     {
         $this->constraints = $constraints;
@@ -30,6 +30,15 @@ public function setConstraints(array $constraints)
         });
 
         $this->constraintsByGroup = $constraintsByGroup;
-        return $this;
+    }
+
+    /**
+     * Returns whether this element has any constraints, optionally by group.
+     *
+     * @return Boolean
+     */
+    public function hasConstraints($group = null)
+    {
+        return isset($group) ? !empty($this->constraintsByGroup[$group]) : count($this->constraints) > 0;
     }
 }
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/CollectionValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/CollectionValidatorTest.php
@@ -76,7 +76,7 @@ public function testThrowsExceptionIfNotTraversable()
 
     public function testWalkSingleConstraint()
     {
-        $constraint = new Range(array('min' => 4));
+        $constraint = new Range(array('min' => 4, 'groups' => 'MyGroup'));
 
         $array = array(
             'foo' => 3,
@@ -106,7 +106,7 @@ public function testWalkSingleConstraint()
     public function testWalkMultipleConstraints()
     {
         $constraints = array(
-            new Range(array('min' => 4)),
+            new Range(array('min' => 4, 'groups' => 'MyGroup')),
             new NotNull(array('groups' => 'MyGroup')),
         );
 
@@ -203,7 +203,7 @@ public function testMissingFieldsDisallowed()
 
         $constraint = new Collection(array(
             'fields' => array(
-                'foo' => new Range(array('min' => 4)),
+                'foo' => new Range(array('min' => 4, 'groups' => 'MyGroup')),
             ),
             'missingFieldsMessage' => 'myMessage',
         ));
@@ -266,7 +266,7 @@ public function testOptionalFieldSingleConstraint()
             'foo' => 5,
         );
 
-        $constraint = new Range(array('min' => 4));
+        $constraint = new Range(array('min' => 4, 'groups' => 'MyGroup'));
 
         $this->context->expects($this->once())
             ->method('validateValue')
@@ -290,7 +290,7 @@ public function testOptionalFieldMultipleConstraints()
 
         $constraints = array(
             new NotNull(array('groups' => 'MyGroup')),
-            new Range(array('min' => 4)),
+            new Range(array('min' => 4, 'groups' => 'MyGroup')),
         );
         $i = 1;
 
@@ -336,7 +336,9 @@ public function testRequiredFieldNotPresent()
 
         $this->validator->validate($data, new Collection(array(
             'fields' => array(
-                'foo' => new Required(),
+                'foo' => new Required(
+                    new NotNull(array('groups' => 'MyGroup'))
+                ),
             ),
             'missingFieldsMessage' => 'myMessage',
         )));
@@ -348,7 +350,7 @@ public function testRequiredFieldSingleConstraint()
             'foo' => 5,
         );
 
-        $constraint = new Range(array('min' => 4));
+        $constraint = new Range(array('min' => 4, 'groups' => 'MyGroup'));
 
         $this->context->expects($this->once())
             ->method('validateValue')
@@ -372,7 +374,7 @@ public function testRequiredFieldMultipleConstraints()
 
         $constraints = array(
             new NotNull(array('groups' => 'MyGroup')),
-            new Range(array('min' => 4)),
+            new Range(array('min' => 4, 'groups' => 'MyGroup')),
         );
         $i = 1;
 
@@ -409,30 +411,57 @@ public function testObjectShouldBeLeftUnchanged()
         ), (array) $value);
     }
 
-    public function testWalkbyGroup()
+    public function testByGroup()
     {
         $array = array(
             'foo' => 2,
         );
 
         $constraints = array(
-            new Min(array('limit' => 5, 'groups' => 'MyGroup')),
-            new Min(array('limit' => 3, 'groups' => 'YourGroup')),
+            new Range(array('min' => 5, 'groups' => 'MyGroup')),
+            new Range(array('min' => 3, 'groups' => 'YourGroup')),
         );
 
-        $this->walker->expects($this->once())
-            ->method('walkConstraint')
-            ->with($constraints[0], $array['foo'], 'MyGroup', 'foo.bar[foo]');
+        $this->context->expects($this->once())
+            ->method('validateValue')
+            ->with($array['foo'], $constraints[0], '[foo]', 'MyGroup');
 
         $this->context->expects($this->never())
-            ->method('addViolationAtSubPath');
+            ->method('addViolationAt');
 
         $data = $this->prepareTestData($array);
 
         $this->validator->validate($data, new Collection(array(
-            'fields' => array(
-                'foo' => $constraints,
-            )
+                'fields' => array('foo' => $constraints)
+        )));
+    }
+
+    public function testMultipleByGroup()
+    {
+        $array = array(
+            'bar' => 3,
+            'baz' => 5
+        );
+
+        $constraints = array(
+            new Optional($inner = new NotNull(array('groups' => 'MyGroup'))),
+            new Range(array('min' => 5, 'groups' => 'YourGroup')),
+            new Required($inner)
+        );
+
+        $this->context->expects($this->once())
+            ->method('validateValue')
+            ->with($array['baz'], $inner, '[baz]', 'MyGroup');
+
+        $this->context->expects($this->never())
+            ->method('addViolationAt');
+
+        $data = $this->prepareTestData($array);
+
+        $this->validator->validate($data, new Collection(array(
+            'foo' => $constraints[0],
+            'bar' => $constraints[1],
+            'baz' => $constraints[2]
         )));
     }
 }