Commitadb428d

Amrouche Hamza

committed

[Serializer] add a context key to return always as collection for XmlEncoder

1 parentb0facfe commitadb428dCopy full SHA for adb428d

File tree

+28

-1

lines changed

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

+28

-1

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -335,7 +335,7 @@ private function parseXmlValue(\DOMNode $node, array $context = array())`
`335`	`335`	`}`
`336`	`336`
`337`	`337`	`foreach ($valueas$key =>$val) {`
`338`		`-if (\is_array($val) &&1 ===\count($val)) {`
	`338`	`+if (empty($context['as_collection']) &&\is_array($val) &&1 ===\count($val)) {`
`339`	`339`	`$value[$key] =current($val);`
`340`	`340`	`}`
`341`	`341`	`}`

Lines changed: 27 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -515,6 +515,33 @@ public function testDecodeIgnoreWhiteSpace()`
`515`	`515`	`$this->assertEquals($expected,$this->encoder->decode($source,'xml'));`
`516`	`516`	`}`
`517`	`517`
	`518`	`+publicfunctiontestDecodeAlwaysAsCollection()`
	`519`	`+ {`
	`520`	`+$this->encoder =newXmlEncoder('response',null);`
	`521`	`+$serializer =newSerializer(array(newCustomNormalizer()),array('xml' =>newXmlEncoder()));`
	`522`	`+$this->encoder->setSerializer($serializer);`
	`523`	`+`
	`524`	`+$source = <<<'XML'`
	`525`	`+<?xml version="1.0"?>`
	`526`	`+<order_rows nodeType="order_row" virtualEntity="true">`
	`527`	`+ <order_row>`
	`528`	`+ <id><![CDATA[16]]></id>`
	`529`	`+ <test><![CDATA[16]]></test>`
	`530`	`+ </order_row>`
	`531`	`+</order_rows>`
	`532`	`+XML;`
	`533`	`+$expected =array(`
	`534`	`+'@nodeType' =>'order_row',`
	`535`	`+'@virtualEntity' =>'true',`
	`536`	`+'order_row' =>array(array(`
	`537`	`+'id' =>array(16),`
	`538`	`+'test' =>array(16),`
	`539`	`+ )),`
	`540`	`+ );`
	`541`	`+`
	`542`	`+$this->assertEquals($expected,$this->encoder->decode($source,'xml',array('as_collection' =>true)));`
	`543`	`+ }`
	`544`	`+`
`518`	`545`	`publicfunctiontestDecodeWithoutItemHash()`
`519`	`546`	`{`
`520`	`547`	`$obj =newScalarDummy();`

Comments

(0)