[Serializer] Revert #54488 to fix BC Break

symfony · Apr 17, 2024 · 5bfb9be · 5bfb9be
1 parent a1eed5a
commit 5bfb9be
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 238 deletions.
diff --git a/Mapping/Loader/AnnotationLoader.php b/Mapping/Loader/AnnotationLoader.php
@@ -106,7 +106,7 @@ public function loadClassMetadata(ClassMetadataInterface $classMetadata)
 
             $accessorOrMutator = preg_match('/^(get|is|has|set)(.+)$/i', $method->name, $matches);
             if ($accessorOrMutator) {
-                $attributeName = $reflectionClass->hasProperty($method->name) ? $method->name : lcfirst($matches[2]);
+                $attributeName = lcfirst($matches[2]);
 
                 if (isset($attributesMetadata[$attributeName])) {
                     $attributeMetadata = $attributesMetadata[$attributeName];

diff --git a/Normalizer/ObjectNormalizer.php b/Normalizer/ObjectNormalizer.php
@@ -95,25 +95,17 @@ protected function extractAttributes(object $object, ?string $format = null, arr
 
             if (str_starts_with($name, 'get') || str_starts_with($name, 'has')) {
                 // getters and hassers
-                $attributeName = $name;
+                $attributeName = substr($name, 3);
 
                 if (!$reflClass->hasProperty($attributeName)) {
-                    $attributeName = substr($attributeName, 3);
-
-                    if (!$reflClass->hasProperty($attributeName)) {
-                        $attributeName = lcfirst($attributeName);
-                    }
+                    $attributeName = lcfirst($attributeName);
                 }
             } elseif (str_starts_with($name, 'is')) {
                 // issers
-                $attributeName = $name;
+                $attributeName = substr($name, 2);
 
                 if (!$reflClass->hasProperty($attributeName)) {
-                    $attributeName = substr($attributeName, 2);
-
-                    if (!$reflClass->hasProperty($attributeName)) {
-                        $attributeName = lcfirst($attributeName);
-                    }
+                    $attributeName = lcfirst($attributeName);
                 }
             }
 

diff --git a/Tests/Fixtures/SamePropertyAsMethodDummy.php b/Tests/Fixtures/SamePropertyAsMethodDummy.php
diff --git a/Tests/Fixtures/SamePropertyAsMethodWithMethodSerializedNameDummy.php b/Tests/Fixtures/SamePropertyAsMethodWithMethodSerializedNameDummy.php
diff --git a/Tests/Fixtures/SamePropertyAsMethodWithPropertySerializedNameDummy.php b/Tests/Fixtures/SamePropertyAsMethodWithPropertySerializedNameDummy.php
diff --git a/Tests/Normalizer/ObjectNormalizerTest.php b/Tests/Normalizer/ObjectNormalizerTest.php
@@ -41,9 +41,6 @@
 use Symfony\Component\Serializer\Tests\Fixtures\Php74Dummy;
 use Symfony\Component\Serializer\Tests\Fixtures\Php74DummyPrivate;
 use Symfony\Component\Serializer\Tests\Fixtures\Php80Dummy;
-use Symfony\Component\Serializer\Tests\Fixtures\SamePropertyAsMethodDummy;
-use Symfony\Component\Serializer\Tests\Fixtures\SamePropertyAsMethodWithMethodSerializedNameDummy;
-use Symfony\Component\Serializer\Tests\Fixtures\SamePropertyAsMethodWithPropertySerializedNameDummy;
 use Symfony\Component\Serializer\Tests\Fixtures\SiblingHolder;
 use Symfony\Component\Serializer\Tests\Normalizer\Features\AttributesTestTrait;
 use Symfony\Component\Serializer\Tests\Normalizer\Features\CacheableObjectAttributesTestTrait;
@@ -874,53 +871,6 @@ public function testNormalizeStdClass()
         $this->assertSame(['baz' => 'baz'], $this->normalizer->normalize($o2));
     }
 
-    public function testSamePropertyAsMethod()
-    {
-        $object = new SamePropertyAsMethodDummy('free_trial', 'has_subscribe', 'get_ready', 'is_active');
-        $expected = [
-            'freeTrial' => 'free_trial',
-            'hasSubscribe' => 'has_subscribe',
-            'getReady' => 'get_ready',
-            'isActive' => 'is_active',
-        ];
-
-        $this->assertSame($expected, $this->normalizer->normalize($object));
-    }
-
-    public function testSamePropertyAsMethodWithPropertySerializedName()
-    {
-        $classMetadataFactory = new ClassMetadataFactory(new AnnotationLoader(new AnnotationReader()));
-        $this->normalizer = new ObjectNormalizer($classMetadataFactory, new MetadataAwareNameConverter($classMetadataFactory));
-        $this->normalizer->setSerializer($this->serializer);
-
-        $object = new SamePropertyAsMethodWithPropertySerializedNameDummy('free_trial', 'has_subscribe', 'get_ready', 'is_active');
-        $expected = [
-            'free_trial_property' => 'free_trial',
-            'has_subscribe_property' => 'has_subscribe',
-            'get_ready_property' => 'get_ready',
-            'is_active_property' => 'is_active',
-        ];
-
-        $this->assertSame($expected, $this->normalizer->normalize($object));
-    }
-
-    public function testSamePropertyAsMethodWithMethodSerializedName()
-    {
-        $classMetadataFactory = new ClassMetadataFactory(new AnnotationLoader(new AnnotationReader()));
-        $this->normalizer = new ObjectNormalizer($classMetadataFactory, new MetadataAwareNameConverter($classMetadataFactory));
-        $this->normalizer->setSerializer($this->serializer);
-
-        $object = new SamePropertyAsMethodWithMethodSerializedNameDummy('free_trial', 'has_subscribe', 'get_ready', 'is_active');
-        $expected = [
-            'free_trial_method' => 'free_trial',
-            'has_subscribe_method' => 'has_subscribe',
-            'get_ready_method' => 'get_ready',
-            'is_active_method' => 'is_active',
-        ];
-
-        $this->assertSame($expected, $this->normalizer->normalize($object));
-    }
-
     public function testNormalizeWithIgnoreAnnotationAndPrivateProperties()
     {
         $classMetadataFactory = new ClassMetadataFactory(new AnnotationLoader(new AnnotationReader()));