Merge branch 'hotfix/62' into develop

Forward port #62

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.2 - TBD
+## 2.0.2 - 2019-01-14
 
 ### Added
 
@@ -44,7 +44,8 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#62](https://github.com/zendframework/zend-expressive-zendviewrenderer/pull/62) provides a fix to allow setting the layout via the `layout()` view helper
+  within a view script.
 
 ## 2.0.1 - 2018-08-13
 

src/ZendViewRenderer.php

@@ -14,6 +14,7 @@
 use Zend\Expressive\Template\Exception;
 use Zend\Expressive\Template\TemplatePath;
 use Zend\Expressive\Template\TemplateRendererInterface;
+use Zend\View\Helper;
 use Zend\View\Model\ModelInterface;
 use Zend\View\Model\ViewModel;
 use Zend\View\Renderer\PhpRenderer;
@@ -193,8 +194,15 @@ private function createModel($name, $params)
      *
      * @throws Exception\RenderingException if it encounters a terminal child.
      */
-    private function renderModel(ModelInterface $model, RendererInterface $renderer) : string
-    {
+    private function renderModel(
+        ModelInterface $model,
+        RendererInterface $renderer,
+        ModelInterface $root = null
+    ) : string {
+        if (! $root) {
+            $root = $model;
+        }
+
         foreach ($model as $child) {
             if ($child->terminate()) {
                 throw new Exception\RenderingException('Cannot render; encountered a child marked terminal');
@@ -206,7 +214,13 @@ private function renderModel(ModelInterface $model, RendererInterface $renderer)
             }
 
             $child  = $this->mergeViewModel($child->getTemplate(), $child);
-            $result = $this->renderModel($child, $renderer);
+
+            if ($child !== $root) {
+                $viewModelHelper = $renderer->plugin(Helper\ViewModel::class);
+                $viewModelHelper->setRoot($root);
+            }
+
+            $result = $this->renderModel($child, $renderer, $root);
 
             if ($child->isAppend()) {
                 $oldResult = $model->{$capture};

test/TestAsset/zendview-change-layout.phtml

@@ -0,0 +1,3 @@
+<?php $this->layout('zendview-layout2'); ?>
+
+<h1>This is a template file for ZendView</h1>

test/ZendViewRendererTest.php

@@ -606,4 +606,20 @@ public function testRenderChildWithDefaultParameter()
 
         static::assertEquals($content, $result);
     }
+
+    public function testChangeLayoutInTemplate()
+    {
+        $renderer = new ZendViewRenderer();
+        $renderer->addPath(__DIR__ . '/TestAsset');
+
+        $result = $renderer->render('zendview-change-layout', ['layout' => 'zendview-layout']);
+
+        $contentChild = file_get_contents(__DIR__ . '/TestAsset/zendview-change-layout.phtml');
+        $contentChild = str_replace("<?php \$this->layout('zendview-layout2'); ?>\n", '', $contentChild);
+
+        $content = file_get_contents(__DIR__ . '/TestAsset/zendview-layout2.phtml');
+        $content = str_replace("<?= \$this->content ?>\n", $contentChild, $content);
+
+        static::assertEquals($content, $result);
+    }
 }