Fix JSONSerializableXMLElement::jsonSerialize for a node with only '0…

…' content
niels-nijens · Feb 12, 2016 · 593f9ac · 593f9ac
1 parent a865f37
commit 593f9ac
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/Configuration/JSONSerializableXMLElement.php b/src/Configuration/JSONSerializableXMLElement.php
@@ -45,7 +45,7 @@ public function jsonSerialize()
             }
         }
 
-        if (empty($data)) {
+        if ((is_array($data) && count($data) === 0) || (is_scalar($data) && strlen($data) === 0)) {
             $data = null;
         }
 

diff --git a/tests/Configuration/JSONSerializableXMLElementTest.php b/tests/Configuration/JSONSerializableXMLElementTest.php
@@ -45,6 +45,7 @@ public function provideTestJsonSerialize()
         return array(
             array('<node></node>', null),
             array('<node>Text</node>', 'Text'),
+            array('<node>0</node>', '0'),
             array("<node attribute='attributeValue'>Text</node>", array('attribute' => 'attributeValue', '#value' => 'Text')),
             array("<node attribute='attributeValue'><childnode/>Text</node>", array('attribute' => 'attributeValue', 'childnode' => null, '#value' => 'Text')),
             array("<node attribute='attributeValue'><childnode attribute='attributeValue'/>Text</node>", array('attribute' => 'attributeValue', 'childnode' => array('attribute' => 'attributeValue'), '#value' => 'Text')),