Merge branch 'hotfix/51' into develop

Forward port #51

Conflicts:
	CHANGELOG.md

Author: weierophinney

CHANGELOG.md

@@ -24,6 +24,30 @@ All notable changes to this project will be documented in this file, in reverse
 
 - Nothing.
 
+## 1.4.2 - 2018-03-15
+
+### Added
+
+- Nothing.
+
+### Changed
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [#51](https://github.com/zendframework/zend-expressive-zendviewrenderer/pull/51)
+  fixes teh behavior of `addDefaultParam()` such that it properly affects
+  layouts as well as templates.
+
 ## 1.4.1 - 2017-12-12
 
 ### Added

src/ZendViewRenderer.php

@@ -342,7 +342,7 @@ private function prepareLayout(ModelInterface $viewModel)
         if ($layout) {
             $layout->addChild($viewModel);
             $viewModel = $layout;
-            $viewModel->setVariables($this->mergeParams(self::TEMPLATE_ALL, []));
+            $viewModel->setVariables($this->mergeParams($layout->getTemplate(), (array) $layout->getVariables()));
         }
 
         return $viewModel;

test/ZendViewRendererTest.php

@@ -246,6 +246,79 @@ public function testTemplateDefaultParameterIsNotAvailableInLayout()
         $this->assertContains($expected, $result, sprintf('Received %s', $result));
     }
 
+    public function testLayoutTemplateDefaultParameterIsAvailableInLayout()
+    {
+        $renderer = new ZendViewRenderer(null, 'zendview-layout-variable');
+        $renderer->addPath(__DIR__ . '/TestAsset');
+        $title = uniqid('ZendViewTitle', true);
+        $name = uniqid('ZendViewName', true);
+        $renderer->addDefaultParam('zendview-layout-variable', 'title', $title);
+        $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);
+        $layout = file_get_contents(__DIR__ . '/TestAsset/zendview-layout-variable.phtml');
+        $layout = str_replace('<?= $this->title ?>', $title, $layout);
+        $layout = str_replace('<?= $this->content ?>' . PHP_EOL, $content, $layout);
+        $this->assertContains($layout, $result);
+
+        $expected = sprintf('<title>Layout Page: %s</title>', $title);
+        $this->assertContains($expected, $result, sprintf('Received %s', $result));
+    }
+
+    public function testVariableInProvidedLayoutViewModelOverridesTemplateDefaultParameter()
+    {
+        $renderer = new ZendViewRenderer(null);
+        $renderer->addPath(__DIR__ . '/TestAsset');
+        $titleToBeOverriden = uniqid('ZendViewTitleToBeOverriden', true);
+        $title = uniqid('ZendViewTitle', true);
+        $name = uniqid('ZendViewName', true);
+        $renderer->addDefaultParam('zendview-layout-variable', 'title', $titleToBeOverriden);
+
+        $layout = new ViewModel(['title' => $title]);
+        $layout->setTemplate('zendview-layout-variable');
+        $result = $renderer->render('zendview', ['name' => $name, 'layout' => $layout]);
+        $this->assertContains($title, $result);
+        $this->assertContains($name, $result);
+
+        $content = file_get_contents(__DIR__ . '/TestAsset/zendview.phtml');
+        $content = str_replace('<?php echo $name ?>', $name, $content);
+        $layout = file_get_contents(__DIR__ . '/TestAsset/zendview-layout-variable.phtml');
+        $layout = str_replace('<?= $this->title ?>', $title, $layout);
+        $layout = str_replace('<?= $this->content ?>' . PHP_EOL, $content, $layout);
+        $this->assertContains($layout, $result);
+
+        $expected = sprintf('<title>Layout Page: %s</title>', $title);
+        $this->assertContains($expected, $result, sprintf('Received %s', $result));
+    }
+
+    public function testTemplateDefaultParameterIsAvailableInLayoutProvidedWithViewModel()
+    {
+        $renderer = new ZendViewRenderer(null);
+        $renderer->addPath(__DIR__ . '/TestAsset');
+        $title = uniqid('ZendViewTitle', true);
+        $name = uniqid('ZendViewName', true);
+        $renderer->addDefaultParam('zendview-layout-variable', 'title', $title);
+
+        $layout = new ViewModel();
+        $layout->setTemplate('zendview-layout-variable');
+        $result = $renderer->render('zendview', ['name' => $name, 'layout' => $layout]);
+        $this->assertContains($title, $result);
+        $this->assertContains($name, $result);
+
+        $content = file_get_contents(__DIR__ . '/TestAsset/zendview.phtml');
+        $content = str_replace('<?php echo $name ?>', $name, $content);
+        $layout = file_get_contents(__DIR__ . '/TestAsset/zendview-layout-variable.phtml');
+        $layout = str_replace('<?= $this->title ?>', $title, $layout);
+        $layout = str_replace('<?= $this->content ?>' . PHP_EOL, $content, $layout);
+        $this->assertContains($layout, $result);
+
+        $expected = sprintf('<title>Layout Page: %s</title>', $title);
+        $this->assertContains($expected, $result, sprintf('Received %s', $result));
+    }
+
     /**
      * @group layout
      */