I want to kill you ResourceResponseListener

zf-fr · Feb 7, 2015 · f7d95e8 · f7d95e8
1 parent b8bbcfe
commit f7d95e8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 0.4.4
+
+* `ResourceResponseListener` only modifies response if it is a ResourceViewModel
+
 ## 0.4.3
 
 * `isRootTemplate` now work even if you have called the `renderResource` helper inside a view

diff --git a/src/Mvc/ResourceResponseListener.php b/src/Mvc/ResourceResponseListener.php
@@ -22,6 +22,7 @@
 use Zend\EventManager\EventManagerInterface;
 use Zend\Http\Response as HttpResponse;
 use Zend\Mvc\MvcEvent;
+use ZfrRest\View\Model\ResourceViewModel;
 
 /**
  * HttpExceptionListener
@@ -48,9 +49,13 @@ public function attach(EventManagerInterface $events)
      */
     public function finishResponse(MvcEvent $event)
     {
-        $response = $event->getResponse();
+        $response  = $event->getResponse();
+        $viewModel = $event->getViewModel();
 
-        if (!$response instanceof HttpResponse || null !== $event->getParam('exception')) {
+        if (!$response instanceof HttpResponse
+            || null !== $event->getParam('exception')
+            || !$viewModel instanceof ResourceViewModel
+        ) {
             return;
         }