[ZF-11183] ensure arrays of objects are deserialized

- Ensure arrays containing objects are de-serialized to arrays when deserializing JSON
zendframework · Mar 16, 2011 · 9ce83ec · 9ce83ec
1 parent 9d0c069
commit 9ce83ec
Show file tree

Hide file tree

Showing 3 changed files with 68 additions and 0 deletions.
diff --git a/src/Json.php b/src/Json.php
@@ -240,6 +240,13 @@ protected function flattenObjects($config)
             if (is_object($value)) {
                 $value = $this->flattenObjects($value);
             }
+            if (is_array($value)) {
+                foreach ($value as $k => $v) {
+                    if (is_object($v)) {
+                        $value[$k] = $this->flattenObjects($v);
+                    }
+                }
+            }
             $flattened[$key] = $value;
         }
         return $flattened;

diff --git a/test/JsonTest.php b/test/JsonTest.php
@@ -276,4 +276,11 @@ public function testIgnoringConstantsCanLeadToParseErrors()
         $this->setExpectedException('Zend\Json\Exception', 'Syntax');
         $config = new JsonConfig($json, null, array('ignore_constants' => true));
     }
+
+    public function testNestedConfigSetsAreArrays()
+    {
+        $config = new JsonConfig(__DIR__ . '/_files/nested.json', 'testing');
+        $array  = $config->toArray();
+        $this->assertInternalType('array', $array['definitions'][0]);
+    }
 }
diff --git a/test/_files/nested.json b/test/_files/nested.json
@@ -0,0 +1,54 @@
+{
+    "testing": {
+        "definitions": [
+            {
+                "class": "Zend\\Di\\TestAsset\\Struct",
+                "params": {
+                    "param1": "foo",
+                    "param2": "bar"
+                },
+                "param_map": {
+                    "param1": 0,
+                    "param2": 1
+                }
+            },
+            {
+                "class": "Zend\\Di\\TestAsset\\DummyParams",
+                "constructor_callback": {
+                    "class": "Zend\\Di\\TestAsset\\StaticFactory",
+                    "method": "factory"
+                },
+                "params": {
+                    "struct": { "__reference": "struct" },
+                    "params": {"foo": "bar"}
+                },
+                "param_map": {
+                    "struct": 0,
+                    "params": 1
+                }
+            },
+            {
+                "class": "Zend\\Di\\TestAsset\\InjectedMethod",
+                "methods": [
+                    {
+                        "name": "setObject",
+                        "args": [ { "__reference": "params" } ]
+                    }
+                ]
+            },
+            {
+                "class": "Zend\\Di\\TestAsset\\InspectedClass",
+                "params": {
+                    "baz": "BAZ",
+                    "foo": "FOO"
+                }
+            }
+        ],
+        "aliases": {
+            "struct": "Zend\\Di\\TestAsset\\Struct",
+            "params": "Zend\\Di\\TestAsset\\DummyParams",
+            "injected": "Zend\\Di\\TestAsset\\InjectedMethod",
+            "inspected": "Zend\\Di\\TestAsset\\InspectedClass"
+        }
+    }
+}