[Serializer] fix Inherited properties normalization

Author: Link1515

Normalizer/ObjectNormalizer.php

@@ -107,7 +107,7 @@ protected function extractAttributes(object $object, ?string $format = null, arr
                 'i' => str_starts_with($name, 'is') && isset($name[$i = 2]),
                 default => false,
             } && !ctype_lower($name[$i])) {
-                if ($reflClass->hasProperty($name)) {
+                if ($this->hasProperty($reflMethod, $name)) {
                     $attributeName = $name;
                 } else {
                     $attributeName = substr($name, $i);
@@ -139,6 +139,19 @@ protected function extractAttributes(object $object, ?string $format = null, arr
         return array_keys($attributes);
     }
 
+    private function hasProperty(\ReflectionMethod $method, string $propName): bool
+    {
+        $class = $method->getDeclaringClass();
+
+        do {
+            if ($class->hasProperty($propName)) {
+                return true;
+            }
+        } while ($class = $class->getParentClass());
+
+        return false;
+    }
+
     protected function getAttributeValue(object $object, string $attribute, ?string $format = null, array $context = []): mixed
     {
         $mapping = $this->classDiscriminatorResolver?->getMappingForMappedObject($object);

Tests/Normalizer/ObjectNormalizerTest.php

@@ -1017,7 +1017,7 @@ public function testNormalizeObjectWithPropertyAndAccessorMethodsWithSameName()
         $this->assertSame('getFoo', $denormalized->getFoo());
 
         // On the initial object the value was 'foo', but the normalizer prefers the accessor method 'getFoo'
-        // Thus on the denoramilzed object the value is 'getFoo'
+        // Thus on the denormalized object the value is 'getFoo'
         $this->assertSame('foo', $object->foo);
         $this->assertSame('getFoo', $denormalized->foo);
 
@@ -1026,6 +1026,56 @@ public function testNormalizeObjectWithPropertyAndAccessorMethodsWithSameName()
         $this->assertSame('isFoo', $denormalized->isFoo());
     }
 
+    public function testNormalizeChildExtendsObjectWithPropertyAndAccessorSameName()
+    {
+        // This test follows the same logic used in testNormalizeObjectWithPropertyAndAccessorMethodsWithSameName()
+        $normalizer = $this->getNormalizerForAccessors();
+
+        $object = new ChildExtendsObjectWithPropertyAndAccessorSameName(
+            'foo',
+            'getFoo',
+            'canFoo',
+            'hasFoo',
+            'isFoo'
+        );
+        $normalized = $normalizer->normalize($object);
+
+        $this->assertSame([
+            'getFoo' => 'getFoo',
+            'canFoo' => 'canFoo',
+            'hasFoo' => 'hasFoo',
+            'isFoo' => 'isFoo',
+            // The getFoo accessor method is used for foo, thus it's also 'getFoo' instead of 'foo'
+            'foo' => 'getFoo',
+        ], $normalized);
+
+        $denormalized = $this->normalizer->denormalize($normalized, ChildExtendsObjectWithPropertyAndAccessorSameName::class);
+
+        $this->assertSame('getFoo', $denormalized->getFoo());
+
+        // On the initial object the value was 'foo', but the normalizer prefers the accessor method 'getFoo'
+        // Thus on the denormalized object the value is 'getFoo'
+        $this->assertSame('foo', $object->foo);
+        $this->assertSame('getFoo', $denormalized->foo);
+
+        $this->assertSame('hasFoo', $denormalized->hasFoo());
+        $this->assertSame('canFoo', $denormalized->canFoo());
+        $this->assertSame('isFoo', $denormalized->isFoo());
+    }
+
+    public function testNormalizeChildWithPropertySameAsParentMethod()
+    {
+        $normalizer = $this->getNormalizerForAccessors();
+
+        $object = new ChildWithPropertySameAsParentMethod('foo');
+        $normalized = $normalizer->normalize($object);
+
+        $this->assertSame([
+            'foo' => 'foo',
+        ],
+            $normalized);
+    }
+
     /**
      * Priority of accessor methods is defined by the PropertyReadInfoExtractorInterface passed to the PropertyAccessor
      * component. By default ReflectionExtractor::$defaultAccessorPrefixes are used.
@@ -1501,6 +1551,18 @@ public function isFoo()
     }
 }
 
+class ChildExtendsObjectWithPropertyAndAccessorSameName extends ObjectWithPropertyAndAccessorSameName
+{
+}
+
+class ChildWithPropertySameAsParentMethod extends ObjectWithPropertyAndAllAccessorMethods
+{
+    private $canFoo;
+    private $getFoo;
+    private $hasFoo;
+    private $isFoo;
+}
+
 class ObjectWithPropertyHasserAndIsser
 {
     public function __construct(