Merge pull request #10 from nichtich/master

Support parsing into associative array (#5)

Author: laktak

README.md

@@ -57,6 +57,7 @@ This method parses *JSON* or *Hjson* text to produce an object or array.
 - *text*: the string to parse as JSON or Hjson
 - *options*: array
   - *keepWsc*: boolean, keep white space and comments. This is useful if you want to edit an hjson file and save it while preserving comments (default false)
+  - *assoc*: boolean, return associative array instead of object (default false)
 
 ### HJSONStringifier: stringify($value, $options)
 

composer.json

@@ -26,7 +26,7 @@
     "require-dev": {
         "phpunit/phpunit": "~4.0"
     },
-        "autoload": {
+    "autoload": {
         "psr-4": {
             "HJSON\\": "src/HJSON"
         }

src/HJSON/HJSONParser.php

@@ -25,9 +25,15 @@ function __construct() {
 
     public function parse($source, $options=[])
     {
-        $this->keepWsc = $options && $options['keepWsc'];
+        $this->keepWsc = $options && isset($options['keepWsc']) && $options['keepWsc'];
         $this->text = $source;
-        return $this->rootValue();
+        $data = $this->rootValue();
+
+        if ($options && isset($options['assoc']) && $options['assoc']) {
+            $data = json_decode(json_encode($data), true);
+        }
+
+        return $data;
     }
 
     private function resetAt()

tests/HJSONParserTest.php

@@ -7,13 +7,10 @@
 
 class HJSONParserTest extends PHPUnit_Framework_TestCase {
 
-
     public function setUp()
     {
         parent::setUp();
         $this->rootDir = dirname(__FILE__).DIRECTORY_SEPARATOR."assets";
-        $this->parser = new HJSONParser();
-        $this->stringifier = new HJSONStringifier();
     }
 
     private function load($file, $cr)
@@ -30,11 +27,16 @@ private function runEach($name, $file, $isJson, $inputCr, $outputCr)
         $shouldFail = substr($name, 0, 4) === "fail";
 
         try {
-            $data = $this->parser->parse($text);
+            $parser = new HJSONParser();
+            $data = $parser->parse($text);
+
+			$arrayData = $parser->parse($text, ['assoc' => true]);
+            $this->assertEquals($arrayData, json_decode(json_encode($data), true));
 
             if (!$shouldFail) {
                 $text1 = json_encode($data, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
-                $hjson1 = $this->stringifier->stringify($data, [
+                $stringifier = new HJSONStringifier();
+                $hjson1 = $stringifier->stringify($data, [
                     'eol' => $outputCr ? "\r\n" : "\n",
                     'emitRootBraces' => true,
                     'space' => 2