Merge branch 'hotfix/41'

weierophinney · weierophinney · commit b46ff34c69a0 · 2017-12-12T12:15:36.000-06:00
Close #41
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,12 @@ All notable changes to this project will be documented in this file, in reverse
   `Zend\View\Renderer\PhpRenderer` service when present, defaulting to creating
   an unconfigured instance if none is available (previous behavior).
 
+### Changed
+
+- [#41](https://github.com/zendframework/zend-expressive-zendviewrenderer/pull/41)
+  updates the renderer to also inject the layout with any default parameters (vs
+  only the template requested).
+
 ### Deprecated
 
 - Nothing.
diff --git a/src/ZendViewRenderer.php b/src/ZendViewRenderer.php
@@ -339,6 +339,7 @@ private function prepareLayout(ModelInterface $viewModel)
         if ($layout) {
             $layout->addChild($viewModel);
             $viewModel = $layout;
+            $viewModel->setVariables($this->mergeParams(self::TEMPLATE_ALL, []));
         }
 
         return $viewModel;
diff --git a/test/TestAsset/zendview-layout-variable.phtml b/test/TestAsset/zendview-layout-variable.phtml
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>Layout Page: <?= $this->title ?></title>
+</head>
+<body>
+    <?= $this->content ?>
+</body>
diff --git a/test/ZendViewRendererTest.php b/test/ZendViewRendererTest.php
@@ -208,6 +208,44 @@ public function testWillRenderContentInLayoutPassedToConstructor()
         $this->assertContains('<title>Layout Page</title>', $result, sprintf('Received %s', $result));
     }
 
+    public function testSharedParameterIsAvailableInLayout()
+    {
+        $renderer = new ZendViewRenderer(null, 'zendview-layout-variable');
+        $renderer->addPath(__DIR__ . '/TestAsset');
+        $title = uniqid('ZendViewTitle', true);
+        $renderer->addDefaultParam($renderer::TEMPLATE_ALL, 'title', $title);
+
+        $name = uniqid('ZendViewName', true);
+        $result = $renderer->render('zendview', ['name' => $name]);
+
+        $this->assertContains($title, $result);
+        $this->assertContains($name, $result);
+        $content = file_get_contents(__DIR__ . '/TestAsset/zendview.phtml');
+        $content = str_replace('<?php echo $name ?>', $name, $content);
+        $this->assertContains($content, $result);
+        $expected = sprintf('<title>Layout Page: %s</title>', $title);
+        $this->assertContains($expected, $result, sprintf('Received %s', $result));
+    }
+
+    public function testTemplateDefaultParameterIsNotAvailableInLayout()
+    {
+        $renderer = new ZendViewRenderer(null, 'zendview-layout-variable');
+        $renderer->addPath(__DIR__ . '/TestAsset');
+        $title = uniqid('ZendViewTitle', true);
+        $renderer->addDefaultParam('zendview', 'title', $title);
+
+        $name = uniqid('ZendViewName', true);
+        $result = $renderer->render('zendview', ['name' => $name]);
+
+        $this->assertNotContains($title, $result);
+        $this->assertContains($name, $result);
+        $content = file_get_contents(__DIR__ . '/TestAsset/zendview.phtml');
+        $content = str_replace('<?php echo $name ?>', $name, $content);
+        $this->assertContains($content, $result);
+        $expected = sprintf('<title>Layout Page: %s</title>', '');
+        $this->assertContains($expected, $result, sprintf('Received %s', $result));
+    }
+
     /**
      * @group layout
      */

Original file line number	Diff line number	Diff line change
`@@ -339,6 +339,7 @@ private function prepareLayout(ModelInterface $viewModel)`
`339`	`339`	`if ($layout) {`
`340`	`340`	`$layout->addChild($viewModel);`
`341`	`341`	`$viewModel = $layout;`
	`342`	`+ $viewModel->setVariables($this->mergeParams(self::TEMPLATE_ALL, []));`
`342`	`343`	`}`
`343`	`344`
`344`	`345`	`return $viewModel;`