Report Xml warning

VincentLanglet · VincentLanglet · commit 007f56da56df · 2024-03-20T22:16:56.000+01:00
diff --git a/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php b/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
@@ -82,7 +82,12 @@ public function encode(mixed $data, string $format, array $context = []): string
         $encoderIgnoredNodeTypes = $context[self::ENCODER_IGNORED_NODE_TYPES] ?? $this->defaultContext[self::ENCODER_IGNORED_NODE_TYPES];
         $ignorePiNode = \in_array(\XML_PI_NODE, $encoderIgnoredNodeTypes, true);
         if ($data instanceof \DOMDocument) {
-            return $data->saveXML($ignorePiNode ? $data->documentElement : null);
+            set_error_handler(static function ($type, $message) { throw new NotEncodableValueException($message); }, \E_ERROR | \E_WARNING);
+            try {
+                return $data->saveXML($ignorePiNode ? $data->documentElement : null);
+            } finally {
+                restore_error_handler();
+            }
         }
 
         $xmlRootNodeName = $context[self::ROOT_NODE_NAME] ?? $this->defaultContext[self::ROOT_NODE_NAME];
@@ -97,7 +102,12 @@ public function encode(mixed $data, string $format, array $context = []): string
             $this->appendNode($dom, $data, $format, $context, $xmlRootNodeName);
         }
 
-        return $dom->saveXML($ignorePiNode ? $dom->documentElement : null, $context[self::SAVE_OPTIONS] ?? $this->defaultContext[self::SAVE_OPTIONS]);
+        set_error_handler(static function ($type, $message) { throw new NotEncodableValueException($message); }, \E_ERROR | \E_WARNING);
+        try {
+            return $dom->saveXML($ignorePiNode ? $dom->documentElement : null, $context[self::SAVE_OPTIONS] ?? $this->defaultContext[self::SAVE_OPTIONS]);
+        } finally {
+            restore_error_handler();
+        }
     }
 
     public function decode(string $data, string $format, array $context = []): mixed
diff --git a/src/Symfony/Component/Serializer/Tests/Encoder/XmlEncoderTest.php b/src/Symfony/Component/Serializer/Tests/Encoder/XmlEncoderTest.php
@@ -433,6 +433,12 @@ public function testEncodeTraversableWhenNormalizable()
         $this->assertEquals($expected, $serializer->serialize(new NormalizableTraversableDummy(), 'xml'));
     }
 
+    public function testEncodeException()
+    {
+        $this->expectException(NotEncodableValueException::class);
+        $this->encoder->encode('Invalid character: '.\chr(7), 'xml');
+    }
+
     public function testDecode()
     {
         $source = $this->getXmlSource();

Original file line number	Diff line number	Diff line change
`@@ -433,6 +433,12 @@ public function testEncodeTraversableWhenNormalizable()`
`433`	`433`	`$this->assertEquals($expected, $serializer->serialize(new NormalizableTraversableDummy(), 'xml'));`
`434`	`434`	`}`
`435`	`435`
	`436`	`+ public function testEncodeException()`
	`437`	`+ {`
	`438`	`+ $this->expectException(NotEncodableValueException::class);`
	`439`	`+ $this->encoder->encode('Invalid character: '.\chr(7), 'xml');`
	`440`	`+ }`
	`441`	`+`
`436`	`442`	`public function testDecode()`
`437`	`443`	`{`
`438`	`444`	`$source = $this->getXmlSource();`