Merge branch 'hotfix/58' into develop

Forward port #58

Conflicts:
	CHANGELOG.md

Author: weierophinney

CHANGELOG.md

@@ -24,7 +24,7 @@ All notable changes to this project will be documented in this file, in reverse
 
 - Nothing.
 
-## 2.0.1 - TBD
+## 2.0.1 - 2018-08-13
 
 ### Added
 
@@ -44,7 +44,8 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#58](https://github.com/zendframework/zend-expressive-zendviewrenderer/pull/58) fixes an issue whereby the default renderer parameters were not
+- being merged into the view model passed to the renderer. It now correctly does so.
 
 ## 2.0.0 - 2018-03-15
 

src/ZendViewRenderer.php

@@ -205,6 +205,7 @@ private function renderModel(ModelInterface $model, RendererInterface $renderer)
                 continue;
             }
 
+            $child  = $this->mergeViewModel($child->getTemplate(), $child);
             $result = $this->renderModel($child, $renderer);
 
             if ($child->isAppend()) {

test/ZendViewRendererTest.php

@@ -581,4 +581,29 @@ public function testCanRenderWithChildViewModel()
 
         $this->assertEquals($content, $result);
     }
+
+    public function testRenderChildWithDefaultParameter()
+    {
+        $name2 = 'Foo';
+
+        $renderer = new ZendViewRenderer();
+        $renderer->addPath(__DIR__ . '/TestAsset');
+        $renderer->addDefaultParam('zendview-2', 'name', $name2);
+
+        $viewModelChild = new ViewModel();
+        $viewModelChild->setTemplate('zendview-2');
+
+        $viewModelParent = new ViewModel();
+        $viewModelParent->addChild($viewModelChild, 'name');
+
+        $result = $renderer->render('zendview', $viewModelParent);
+
+        $contentChild = file_get_contents(__DIR__ . '/TestAsset/zendview-2.phtml');
+        $contentChild = str_replace('<?php echo $name ?>', $name2, $contentChild);
+
+        $content = file_get_contents(__DIR__ . '/TestAsset/zendview.phtml');
+        $content = str_replace('<?php echo $name ?>', $contentChild, $content);
+
+        static::assertEquals($content, $result);
+    }
 }