Merge branch 'hotfix/json-renderer-merge-unnamed-children' of https:/…

…/github.com/mpinkston/zf2 into hotfix/view-jsonrenderer-child-merge

src/Model/JsonModel.php

@@ -33,6 +33,14 @@
  */
 class JsonModel extends ViewModel
 {
+    /**
+     * JSON probably won't need to be captured into a 
+     * a parent container by default.
+     * 
+     * @var string
+     */
+    protected $captureTo = null;
+
     /**
      * JSON is usually terminal
      * 
@@ -51,6 +59,6 @@ public function serialize()
         if ($variables instanceof Traversable) {
             $variables = ArrayUtils::iteratorToArray($variables);
         }
-        return json_encode($variables);
+        return Json::encode($variables);
     }
 }

src/Renderer/JsonRenderer.php

@@ -166,6 +166,10 @@ public function canRenderTrees()
     protected function recurseModel(Model $model)
     {
         $values = $model->getVariables();
+        if ($values instanceof Traversable) {
+            $values = ArrayUtils::iteratorToArray($values);
+        }
+
         if (!$model->hasChildren()) {
             return $values;
         }

src/Variables.php

@@ -57,7 +57,7 @@ public function __construct(array $variables = array(), array $options = array()
     {
         parent::__construct(
             $variables, 
-            ArrayObject::STD_PROP_LIST|ArrayObject::ARRAY_AS_PROPS, 
+            ArrayObject::ARRAY_AS_PROPS, 
             'ArrayIterator'
         );