Commit86c2978

committed

Make document type nodes ignorable

1 parentee211c4 commit86c2978Copy full SHA for 86c2978

File tree

+32

-2

lines changed

src/Symfony/Component/Serializer
- Encoder
  - XmlEncoder.php
- Tests/Encoder
  - XmlEncoderTest.php

+32

-2

lines changed

Lines changed: 5 additions & 2 deletions

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->childNodesas$child) {`
	`157`	`+if (\in_array($child->nodeType,$decoderIgnoredNodeTypes,true)) {`
	`158`	`+continue;`
	`159`	`+ }`
`157`	`160`	`if (\XML_DOCUMENT_TYPE_NODE ===$child->nodeType) {`
`158`	`161`	`thrownewNotEncodableValueException('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`		`-thrownewNotEncodableValueException('An unexpected value could not be serialized:'.(!\is_resource($data) ?var_export($data,true) :sprintf('%s resource',get_resource_type($data))));`
	`483`	`+thrownewNotEncodableValueException('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`	`/**`

Lines changed: 27 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -587,6 +587,33 @@ public function testDecodeIgnoreComments()`
`587`	`587`	`$this->assertEquals($expected,$this->encoder->decode($source,'xml'));`
`588`	`588`	`}`
`589`	`589`
	`590`	`+publicfunctiontestDecodeIgnoreDocumentType()`
	`591`	`+ {`
	`592`	`+$source = <<<'XML'`
	`593`	`+<?xml version="1.0"?>`
	`594`	`+<!DOCTYPE people>`
	`595`	`+<people>`
	`596`	`+ <person>`
	`597`	`+ <firstname>Benjamin</firstname>`
	`598`	`+ <lastname>Alexandre</lastname>`
	`599`	`+ </person>`
	`600`	`+ <person>`
	`601`	`+ <firstname>Damien</firstname>`
	`602`	`+ <lastname>Clay</lastname>`
	`603`	`+ </person>`
	`604`	`+</people>`
	`605`	`+XML;`
	`606`	`+$expected = ['person' => [`
	`607`	`+ ['firstname' =>'Benjamin','lastname' =>'Alexandre'],`
	`608`	`+ ['firstname' =>'Damien','lastname' =>'Clay'],`
	`609`	`+ ]];`
	`610`	`+$this->assertEquals($expected,$this->encoder->decode(`
	`611`	`+$source,`
	`612`	`+'xml',`
	`613`	`+ [XmlEncoder::DECODER_IGNORED_NODE_TYPES => [\XML_DOCUMENT_TYPE_NODE]]`
	`614`	`+ ));`
	`615`	`+ }`
	`616`	`+`
`590`	`617`	`publicfunctiontestDecodePreserveComments()`
`591`	`618`	`{`
`592`	`619`	`$this->doTestDecodePreserveComments();`

Comments

(0)