Make document type nodes ignorable

boenner · boenner · commit 86c2978ba8dd · 2021-12-15T18:28:17.000+01:00
diff --git a/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php b/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
@@ -154,10 +154,13 @@ public function decode($data, $format, array $context = [])
         $rootNode = null;
         $decoderIgnoredNodeTypes = $context[self::DECODER_IGNORED_NODE_TYPES] ?? $this->defaultContext[self::DECODER_IGNORED_NODE_TYPES];
         foreach ($dom->childNodes as $child) {
+            if (\in_array($child->nodeType, $decoderIgnoredNodeTypes, true)) {
+                continue;
+            }
             if (\XML_DOCUMENT_TYPE_NODE === $child->nodeType) {
                 throw new NotEncodableValueException('Document types are not allowed.');
             }
-            if (!$rootNode && !\in_array($child->nodeType, $decoderIgnoredNodeTypes, true)) {
+            if (!$rootNode) {
                 $rootNode = $child;
             }
         }
@@ -477,7 +480,7 @@ private function buildXml(\DOMNode $parentNode, $data, string $xmlRootNodeName =
             return $this->appendNode($parentNode, $data, 'data');
         }
 
-        throw new NotEncodableValueException('An unexpected value could not be serialized: '.(!\is_resource($data) ? var_export($data, true) : sprintf('%s resource', get_resource_type($data))));
+        throw new NotEncodableValueException('An unexpected value could not be serialized: '.(!\is_resource($data) ? var_export($data, true) : sprintf('"%s" resource', get_resource_type($data))));
     }
 
     /**
diff --git a/src/Symfony/Component/Serializer/Tests/Encoder/XmlEncoderTest.php b/src/Symfony/Component/Serializer/Tests/Encoder/XmlEncoderTest.php
@@ -587,6 +587,33 @@ public function testDecodeIgnoreComments()
         $this->assertEquals($expected, $this->encoder->decode($source, 'xml'));
     }
 
+    public function testDecodeIgnoreDocumentType()
+    {
+        $source = <<<'XML'
+<?xml version="1.0"?>
+<!DOCTYPE people>
+<people>
+    <person>
+        <firstname>Benjamin</firstname>
+        <lastname>Alexandre</lastname>
+    </person>
+    <person>
+        <firstname>Damien</firstname>
+        <lastname>Clay</lastname>
+    </person>
+</people>
+XML;
+        $expected = ['person' => [
+          ['firstname' => 'Benjamin', 'lastname' => 'Alexandre'],
+          ['firstname' => 'Damien', 'lastname' => 'Clay'],
+        ]];
+        $this->assertEquals($expected, $this->encoder->decode(
+            $source,
+            'xml',
+            [XmlEncoder::DECODER_IGNORED_NODE_TYPES => [\XML_DOCUMENT_TYPE_NODE]]
+        ));
+    }
+
     public function testDecodePreserveComments()
     {
         $this->doTestDecodePreserveComments();

Original file line number	Diff line number	Diff line change
`@@ -154,10 +154,13 @@ public function decode($data, $format, array $context = [])`
`154`	`154`	`$rootNode = null;`
`155`	`155`	`$decoderIgnoredNodeTypes = $context[self::DECODER_IGNORED_NODE_TYPES] ?? $this->defaultContext[self::DECODER_IGNORED_NODE_TYPES];`
`156`	`156`	`foreach ($dom->childNodes as $child) {`
	`157`	`+ if (\in_array($child->nodeType, $decoderIgnoredNodeTypes, true)) {`
	`158`	`+ continue;`
	`159`	`+ }`
`157`	`160`	`if (\XML_DOCUMENT_TYPE_NODE === $child->nodeType) {`
`158`	`161`	`throw new NotEncodableValueException('Document types are not allowed.');`
`159`	`162`	`}`
`160`		`- if (!$rootNode && !\in_array($child->nodeType, $decoderIgnoredNodeTypes, true)) {`
	`163`	`+ if (!$rootNode) {`
`161`	`164`	`$rootNode = $child;`
`162`	`165`	`}`
`163`	`166`	`}`
`@@ -477,7 +480,7 @@ private function buildXml(\DOMNode $parentNode, $data, string $xmlRootNodeName =`
`477`	`480`	`return $this->appendNode($parentNode, $data, 'data');`
`478`	`481`	`}`
`479`	`482`
`480`		`- throw new NotEncodableValueException('An unexpected value could not be serialized: '.(!\is_resource($data) ? var_export($data, true) : sprintf('%s resource', get_resource_type($data))));`
	`483`	`+ throw new NotEncodableValueException('An unexpected value could not be serialized: '.(!\is_resource($data) ? var_export($data, true) : sprintf('"%s" resource', get_resource_type($data))));`
`481`	`484`	`}`
`482`	`485`
`483`	`486`	`/**`