Merge branch '6.4' into 7.3

nicolas-grekas · nicolas-grekas · commit f735e2d39054 · 2026-01-06T16:17:10.000+01:00
* 6.4:
  [Serializer] Fix #[Ignore] on same-name properties &lt;-&gt; methods
diff --git a/Mapping/Loader/AttributeLoader.php b/Mapping/Loader/AttributeLoader.php
@@ -172,9 +172,7 @@ public function loadClassMetadata(ClassMetadataInterface $classMetadata): bool
 
                     $attributeMetadata->setSerializedPath($attribute->getSerializedPath());
                 } elseif ($attribute instanceof Ignore) {
-                    if (!$accessorOrMutator && !$hasProperty) {
-                        $attributeMetadata->setIgnore(true);
-                    }
+                    $attributeMetadata->setIgnore(true);
                 } elseif ($attribute instanceof Context) {
                     if (!$accessorOrMutator && !$hasProperty) {
                         throw new MappingException(\sprintf('Context on "%s::%s()" cannot be added. Context can only be added on methods beginning with "get", "is", "has", "can" or "set".', $className, $method->name));
diff --git a/Tests/Normalizer/ObjectNormalizerTest.php b/Tests/Normalizer/ObjectNormalizerTest.php
@@ -1156,6 +1156,28 @@ public function testNormalizeObjectWithMethodSameNameAsProperty()
         $this->assertSame([], $normalizer->normalize($object, null, ['groups' => 'bar']));
     }
 
+    public function testIgnoreAttributeOnMethodWithSameNameAsProperty()
+    {
+        $normalizer = new ObjectNormalizer(new ClassMetadataFactory(new AttributeLoader()));
+
+        $object = new ObjectWithIgnoredMethodSameNameAsProperty('should_be_ignored', 'should_be_serialized');
+
+        $this->assertSame(['visible' => 'should_be_serialized'], $normalizer->normalize($object));
+    }
+
+    public function testIgnoreAttributeOnMethodWithSameNameAsPropertyWithGroups()
+    {
+        $normalizer = new ObjectNormalizer(new ClassMetadataFactory(new AttributeLoader()));
+
+        $object = new ObjectWithIgnoredMethodSameNameAsPropertyWithGroups('ignored', 'visible_default', 'visible_group');
+
+        // without groups - should include both visible properties
+        $this->assertSame(['visibleDefault' => 'visible_default', 'visibleGroup' => 'visible_group'], $normalizer->normalize($object));
+
+        // with groups - should only include group-specific property, ignored method should never appear
+        $this->assertSame(['visibleGroup' => 'visible_group'], $normalizer->normalize($object, null, ['groups' => ['group1']]));
+    }
+
     /**
      * Priority of accessor methods is defined by the PropertyReadInfoExtractorInterface passed to the PropertyAccessor
      * component. By default ReflectionExtractor::$defaultAccessorPrefixes are used.
@@ -1718,3 +1740,49 @@ public function shouldDoThing()
         return $this->shouldDoThing;
     }
 }
+
+class ObjectWithIgnoredMethodSameNameAsProperty
+{
+    public string $visible;
+
+    private $ignored;
+
+    public function __construct(string $ignored, string $visible)
+    {
+        $this->ignored = $ignored;
+        $this->visible = $visible;
+    }
+
+    #[Ignore]
+    public function ignored()
+    {
+        return $this->ignored;
+    }
+}
+
+class ObjectWithIgnoredMethodSameNameAsPropertyWithGroups
+{
+    public string $visibleDefault;
+    public string $visibleGroup;
+
+    private $ignored;
+
+    public function __construct(string $ignored, string $visibleDefault, string $visibleGroup)
+    {
+        $this->ignored = $ignored;
+        $this->visibleDefault = $visibleDefault;
+        $this->visibleGroup = $visibleGroup;
+    }
+
+    #[Ignore]
+    public function ignored()
+    {
+        return $this->ignored;
+    }
+
+    #[Groups(['group1'])]
+    public function visibleGroup()
+    {
+        return $this->visibleGroup;
+    }
+}
