Merge branch '7.3' into 7.4

nicolas-grekas · nicolas-grekas · commit 2f8681b4da67 · 2026-01-26T16:07:59.000+01:00
* 7.3:
  Fix merge
  [FrameworkBundle] Clean `http_cache` dir in `KernelTestCase::ensureKernelShutdown()`
  fix tests on Windows
  [PropertyInfo] Conflict with phpdocumentor/reflection-docblock &gt;= 6
  [Finder] Fix appending empty iterators
  Fix attributeLoader
  Bump Symfony version to 7.3.11
  Update VERSION for 7.3.10
  Update CHANGELOG for 7.3.10
  Bump Symfony version to 6.4.33
  Update VERSION for 6.4.32
  Update CONTRIBUTORS for 6.4.32
  Update CHANGELOG for 6.4.32
  [Process] Fix escaping for MSYS on Windows
diff --git a/Mapping/Loader/AttributeLoader.php b/Mapping/Loader/AttributeLoader.php
@@ -149,6 +149,7 @@ private function doLoadClassMetadata(\ReflectionClass $reflectionClass, ClassMet
             $attributeName = $this->getAttributeNameFromAccessor($reflectionClass, $method, true);
             $accessorOrMutator = null !== $attributeName;
             $hasProperty = $this->hasPropertyForAccessor($method->getDeclaringClass(), $name);
+            $attributeMetadata = null;
 
             if ($hasProperty || $accessorOrMutator) {
                 if (null === $attributeName || 's' !== $name[0] && $hasProperty && $this->hasAttributeNameCollision($reflectionClass, $attributeName, $name)) {
@@ -165,35 +166,37 @@ private function doLoadClassMetadata(\ReflectionClass $reflectionClass, ClassMet
 
             foreach ($this->loadAttributes($method) as $attribute) {
                 if ($attribute instanceof Groups) {
-                    if (!$accessorOrMutator && !$hasProperty) {
+                    if (!$attributeMetadata) {
                         throw new MappingException(\sprintf('Groups on "%s::%s()" cannot be added. Groups can only be added on methods beginning with "get", "is", "has", "can" or "set".', $className, $method->name));
                     }
 
                     foreach ($attribute->groups as $group) {
                         $attributeMetadata->addGroup($group);
                     }
                 } elseif ($attribute instanceof MaxDepth) {
-                    if (!$accessorOrMutator && !$hasProperty) {
+                    if (!$attributeMetadata) {
                         throw new MappingException(\sprintf('MaxDepth on "%s::%s()" cannot be added. MaxDepth can only be added on methods beginning with "get", "is", "has", "can" or "set".', $className, $method->name));
                     }
 
                     $attributeMetadata->setMaxDepth($attribute->maxDepth);
                 } elseif ($attribute instanceof SerializedName) {
-                    if (!$accessorOrMutator && !$hasProperty) {
+                    if (!$attributeMetadata) {
                         throw new MappingException(\sprintf('SerializedName on "%s::%s()" cannot be added. SerializedName can only be added on methods beginning with "get", "is", "has", "can" or "set".', $className, $method->name));
                     }
 
                     $attributeMetadata->setSerializedName($attribute->serializedName);
                 } elseif ($attribute instanceof SerializedPath) {
-                    if (!$accessorOrMutator && !$hasProperty) {
+                    if (!$attributeMetadata) {
                         throw new MappingException(\sprintf('SerializedPath on "%s::%s()" cannot be added. SerializedPath can only be added on methods beginning with "get", "is", "has", "can" or "set".', $className, $method->name));
                     }
 
                     $attributeMetadata->setSerializedPath($attribute->serializedPath);
                 } elseif ($attribute instanceof Ignore) {
-                    $attributeMetadata->setIgnore(true);
+                    if ($attributeMetadata) {
+                        $attributeMetadata->setIgnore(true);
+                    }
                 } elseif ($attribute instanceof Context) {
-                    if (!$accessorOrMutator && !$hasProperty) {
+                    if (!$attributeMetadata) {
                         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
@@ -1373,6 +1373,15 @@ public function testSkipVoidNeverReturnTypeAccessors()
         $this->assertArrayNotHasKey('neverProperty', $normalized);
         $this->assertEquals('value', $normalized['normalProperty']);
     }
+
+    public function testMetadataIsAppliedToTheRightValue()
+    {
+        $obj = new ObjectWithMetadata();
+        $normalizer = new ObjectNormalizer(new ClassMetadataFactory(new AttributeLoader()));
+        $normalized = $normalizer->normalize($obj);
+
+        $this->assertSame(['name' => 'John', 'foo' => 42, 'hello' => 'Hello i am John'], $normalized);
+    }
 }
 
 class ProxyObjectDummy extends ObjectDummy
@@ -2013,3 +2022,36 @@ public function __construct(
     ) {
     }
 }
+
+class ObjectWithMetadata
+{
+    private int $foo;
+    private string $name;
+
+    public function __construct()
+    {
+        $this->foo = 42;
+        $this->name = 'John';
+    }
+
+    public function getName(): string
+    {
+        return $this->name;
+    }
+
+    public function getFoo(): int
+    {
+        return $this->foo;
+    }
+
+    #[Ignore]
+    public function isEqualTo(self $test): bool
+    {
+        return $this->name === $test->getName();
+    }
+
+    public function getHello(): string
+    {
+        return 'Hello i am '.$this->getName();
+    }
+}
