From f11cc2de0b896644b61095e3319d0a8ea745223d Mon Sep 17 00:00:00 2001 From: Joel Wurtz Date: Wed, 27 Apr 2011 08:00:31 -0700 Subject: [PATCH] [Seriliazer] [XmlEncoder] Optimize conditions --- src/Symfony/Component/Serializer/Encoder/XmlEncoder.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php b/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php index 91d42a49ee..13da7c0ec7 100644 --- a/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php +++ b/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php @@ -54,9 +54,10 @@ class XmlEncoder extends AbstractEncoder implements DecoderInterface public function decode($data, $format) { $xml = simplexml_load_string($data); - if (!$xml->count() && !$xml->attributes()) { - return (string) $xml; - } elseif (!$xml->count()) { + if (!$xml->count()) { + if (!$xml->attributes()) { + return (string) $xml; + } $data = array(); foreach ($xml->attributes() as $attrkey => $attr) { $data['@'.$attrkey] = (string) $attr;