Merge branch 'hotfix/25' into develop

Forward port #25

Author: weierophinney

CHANGELOG.md

@@ -48,7 +48,10 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#25](https://github.com/zendframework/zend-view/pull/25) updates
+  `PhpRenderer::render()` to no longer lazy-instantiate a `FilterChain`;
+  content filtering is now only done if a `FitlerChain` is already
+  injected in the renderer.
 
 ## 2.5.2 - 2015-06-16
 

src/Renderer/PhpRenderer.php

@@ -516,7 +516,11 @@ public function render($nameOrModel, $values = null)
 
         $this->setVars(array_pop($this->__varsCache));
 
-        return $this->getFilterChain()->filter($this->__content); // filter output
+        if ($this->__filterChain instanceof FilterChain) {
+            return $this->__filterChain->filter($this->__content); // filter output
+        }
+
+        return $this->__content;
     }
 
     /**

test/PhpRendererTest.php

@@ -464,4 +464,14 @@ public function testSharedInstanceHelper()
         $this->assertEquals(2, $this->renderer->sharedinstance());
         $this->assertEquals(3, $this->renderer->sharedinstance());
     }
+
+    public function testDoesNotCallFilterChainIfNoFilterChainWasSet()
+    {
+        $this->renderer->resolver()->addPath(__DIR__ . '/_templates');
+
+        $result = $this->renderer->render('empty.phtml');
+
+        $this->assertContains('Empty view', $result);
+        $this->assertAttributeEmpty('__filterChain', $this->renderer);
+    }
 }