Merge pull request #23 from sprak3000/issue-22-stringify-assoc-arrays

Issue #22 - can't stringify assoc arrays

Author: dqsully

src/HJSON/HJSONParser.php

@@ -325,8 +325,7 @@ private function error($m)
             $colBytes += strlen($ch);
         }
 
-        for (; $i > 0;
-        $i--) {
+        for (; $i > 0; $i--) {
             if ($this->text[$i] === "\n") {
                 $line++;
             }
@@ -526,8 +525,7 @@ private function getComment($wat)
         $i;
         $wat--;
         // remove trailing whitespace
-        for ($i = $this->at - 2; $i > $wat && $this->text[$i] <= ' ' && $this->text[$i] !== "\n";
-        $i--) {
+        for ($i = $this->at - 2; $i > $wat && $this->text[$i] <= ' ' && $this->text[$i] !== "\n"; $i--) {
         }
 
         // but only up to EOL

src/HJSON/HJSONStringifier.php

@@ -77,8 +77,7 @@ public function stringify($value, $opt = [])
         // many spaces. If it is a string, it will be used as the indent string.
         if (is_int($space)) {
             $this->indent = '';
-            for ($i = 0; $i < $space;
-            $i++) {
+            for ($i = 0; $i < $space; $i++) {
                 $this->indent .= ' ';
             }
         } elseif (is_string($space)) {
@@ -239,6 +238,17 @@ private function str($value, $hasComment = null, $noIndent = null, $isRootObject
             case 'array':
                 $isArray = is_array($value);
 
+                $isAssocArray = function (array $arr) {
+                    if (array() === $arr) {
+                        return false;
+                    }
+                    return array_keys($arr) !== range(0, count($arr) - 1);
+                };
+                if ($isArray && $isAssocArray($value)) {
+                    $value = (object) $value;
+                    $isArray = false;
+                }
+
                 $kw = null;
                 $kwl = null; // whitespace & comments
                 if ($this->keepWsc) {
@@ -324,7 +334,7 @@ private function str($value, $hasComment = null, $noIndent = null, $isRootObject
                         }
                     } else {
                         foreach ($value as $k => $vvv) {
-                            $v = $this->str($value->$k);
+                            $v = $this->str($vvv);
                             if ($v !== null) {
                                 $partial[] = $this->quoteName($k) . ($startsWithNL($v) ? ':' : ': ') . $v;
                             }

tests/assets/pass1_result.hjson

@@ -8,6 +8,14 @@
   }
   {}
   []
+  {
+    1: foo
+    3: bar
+  }
+  {
+    foo: foo
+    bar: bar
+  }
   -42
   true
   false

tests/assets/pass1_result.json

@@ -7,6 +7,14 @@
   },
   {},
   [],
+  {
+    "1": "foo",
+    "3": "bar"
+  },
+  {
+    "foo": "foo",
+    "bar": "bar"
+  },
   -42,
   true,
   false,

tests/assets/pass1_test.json

@@ -3,6 +3,14 @@
     {"object with 1 member":["array with 1 element"]},
     {},
     [],
+    {
+        "1": "foo",
+        "3": "bar"
+    },
+    {
+        "foo": "foo",
+        "bar": "bar"
+    },
     -42,
     true,
     false,