Merge branch 'hotfix/43' into develop

Forward port #43

Author: weierophinney

CHANGELOG.md

@@ -45,7 +45,11 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#43](https://github.com/zendframework/zend-expressive-zendviewrenderer/pull/43)
+  ensures that if a view model provided to the renderer contains child view
+  models, then it will properly merge variables pulled from the child model.
+  Previously, an error would occur due to an attempt to merge either a null or
+  an object where it expected an array.
 
 ## 1.4.0 - 2017-03-14
 

src/ZendViewRenderer.php

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

test/ZendViewRendererTest.php

@@ -468,4 +468,32 @@ 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);
+
+        $viewModelChild = new ViewModel();
+        $viewModelChild->setTemplate('zendview-null');
+
+        $viewModelParent = new ViewModel();
+        $viewModelParent->setVariables([
+            'layout' => 'zendview-layout',
+        ]);
+        $viewModelParent->addChild($viewModelChild, 'name');
+
+        $result = $renderer->render('zendview', $viewModelParent);
+
+        $content             = file_get_contents(sprintf('%s/zendview-null.phtml', $path));
+        $contentParent       = file_get_contents(sprintf('%s/zendview.phtml', $path));
+        $contentParentLayout = file_get_contents(sprintf('%s/zendview-layout.phtml', $path));
+
+        // 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);
+    }
 }