Merging develop to master in preparation for 1.3.0 release

Author: weierophinney

.gitattributes

@@ -4,4 +4,7 @@
 .gitignore export-ignore
 .travis.yml export-ignore
 phpcs.xml export-ignore
+.docheader export-ignore
+CONDUCT.md export-ignore
+CONTRIBUTING.md export-ignore
 phpunit.xml.dist export-ignore

CHANGELOG.md

@@ -2,6 +2,40 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
+## 1.3.0 - TBD
+
+### Added
+
+- [#23](https://github.com/zendframework/zend-expressive-zendviewrenderer/pull/23)
+  adds the ability to disable layouts either globally or when rendering. Disable
+  globally by setting the default `layout` parameter to boolean `false`:
+
+  ```php
+  $renderer->addDefaultParam(TemplateRendererInterface::TEMPLATE_ALL, 'layout', false);
+  ```
+
+  Or do so when rendering, by passing the template variable `layout` with a
+  boolean `false` value:
+
+  ```php
+  $renderer->render($templateName, [
+      'layout' => false,
+      // other template variables
+  ]);
+  ```
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- Nothing.
+
 ## 1.2.2 - TBD
 
 ### Added

README.md

@@ -34,4 +34,4 @@ To use view helpers, the `ZendViewRendererFactory`:
 
 ## Documentation
 
-See the Expressive [ZF View documentation](https://docs.zendframework.com/zend-expressive/features/template/zend-view/).
+Browse online at https://docs.zendframework.com/zend-expressive/features/template/zend-view/.

src/ZendViewRenderer.php

@@ -125,7 +125,10 @@ public function render($name, $params = [])
             ? $this->mergeViewModel($name, $params)
             : $this->createModel($name, $params);
 
-        $viewModel = $this->prepareLayout($viewModel);
+        $useLayout = false !== $viewModel->getVariable('layout', null);
+        if ($useLayout) {
+            $viewModel = $this->prepareLayout($viewModel);
+        }
 
         return $this->renderModel($viewModel, $this->renderer);
     }
@@ -321,16 +324,16 @@ private function mergeViewModel($name, ModelInterface $model)
      */
     private function prepareLayout(ModelInterface $viewModel)
     {
-        $layout = $this->layout ? clone $this->layout : null;
-
-        $providedLayout = $viewModel->getVariable('layout', false);
+        $providedLayout = $viewModel->getVariable('layout', null);
         if (is_string($providedLayout) && ! empty($providedLayout)) {
             $layout = new ViewModel();
             $layout->setTemplate($providedLayout);
             $viewModel->setVariable('layout', null);
         } elseif ($providedLayout instanceof ModelInterface) {
             $layout = $providedLayout;
             $viewModel->setVariable('layout', null);
+        } else {
+            $layout = $this->layout ? clone $this->layout : null;
         }
 
         if ($layout) {

test/ZendViewRendererTest.php

@@ -11,6 +11,7 @@
 use PHPUnit\Framework\TestCase;
 use Zend\Expressive\Template\Exception\InvalidArgumentException;
 use Zend\Expressive\Template\TemplatePath;
+use Zend\Expressive\Template\TemplateRendererInterface;
 use Zend\Expressive\ZendView\ZendViewRenderer;
 use Zend\View\Model\ViewModel;
 use Zend\View\Renderer\PhpRenderer;
@@ -279,6 +280,51 @@ public function testCanPassViewModelForLayoutParameterWhenRendering()
         $this->assertContains('<title>ALTERNATE LAYOUT PAGE</title>', $result);
     }
 
+    /**
+     * @group layout
+     */
+    public function testDisableLayoutOnRender()
+    {
+        $layout = new ViewModel();
+        $layout->setTemplate('zendview-layout');
+
+        $renderer = new ZendViewRenderer(null, $layout);
+        $renderer->addPath(__DIR__ . '/TestAsset');
+
+        $name = 'zendview';
+        $rendered = $renderer->render('zendview', [
+            'layout' => false,
+            'name'   => $name,
+        ]);
+
+        $expected = file_get_contents(__DIR__ . '/TestAsset/zendview.phtml');
+        $expected = str_replace('<?php echo $name ?>', $name, $expected);
+
+        $this->assertEquals($rendered, $expected);
+    }
+
+    /**
+     * @group layout
+     */
+    public function testDisableLayoutViaDefaultParameter()
+    {
+        $layout = new ViewModel();
+        $layout->setTemplate('zendview-layout');
+
+        $renderer = new ZendViewRenderer(null, $layout);
+        $renderer->addPath(__DIR__ . '/TestAsset');
+        $renderer->addDefaultParam(TemplateRendererInterface::TEMPLATE_ALL, 'layout', false);
+
+
+        $name = 'zendview';
+        $rendered = $renderer->render('zendview', [ 'name' => $name ]);
+
+        $expected = file_get_contents(__DIR__ . '/TestAsset/zendview.phtml');
+        $expected = str_replace('<?php echo $name ?>', $name, $expected);
+
+        $this->assertEquals($rendered, $expected);
+    }
+
     /**
      * @group namespacing
      */