[Validator] Fix regression with class metadatada on parent classes

symfony · Jul 20, 2023 · a58fc32 · a58fc32
1 parent 62b6cd0
commit a58fc32
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 33 deletions.
diff --git a/Mapping/ClassMetadata.php b/Mapping/ClassMetadata.php
@@ -358,11 +358,11 @@ public function mergeConstraints(self $source)
 
                 if ($member instanceof MemberMetadata && !$member->isPrivate($this->name)) {
                     $property = $member->getPropertyName();
-                    $this->members[$property] = [$member];
+                    $this->members[$property][] = $member;
 
-                    if ($member instanceof PropertyMetadata) {
+                    if ($member instanceof PropertyMetadata && !isset($this->properties[$property])) {
                         $this->properties[$property] = $member;
-                    } elseif ($member instanceof GetterMetadata) {
+                    } elseif ($member instanceof GetterMetadata && !isset($this->getters[$property])) {
                         $this->getters[$property] = $member;
                     }
                 } else {

diff --git a/Tests/Fixtures/Annotation/Entity.php b/Tests/Fixtures/Annotation/Entity.php
@@ -55,6 +55,10 @@ class Entity extends EntityParent implements EntityInterfaceB
     private $internal;
     public $data = 'Overridden data';
     public $initialized = false;
+    /**
+     * @Assert\Type("integer")
+     */
+    protected $other;
 
     public function __construct($internal = null)
     {

diff --git a/Tests/Fixtures/Attribute/Entity.php b/Tests/Fixtures/Attribute/Entity.php
@@ -57,6 +57,8 @@ class Entity extends EntityParent implements EntityInterfaceB
     private $internal;
     public $data = 'Overridden data';
     public $initialized = false;
+    #[Assert\Type('integer')]
+    protected $other;
 
     public function __construct($internal = null)
     {

diff --git a/Tests/Fixtures/NestedAttribute/Entity.php b/Tests/Fixtures/NestedAttribute/Entity.php
@@ -78,6 +78,8 @@ class Entity extends EntityParent implements EntityInterfaceB
     private $internal;
     public $data = 'Overridden data';
     public $initialized = false;
+    #[Assert\Type('integer')]
+    protected $other;
 
     public function __construct($internal = null)
     {

diff --git a/Tests/Mapping/ClassMetadataTest.php b/Tests/Mapping/ClassMetadataTest.php
@@ -163,8 +163,8 @@ public function testMergeConstraintsMergesMemberConstraints()
         $parent->addPropertyConstraint('firstName', new ConstraintA());
         $parent->addPropertyConstraint('firstName', new ConstraintB(['groups' => 'foo']));
 
-        $this->metadata->mergeConstraints($parent);
         $this->metadata->addPropertyConstraint('firstName', new ConstraintA());
+        $this->metadata->mergeConstraints($parent);
 
         $constraintA1 = new ConstraintA(['groups' => [
             'Default',
@@ -179,35 +179,29 @@ public function testMergeConstraintsMergesMemberConstraints()
             'groups' => ['foo'],
         ]);
 
-        $constraints = [
-            $constraintA1,
-            $constraintB,
-            $constraintA2,
-        ];
+        $members = $this->metadata->getPropertyMetadata('firstName');
 
-        $constraintsByGroup = [
-            'Default' => [
-                $constraintA1,
-                $constraintA2,
-            ],
-            'EntityParent' => [
-                $constraintA1,
-            ],
-            'Entity' => [
-                $constraintA1,
-                $constraintA2,
+        $this->assertCount(2, $members);
+        $this->assertEquals(self::CLASSNAME, $members[0]->getClassName());
+        $this->assertEquals([$constraintA2], $members[0]->getConstraints());
+        $this->assertEquals(
+            [
+                'Default' => [$constraintA2],
+                'Entity' => [$constraintA2],
             ],
-            'foo' => [
-                $constraintB,
+            $members[0]->constraintsByGroup
+        );
+        $this->assertEquals(self::PARENTCLASS, $members[1]->getClassName());
+        $this->assertEquals([$constraintA1, $constraintB], $members[1]->getConstraints());
+        $this->assertEquals(
+            [
+                'Default' => [$constraintA1],
+                'Entity' => [$constraintA1],
+                'EntityParent' => [$constraintA1],
+                'foo' => [$constraintB],
             ],
-        ];
-
-        $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);
+            $members[1]->constraintsByGroup
+        );
     }
 
     public function testMemberMetadatas()

diff --git a/Tests/Mapping/Loader/AnnotationLoaderTest.php b/Tests/Mapping/Loader/AnnotationLoaderTest.php
@@ -27,6 +27,7 @@
 use Symfony\Component\Validator\Constraints\Range;
 use Symfony\Component\Validator\Constraints\Required;
 use Symfony\Component\Validator\Constraints\Sequentially;
+use Symfony\Component\Validator\Constraints\Type;
 use Symfony\Component\Validator\Constraints\Valid;
 use Symfony\Component\Validator\Mapping\ClassMetadata;
 use Symfony\Component\Validator\Mapping\Loader\AnnotationLoader;
@@ -98,6 +99,7 @@ public function testLoadClassMetadata(string $namespace)
         $expected->addGetterConstraint('lastName', new NotNull());
         $expected->addGetterMethodConstraint('valid', 'isValid', new IsTrue());
         $expected->addGetterConstraint('permissions', new IsTrue());
+        $expected->addPropertyConstraint('other', new Type('integer'));
 
         // load reflection class so that the comparison passes
         $expected->getReflectionClass();
@@ -139,18 +141,16 @@ public function testLoadClassMetadataAndMerge(string $namespace)
         $loader->loadClassMetadata($parent_metadata);
 
         $metadata = new ClassMetadata($namespace.'\Entity');
+        $loader->loadClassMetadata($metadata);
 
         // Merge parent metaData.
         $metadata->mergeConstraints($parent_metadata);
 
-        $loader->loadClassMetadata($metadata);
-
         $expected_parent = new ClassMetadata($namespace.'\EntityParent');
         $expected_parent->addPropertyConstraint('other', new NotNull());
         $expected_parent->getReflectionClass();
 
         $expected = new ClassMetadata($namespace.'\Entity');
-        $expected->mergeConstraints($expected_parent);
 
         $expected->setGroupSequence(['Foo', 'Entity']);
         $expected->addConstraint(new ConstraintA());
@@ -187,11 +187,18 @@ public function testLoadClassMetadataAndMerge(string $namespace)
         $expected->addGetterConstraint('lastName', new NotNull());
         $expected->addGetterMethodConstraint('valid', 'isValid', new IsTrue());
         $expected->addGetterConstraint('permissions', new IsTrue());
+        $expected->addPropertyConstraint('other', new Type('integer'));
 
         // load reflection class so that the comparison passes
         $expected->getReflectionClass();
+        $expected->mergeConstraints($expected_parent);
 
         $this->assertEquals($expected, $metadata);
+
+        $otherMetadata = $metadata->getPropertyMetadata('other');
+        $this->assertCount(2, $otherMetadata);
+        $this->assertInstanceOf(Type::class, $otherMetadata[0]->getConstraints()[0]);
+        $this->assertInstanceOf(NotNull::class, $otherMetadata[1]->getConstraints()[0]);
     }
 
     /**