bug #54485 [Serializer] Ignore when using #[Ignore] on a non-accessor (nicolas-grekas)

fabpot · fabpot · commit 22e9fd1ae387 · 2024-04-05T10:09:33.000+02:00
This PR was merged into the 5.4 branch. Discussion ---------- [Serializer] Ignore when using #[Ignore] on a non-accessor | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | Fix #54477 | License | MIT Because ignore means ignore so we know what to do with the attribute even when it's on something else than an accessor. Commits ------- 580b06a [Serializer] Ignore when using #[Ignore] on a non-accessor
diff --git a/src/Symfony/Component/Serializer/Mapping/Loader/AnnotationLoader.php b/src/Symfony/Component/Serializer/Mapping/Loader/AnnotationLoader.php
@@ -138,11 +138,9 @@ public function loadClassMetadata(ClassMetadataInterface $classMetadata)
 
                     $attributeMetadata->setSerializedName($annotation->getSerializedName());
                 } elseif ($annotation instanceof Ignore) {
-                    if (!$accessorOrMutator) {
-                        throw new MappingException(sprintf('Ignore on "%s::%s()" cannot be added. Ignore can only be added on methods beginning with "get", "is", "has" or "set".', $className, $method->name));
+                    if ($accessorOrMutator) {
+                        $attributeMetadata->setIgnore(true);
                     }
-
-                    $attributeMetadata->setIgnore(true);
                 } elseif ($annotation instanceof Context) {
                     if (!$accessorOrMutator) {
                         throw new MappingException(sprintf('Context on "%s::%s()" cannot be added. Context can only be added on methods beginning with "get", "is", "has" or "set".', $className, $method->name));
diff --git a/src/Symfony/Component/Serializer/Tests/Mapping/Loader/AnnotationLoaderTestCase.php b/src/Symfony/Component/Serializer/Tests/Mapping/Loader/AnnotationLoaderTestCase.php
@@ -141,13 +141,12 @@ public function testCanHandleUnrelatedIgnoredMethods()
     {
         $class = $this->getNamespace().'\Entity45016';
 
-        $this->expectException(MappingException::class);
-        $this->expectExceptionMessage(sprintf('Ignore on "%s::badIgnore()" cannot be added', $class));
-
         $metadata = new ClassMetadata($class);
         $loader = $this->getLoaderForContextMapping();
 
         $loader->loadClassMetadata($metadata);
+
+        $this->assertSame(['id'], array_keys($metadata->getAttributesMetadata()));
     }
 
     public function testIgnoreGetterWirhRequiredParameterIfIgnoreAnnotationIsUsed()

Original file line number	Diff line number	Diff line change
`@@ -141,13 +141,12 @@ public function testCanHandleUnrelatedIgnoredMethods()`
`141`	`141`	`{`
`142`	`142`	`$class = $this->getNamespace().'\Entity45016';`
`143`	`143`
`144`		`- $this->expectException(MappingException::class);`
`145`		`- $this->expectExceptionMessage(sprintf('Ignore on "%s::badIgnore()" cannot be added', $class));`
`146`		`-`
`147`	`144`	`$metadata = new ClassMetadata($class);`
`148`	`145`	`$loader = $this->getLoaderForContextMapping();`
`149`	`146`
`150`	`147`	`$loader->loadClassMetadata($metadata);`
	`148`	`+`
	`149`	`+ $this->assertSame(['id'], array_keys($metadata->getAttributesMetadata()));`
`151`	`150`	`}`
`152`	`151`
`153`	`152`	`public function testIgnoreGetterWirhRequiredParameterIfIgnoreAnnotationIsUsed()`