Merge branch 'hotfix/112' into develop

Forward port #112

Author: weierophinney

CHANGELOG.md

@@ -48,6 +48,9 @@ All notable changes to this project will be documented in this file, in reverse
 - [#104](https://github.com/zendframework/zend-view/pull/104) fixes the
   `@method` annotation for the `Placeholder` view helper to use the correct case,
   fixing issues with method completion in IDEs.
+- [#112](https://github.com/zendframework/zend-view/pull/112) fixes an issue in
+  the `PhpRendererStrategy` whereby absence of a response instance in the
+  `ViewEvent` would lead to a fatal error.
 
 ## 2.8.1 - 2016-06-30
 

src/Strategy/PhpRendererStrategy.php

@@ -103,12 +103,12 @@ public function selectRenderer(ViewEvent $e)
     public function injectResponse(ViewEvent $e)
     {
         $renderer = $e->getRenderer();
-        if ($renderer !== $this->renderer) {
+        $response = $e->getResponse();
+        if ($renderer !== $this->renderer || $response === null) {
             return;
         }
 
         $result   = $e->getResult();
-        $response = $e->getResponse();
 
         // Set content
         // If content is empty, check common placeholders to determine if they are

test/Helper/HeadMetaTest.php

@@ -434,7 +434,8 @@ public function testCharsetPosition()
         $this->assertEquals(
             '<meta charset="utf-8">' . PHP_EOL
             . '<meta property="description" content="foobar">',
-            $view->plugin('headMeta')->toString());
+            $view->plugin('headMeta')->toString()
+        );
     }
 
      /**

test/Strategy/PhpRendererStrategyTest.php

@@ -21,6 +21,9 @@ class PhpRendererStrategyTest extends TestCase
 {
     use EventListenerIntrospectionTrait;
 
+    /** @var PhpRendererStrategy */
+    private $strategy;
+
     public function setUp()
     {
         $this->renderer = new PhpRenderer;
@@ -168,4 +171,14 @@ public function testDetachesListeners()
         $listeners = iterator_to_array($this->getListenersForEvent('response', $events));
         $this->assertCount(0, $listeners);
     }
+
+    public function testInjectResponseWorksWithAnEventWithNoResponse()
+    {
+        $e = new ViewEvent();
+        $e->setRenderer($this->strategy->getRenderer());
+
+        $this->strategy->injectResponse($e);
+
+        $this->assertNull($e->getResponse());
+    }
 }