Updates

Author: usernane

src/Json.php

@@ -954,15 +954,6 @@ private function _arrayToJSONString(array $value,$asObject = false) {
 
         return $arr;
     }
-    private static function _arrayToObj($subVal) {
-        $subObj = new Json();
-
-        foreach ($subVal as $key => $val) {
-            self::_fixParsed($subObj, $key, $val);
-        }
-
-        return $subObj;
-    }
     private static function _checkArr($subVal, &$parentArr) {
         $isIndexed = self::_isIndexedArr($subVal);
 
@@ -989,9 +980,6 @@ private static function _checkArr($subVal, &$parentArr) {
                 }
             }
             $parentArr[] = $subArr;
-        } else {
-            // Object inside array
-            $parentArr[] = self::_arrayToObj($subVal);
         }
     }
     /**
@@ -1171,7 +1159,7 @@ private static function _toCamelCase($attr) {
 
         for ($x = 0 ; $x < strlen($attr) ; $x++) {
             $char = $attr[$x];
-            
+
             if (($char == '-' || $char == '_') && $x != 0) {
                 $changeNextCharCase = true;
                 continue;

tests/JsonXTest.php

@@ -325,6 +325,24 @@ public function testDecode05() {
         $this->assertTrue(gettype($outerArr[0]->get('deep-arr')) == 'array');
 
 
+    }
+    public function testDecode08() {
+        $jsonStr = '{"arr":['
+                . '["hello", {"one":1}, [{"sub-arr":["one", {"hello":"world"}]}]'
+                . ']'
+                . ']}';
+        $decoded = Json::decode($jsonStr);
+        $this->assertTrue($decoded instanceof Json);
+        $this->assertEquals($jsonStr, $decoded->toJSONString());
+        $arr = $decoded->get('arr');
+        $this->assertTrue(gettype($arr) == 'array');
+        $this->assertEquals(1, count($arr));
+        $this->assertEquals('hello',$arr[0][0]);
+        $subObj = $arr[0][1];
+        $this->assertTrue($subObj instanceof Json);
+        $this->assertTrue($subObj->hasKey('one'));
+        $subArr = $arr[0][2];
+        $this->assertTrue(gettype($subArr) == 'array');
     }
     /**
      * @test