Commit0cb4d8e

authored and

committed

[Serializer][XmlEncoder] Allow removing empty tags in generated XML

1 parent62533f3 commit0cb4d8eCopy full SHA for 0cb4d8e

File tree

+23

-1

lines changed

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

+23

-1

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -392,7 +392,7 @@ private function buildXml(\DOMNode $parentNode, $data, $xmlRootNodeName = null)`
`392`	`392`	`}`
`393`	`393`	`}elseif (is_numeric($key) \|\| !$this->isElementNameValid($key)) {`
`394`	`394`	`$append =$this->appendNode($parentNode,$data,'item',$key);`
`395`		`- }else {`
	`395`	`+ }elseif (null !==$data \|\| !isset($this->context['remove_empty_tags']) \|\|false ===$this->context['remove_empty_tags']) {`
`396`	`396`	`$append =$this->appendNode($parentNode,$data,$key);`
`397`	`397`	`}`
`398`	`398`	`}`

Lines changed: 22 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -138,6 +138,28 @@ public function testEncodeXmlAttributes()`
`138`	`138`	`$this->assertSame($expected,$this->encoder->encode($array,'xml',$context));`
`139`	`139`	`}`
`140`	`140`
	`141`	`+publicfunctiontestEncodeRemovingEmptyTags()`
	`142`	`+ {`
	`143`	`+$array =array('person' =>array('firstname' =>'Peter','lastname' =>null));`
	`144`	`+`
	`145`	`+$expected ='<?xml version="1.0"?>'."\n".`
	`146`	`+'<response><person><firstname>Peter</firstname></person></response>'."\n";`
	`147`	`+`
	`148`	`+$context =array('remove_empty_tags' =>true);`
	`149`	`+`
	`150`	`+$this->assertSame($expected,$this->encoder->encode($array,'xml',$context));`
	`151`	`+ }`
	`152`	`+`
	`153`	`+publicfunctiontestEncodeNotRemovingEmptyTags()`
	`154`	`+ {`
	`155`	`+$array =array('person' =>array('firstname' =>'Peter','lastname' =>null));`
	`156`	`+`
	`157`	`+$expected ='<?xml version="1.0"?>'."\n".`
	`158`	`+'<response><person><firstname>Peter</firstname><lastname/></person></response>'."\n";`
	`159`	`+`
	`160`	`+$this->assertSame($expected,$this->encoder->encode($array,'xml'));`
	`161`	`+ }`
	`162`	`+`
`141`	`163`	`publicfunctiontestContext()`
`142`	`164`	`{`
`143`	`165`	`$array =array('person' =>array('name' =>'George Abitbol'));`

Comments

(0)