[Validator][GroupSequence] fixed GroupSequence validation ignores PropertyMetadata of parent classes

senaria · senaria · commit 1ff0611cb0c9 · 2016-07-21T09:31:48.000+02:00
diff --git a/src/Symfony/Component/Validator/Mapping/ClassMetadata.php b/src/Symfony/Component/Validator/Mapping/ClassMetadata.php
@@ -350,6 +350,7 @@ public function mergeConstraints(ClassMetadata $source)
                 $member = clone $member;
 
                 foreach ($member->getConstraints() as $constraint) {
+                    $member->constraintsByGroup[$this->getDefaultGroup()][] = $constraint;
                     $constraint->addImplicitGroupName($this->getDefaultGroup());
                 }
 
diff --git a/src/Symfony/Component/Validator/Tests/Mapping/ClassMetadataTest.php b/src/Symfony/Component/Validator/Tests/Mapping/ClassMetadataTest.php
@@ -138,23 +138,41 @@ public function testMergeConstraintsMergesMemberConstraints()
         $this->metadata->mergeConstraints($parent);
         $this->metadata->addPropertyConstraint('firstName', new ConstraintA());
 
+        $constraintA1 = new ConstraintA(array('groups' => array(
+            'Default',
+            'EntityParent',
+            'Entity',
+        )));
+        $constraintA2 = new ConstraintA(array('groups' => array(
+            'Default',
+            'Entity',
+        )));
+
         $constraints = array(
-            new ConstraintA(array('groups' => array(
-                'Default',
-                'EntityParent',
-                'Entity',
-            ))),
-            new ConstraintA(array('groups' => array(
-                'Default',
-                'Entity',
-            ))),
+            $constraintA1,
+            $constraintA2,
+        );
+
+        $constraintsByGroup = array(
+            'Default' => array(
+                $constraintA1,
+                $constraintA2,
+            ),
+            'EntityParent' => array(
+                $constraintA1,
+            ),
+            'Entity' => array(
+                $constraintA1,
+                $constraintA2,
+            ),
         );
 
         $members = $this->metadata->getPropertyMetadata('firstName');
 
         $this->assertCount(1, $members);
         $this->assertEquals(self::PARENTCLASS, $members[0]->getClassName());
         $this->assertEquals($constraints, $members[0]->getConstraints());
+        $this->assertEquals($constraintsByGroup, $members[0]->constraintsByGroup);
     }
 
     public function testMemberMetadatas()

Original file line number	Diff line number	Diff line change
`@@ -350,6 +350,7 @@ public function mergeConstraints(ClassMetadata $source)`
`350`	`350`	`$member = clone $member;`
`351`	`351`
`352`	`352`	`foreach ($member->getConstraints() as $constraint) {`
	`353`	`+ $member->constraintsByGroup[$this->getDefaultGroup()][] = $constraint;`
`353`	`354`	`$constraint->addImplicitGroupName($this->getDefaultGroup());`
`354`	`355`	`}`
`355`	`356`