Merge pull request #112 from MidnightDesign/php-renderer-strategy-no-…

…response PhpRendererStrategy should be able to handle an event w/o a response
zendframework · Mar 20, 2017 · 3c2a455 · 3c2a455
2 parents df72b10 + 239eef9
commit 3c2a455
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/src/Strategy/PhpRendererStrategy.php b/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

diff --git a/test/Strategy/PhpRendererStrategyTest.php b/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());
+    }
 }