bug #46577 [Serializer] Fix ignore attribute in Xml files (alamirault)

fabpot · fabpot · commit 91f79fa36099 · 2022-06-05T20:50:38.000+02:00
This PR was merged into the 5.4 branch. Discussion ---------- [Serializer] Fix ignore attribute in Xml files | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #46463 | License | MIT Before this PR `foo` was ignored. Now it is not. ```xml <class name="Symfony\Component\Serializer\Tests\Fixtures\Annotations\IgnoreDummy"> <attribute name="foo" ignore="false" /> </class> ``` Instead of cast we now use `XmlUtils::phpize` like others XmlLoaders. Commits ------- 6cdcb1b [Serializer] Fix ignore attribute in Xml files
diff --git a/src/Symfony/Component/Serializer/Mapping/Loader/XmlFileLoader.php b/src/Symfony/Component/Serializer/Mapping/Loader/XmlFileLoader.php
@@ -72,7 +72,7 @@ public function loadClassMetadata(ClassMetadataInterface $classMetadata)
                 }
 
                 if (isset($attribute['ignore'])) {
-                    $attributeMetadata->setIgnore((bool) $attribute['ignore']);
+                    $attributeMetadata->setIgnore(XmlUtils::phpize($attribute['ignore']));
                 }
 
                 foreach ($attribute->context as $node) {
diff --git a/src/Symfony/Component/Serializer/Tests/Fixtures/serialization.xml b/src/Symfony/Component/Serializer/Tests/Fixtures/serialization.xml
@@ -37,6 +37,7 @@
     <class name="Symfony\Component\Serializer\Tests\Fixtures\Annotations\IgnoreDummy">
         <attribute name="ignored1" ignore="true" />
         <attribute name="ignored2" ignore="true" />
+        <attribute name="notIgnored" ignore="false" />
     </class>
 
     <class name="Symfony\Component\Serializer\Tests\Fixtures\Annotations\ContextDummyParent">
diff --git a/src/Symfony/Component/Serializer/Tests/Mapping/Loader/XmlFileLoaderTest.php b/src/Symfony/Component/Serializer/Tests/Mapping/Loader/XmlFileLoaderTest.php
@@ -107,6 +107,7 @@ public function testLoadIgnore()
         $attributesMetadata = $classMetadata->getAttributesMetadata();
         $this->assertTrue($attributesMetadata['ignored1']->isIgnored());
         $this->assertTrue($attributesMetadata['ignored2']->isIgnored());
+        $this->assertFalse($attributesMetadata['notIgnored']->isIgnored());
     }
 
     protected function getLoaderForContextMapping(): LoaderInterface

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ public function loadClassMetadata(ClassMetadataInterface $classMetadata)`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`if (isset($attribute['ignore'])) {`
`75`		`- $attributeMetadata->setIgnore((bool) $attribute['ignore']);`
	`75`	`+ $attributeMetadata->setIgnore(XmlUtils::phpize($attribute['ignore']));`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`foreach ($attribute->context as $node) {`
Original file line number	Diff line number	Diff line change
`@@ -107,6 +107,7 @@ public function testLoadIgnore()`
`107`	`107`	`$attributesMetadata = $classMetadata->getAttributesMetadata();`
`108`	`108`	`$this->assertTrue($attributesMetadata['ignored1']->isIgnored());`
`109`	`109`	`$this->assertTrue($attributesMetadata['ignored2']->isIgnored());`
	`110`	`+ $this->assertFalse($attributesMetadata['notIgnored']->isIgnored());`
`110`	`111`	`}`
`111`	`112`
`112`	`113`	`protected function getLoaderForContextMapping(): LoaderInterface`