Adjust ObjectNormalizerTest for the accessor method changes from symfony#61097

Author: RafaelKr

src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php

@@ -956,19 +956,60 @@ public function testNormalizeWithMethodNamesSimilarToAccessors()
         ], $normalized);
     }
 
-    public function testNormalizeObjectWithBooleanPropertyAndIsserMethodWithSameName()
+    public function testNormalizeObjectWithPublicPropertyAccessorPrecedence()
     {
         $classMetadataFactory = new ClassMetadataFactory(new AttributeLoader());
         $normalizer = new ObjectNormalizer($classMetadataFactory);
 
-        $object = new ObjectWithBooleanPropertyAndIsserWithSameName();
+        $object = new ObjectWithPropertyAndAllAccessorMethods(
+            'foo',
+        );
         $normalized = $normalizer->normalize($object);
 
+        // The getter method should take precedence over all other accessor methods
         $this->assertSame([
             'foo' => 'foo',
-            'isFoo' => true,
         ], $normalized);
     }
+
+    public function testNormalizeObjectWithPropertyAndAccessorMethodsWithSameName()
+    {
+        $classMetadataFactory = new ClassMetadataFactory(new AttributeLoader());
+        $normalizer = new ObjectNormalizer($classMetadataFactory);
+
+        $object = new ObjectWithPropertyAndAccessorSameName(
+            'foo',
+            'getFoo',
+            'canFoo',
+            'hasFoo',
+            'isFoo'
+        );
+        $normalized = $normalizer->normalize($object);
+
+        // Previously, only the 'foo' property was extracted, all other properties starting with accessor verbs were
+        // converted to 'foo'. Now accessor methods with exactly the same name as the property take precedence.
+        $this->assertSame([
+            'getFoo' => 'getFoo',
+            'canFoo' => 'canFoo',
+            'hasFoo' => 'hasFoo',
+            'isFoo' => 'isFoo',
+            // The getter method should be used for both properties, thus we get 'getFoo' instead of 'foo'
+            'foo' => 'getFoo',
+        ], $normalized);
+
+        $denormalized = $this->normalizer->denormalize($normalized, ObjectWithPropertyAndAccessorSameName::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 denoramilzed 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());
+    }
 }
 
 class ProxyObjectDummy extends ObjectDummy
@@ -1312,16 +1353,58 @@ public function isolate()
     }
 }
 
-class ObjectWithBooleanPropertyAndIsserWithSameName
-{
-    private $foo = 'foo';
-    private $isFoo = true;
+class ObjectWithPropertyAndAllAccessorMethods {
+    public function __construct(
+        private $foo,
+    ) {
+    }
+
+    public function canFoo()
+    {
+        return 'canFoo';
+    }
 
     public function getFoo()
     {
         return $this->foo;
     }
 
+    public function hasFoo()
+    {
+        return 'hasFoo';
+    }
+
+    public function isFoo()
+    {
+        return 'isFoo';
+    }
+}
+
+class ObjectWithPropertyAndAccessorSameName {
+    public function __construct(
+        public $foo,
+        private $getFoo,
+        private $canFoo = null,
+        private $hasFoo = null,
+        private $isFoo = null,
+    ) {
+    }
+
+    public function getFoo()
+    {
+        return $this->getFoo;
+    }
+
+    public function canFoo()
+    {
+        return $this->canFoo;
+    }
+
+    public function hasFoo()
+    {
+        return $this->hasFoo;
+    }
+
     public function isFoo()
     {
         return $this->isFoo;