Merge branch 'hotfix/121'

weierophinney · weierophinney · commit e2e6acc9e671 · 2018-01-17T15:33:44.000-06:00
Close #121 Fixes #120
diff --git a/.travis.yml b/.travis.yml
@@ -15,6 +15,7 @@ cache:
 
 env:
   global:
+    - COMPOSER_PROCESS_TIMEOUT=600
     - COMPOSER_ARGS="--no-interaction"
     - COVERAGE_DEPS="satooshi/php-coveralls"
     - LEGACY_DEPS="phpunit/phpunit"
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -29,6 +29,10 @@ All notable changes to this project will be documented in this file, in reverse
   `Exception` instances, but also PHP 7 `Throwable` instances, and properly
   cleanup the output buffers when it does.
 
+- [#121](https://github.com/zendframework/zend-view/pull/121) provides a fix to
+  ensure that content generated on a previous execution of `PhpRenderer::render()`
+  is never re-used.
+
 ## 2.9.0 - 2017-03-21
 
 ### Added
diff --git a/composer.json b/composer.json
@@ -61,7 +61,7 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "config": {
-        "sort-packages": "true"
+        "sort-packages": true
     },
     "extra": {
         "branch-alias": {
diff --git a/src/Renderer/PhpRenderer.php b/src/Renderer/PhpRenderer.php
@@ -491,6 +491,7 @@ public function render($nameOrModel, $values = null)
         extract($__vars);
         unset($__vars); // remove $__vars from local scope
 
+        $this->__content = '';
         while ($this->__template = array_pop($this->__templates)) {
             $this->__file = $this->resolver($this->__template);
             if (! $this->__file) {
diff --git a/test/PhpRendererTest.php b/test/PhpRendererTest.php
@@ -481,4 +481,34 @@ public function testDoesNotCallFilterChainIfNoFilterChainWasSet()
         $this->assertContains('Empty view', $result);
         $this->assertAttributeEmpty('__filterChain', $this->renderer);
     }
+
+    /**
+     * @group zend-view-120
+     * @see https://github.com/zendframework/zend-view/issues/120
+     */
+    public function testRendererDoesntUsePreviousRenderedOutputWhenInvokedWithEmptyString()
+    {
+        $this->renderer->resolver()->addPath(__DIR__ . '/_templates');
+
+        $previousOutput = $this->renderer->render('empty.phtml');
+
+        $actual = $this->renderer->render('');
+
+        $this->assertNotSame($previousOutput, $actual);
+    }
+
+    /**
+     * @group zend-view-120
+     * @see https://github.com/zendframework/zend-view/issues/120
+     */
+    public function testRendererDoesntUsePreviousRenderedOutputWhenInvokedWithFalse()
+    {
+        $this->renderer->resolver()->addPath(__DIR__ . '/_templates');
+
+        $previousOutput = $this->renderer->render('empty.phtml');
+
+        $actual = $this->renderer->render(false);
+
+        $this->assertNotSame($previousOutput, $actual);
+    }
 }
