Merge pull request #43 from koza4ok/ZendViewRenderer_mergeViewModel_fix

mergeViewModel pass array instead of object to mergeParams function

Author: weierophinney

src/ZendViewRenderer.php

@@ -295,7 +295,8 @@ private function getNamespacedResolver(AggregateResolver $aggregate)
      */
     private function mergeViewModel($name, ModelInterface $model)
     {
-        $params = $this->mergeParams($name, $model->getVariables());
+        $variables = $model->getVariables();
+        $params = $this->mergeParams($name, $this->normalizeParams($variables));
         $model->setVariables($params);
         $model->setTemplate($name);
         return $model;

test/ZendViewRendererTest.php

@@ -468,4 +468,27 @@ public function testWillRenderAViewModel()
         $content = str_replace('<?php echo $name ?>', 'Zend', $content);
         $this->assertEquals($content, $result);
     }
+
+    public function testCanRenderWithChildViewModel()
+    {
+        $path = __DIR__ . '/TestAsset';
+        $renderer = new ZendViewRenderer();
+        $renderer->addPath($path);
+        $viewModelParent = new ViewModel();
+        $viewModelChild = new ViewModel();
+        $viewModelChild->setTemplate('zendview-null');
+        $viewModelParent->setVariables([
+                'layout' => 'zendview-layout',
+        ]);
+        $viewModelParent->addChild($viewModelChild, 'name');
+        $result = $renderer->render('zendview', $viewModelParent);
+
+        $content = file_get_contents("$path/zendview-null.phtml");
+        $contentParent = file_get_contents("$path/zendview.phtml");
+        $contentParentLayout = file_get_contents("$path/zendview-layout.phtml");
+        //trim is used here, because rendering engine is trimming content too
+        $content = trim(str_replace('<?php echo $name ?>', $content, $contentParent));
+        $content = str_replace('<?= $this->content ?>', $content, $contentParentLayout);
+        $this->assertEquals($content, $result);
+    }
 }