Empty values/attributes/cdata are now handled appropriately (Fixes [#3])

Author: rquadling

.gitattributes

@@ -4,3 +4,5 @@
 # Force text mode
 *.php text diff=php
 *.xml text
+
+/tests/bugs/*.php diff=php eol=lf

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Version History
 
+**1.6** (2016/07/27)
+
+* Empty values/attributes/cdata are now handled appropriately (Fixes [#3](https://github.com/rquadling/lalit/issues/3))
+
 **1.5** (2016/06/29)
 
 * Reintroduce support for hhvm

src/Array2XML.php

@@ -36,7 +36,7 @@ class Array2XML
      * Convert an Array to XML
      *
      * @param string $node_name - name of the root node to be converted
-     * @param array  $arr       - aray to be converterd
+     * @param array  $arr       - array to be converted
      *
      * @return DomDocument
      */
@@ -98,7 +98,7 @@ private static function convert($node_name, $arr = [])
 
         if (is_array($arr)) {
             // get the attributes first.;
-            if (isset($arr['@attributes'])) {
+            if (array_key_exists('@attributes', $arr)) {
                 foreach ($arr['@attributes'] as $key => $value) {
                     if (!self::isValidTagName($key)) {
                         throw new Exception('[Array2XML] Illegal character in attribute name. attribute: ' . $key . ' in node: ' . $node_name);
@@ -110,12 +110,12 @@ private static function convert($node_name, $arr = [])
 
             // check if it has a value stored in @value, if yes store the value and return
             // else check if its directly stored as string
-            if (isset($arr['@value'])) {
+            if (array_key_exists('@value', $arr)) {
                 $node->appendChild($xml->createTextNode(self::bool2str($arr['@value'])));
                 unset($arr['@value']);    //remove the key from the array once done.
                 //return from recursion, as a note with value cannot have child nodes.
                 return $node;
-            } else if (isset($arr['@cdata'])) {
+            } else if (array_key_exists('@cdata', $arr)) {
                 $node->appendChild($xml->createCDATASection(self::bool2str($arr['@cdata'])));
                 unset($arr['@cdata']);    //remove the key from the array once done.
                 //return from recursion, as a note with cdata cannot have child nodes.

src/XML2Array.php

@@ -111,7 +111,7 @@ private static function convert(DOMNode $node)
                         $t = $child->tagName;
 
                         // assume more nodes of same kind are coming
-                        if (!isset($output[$t])) {
+                        if (!array_key_exists($t, $output)) {
                             $output[$t] = [];
                         }
                         $output[$t][] = $v;

tests/bugs/Bug003Test.php

@@ -0,0 +1,57 @@
+<?php
+namespace LaLit;
+
+use PHPUnit_Framework_TestCase;
+
+/**
+ * Class Bug003
+ *
+ * @package LaLit
+ * @group   bugfixes
+ */
+class Bug003 extends PHPUnit_Framework_TestCase
+{
+    public function testNullValues()
+    {
+        $array = [
+            'container' => [
+                'item' => [
+                    'term' => 'description',
+                    'label' => null,
+                    'emptyCData' => [
+                        '@cdata' => null,
+                    ],
+                    '@attributes' => [
+                        'present' => 'none',
+                    ],
+                    'node' => [
+                        '@attributes' => [
+                            'present' => 'years',
+                            'empty' => null,
+                        ],
+                        '@value' => null,
+                    ],
+                ],
+            ],
+        ];
+
+        $actualResults = Array2XML::createXML('root', $array)->saveXML();
+
+        $expectedResults = <<< END_XML
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<root>
+  <container>
+    <item present="none">
+      <term>description</term>
+      <label></label>
+      <emptyCData><![CDATA[]]></emptyCData>
+      <node present="years" empty=""></node>
+    </item>
+  </container>
+</root>
+
+END_XML;
+
+        self::assertEquals($expectedResults, $actualResults, 'Failed to handle empty @values');
+    }
+}