Merge 45a8ca9 into 6a454cb

zf-fr · Apr 5, 2014 · 24175af · 24175af
2 parents 6a454cb + 45a8ca9
commit 24175af
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/src/ZfrRest/Mvc/HttpExceptionListener.php b/src/ZfrRest/Mvc/HttpExceptionListener.php
@@ -99,6 +99,7 @@ public function onDispatchError(MvcEvent $event)
 
         $event->setResponse($response);
         $event->setResult($response);
+        $event->stopPropagation(true);
     }
 
     /**

diff --git a/tests/ZfrRestTest/Mvc/HttpExceptionListenerTest.php b/tests/ZfrRestTest/Mvc/HttpExceptionListenerTest.php
@@ -95,6 +95,7 @@ public function testPopulateResponse()
         $this->assertInstanceOf('Zend\Http\Response', $this->event->getResponse());
         $this->assertInstanceOf('Zend\Http\Response', $this->event->getResult());
         $this->assertEquals($expectedContent, json_decode($this->event->getResponse()->getContent(), true));
+        $this->assertTrue($this->event->propagationIsStopped());
     }
 
     public function testCanCreateFromCustomException()
@@ -109,5 +110,6 @@ public function testCanCreateFromCustomException()
 
         $this->assertInstanceOf('Zend\Http\Response', $this->event->getResponse());
         $this->assertEquals('An error', $this->event->getResponse()->getReasonPhrase());
+        $this->assertTrue($this->event->propagationIsStopped());
     }
 }