diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Serializer] [XmlEncoder] Allow decoder to extract attributes in root element

Browse Source
This commit is contained in:
Joel Wurtz 2011-04-27 06:34:41 -07:00
parent 71330e91d0
commit b6a9935314
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
View File

@ -54,8 +54,15 @@ class XmlEncoder extends AbstractEncoder implements DecoderInterface
public function decode($data, $format) public function decode($data, $format)
{ {
$xml = simplexml_load_string($data); $xml = simplexml_load_string($data);
if (!$xml->count()) { if (!$xml->count() && !$xml->attributes()) {
return (string) $xml; return (string) $xml;
} elseif (!$xml->count()) {
$data = array();
foreach ($xml->attributes() as $attrkey => $attr) {
$data['@'.$attrkey] = (string) $attr;
}
$data['#'] = (string) $xml;
return $data;
} }
return $this->parseXml($xml); return $this->parseXml($xml);
} }
@ -157,14 +164,14 @@ class XmlEncoder extends AbstractEncoder implements DecoderInterface
private function parseXml($node) private function parseXml($node)
{ {
$data = array(); $data = array();
if ($node->attributes()) {
foreach ($node->attributes() as $attrkey => $attr) {
$data['@'.$attrkey] = (string) $attr;
}
}
foreach ($node->children() as $key => $subnode) { foreach ($node->children() as $key => $subnode) {
if ($subnode->count()) { if ($subnode->count()) {
$value = $this->parseXml($subnode); $value = $this->parseXml($subnode);
if ($subnode->attributes()) {
foreach ($subnode->attributes() as $attrkey => $attr) {
$value['@'.$attrkey] = (string) $attr;
}
}
} elseif ($subnode->attributes()) { } elseif ($subnode->attributes()) {
$value = array(); $value = array();
foreach ($subnode->attributes() as $attrkey => $attr) { foreach ($subnode->attributes() as $attrkey => $attr) {