Merge branch 'feature/194-clear-event-stop-propagation' into develop

Close #194

Author: weierophinney

CHANGELOG.md

@@ -22,7 +22,8 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#194](https://github.com/zfcampus/zf-apigility/pull/194) fixes an issue within `Zend\Apigility\Application` whereby it was not
+  clearing the "stop propagation" flag prior to triggering new events.
 
 ## 1.3.0 - 2016-07-28
 

src/Application.php

@@ -55,6 +55,7 @@ public function run()
 
         // Trigger route event
         $event->setName(MvcEvent::EVENT_ROUTE);
+        $event->stopPropagation(false); // Clear before triggering
         try {
             $result = $events->triggerEventUntil($shortCircuit, $event);
         } catch (Throwable $e) {
@@ -69,6 +70,7 @@ public function run()
                 $event->setName(MvcEvent::EVENT_FINISH);
                 $event->setTarget($this);
                 $event->setResponse($response);
+                $event->stopPropagation(false); // Clear before triggering
                 $events->triggerEvent($event);
                 $this->response = $response;
                 return $this;
@@ -81,6 +83,7 @@ public function run()
 
         // Trigger dispatch event
         $event->setName(MvcEvent::EVENT_DISPATCH);
+        $event->stopPropagation(false); // Clear before triggering
         $result = $events->triggerEventUntil($shortCircuit, $event);
 
         // Complete response
@@ -89,6 +92,7 @@ public function run()
             $event->setName(MvcEvent::EVENT_FINISH);
             $event->setTarget($this);
             $event->setResponse($response);
+            $event->stopPropagation(false); // Clear before triggering
             $events->triggerEvent($event);
             $this->response = $response;
             return $this;
@@ -113,6 +117,7 @@ private function handleException($exception, MvcEvent $event, EventManagerInterf
         $event->setName(MvcEvent::EVENT_DISPATCH_ERROR);
         $event->setError(self::ERROR_EXCEPTION);
         $event->setParam('exception', $exception);
+        $event->stopPropagation(false); // Clear before triggering
         $result = $events->triggerEvent($event);
 
         $response = $result->last();
@@ -121,6 +126,7 @@ private function handleException($exception, MvcEvent $event, EventManagerInterf
             $event->setTarget($this);
             $event->setResponse($response);
             $this->response = $response;
+            $event->stopPropagation(false); // Clear before triggering
             $events->triggerEvent($event);
             return $this;
         }

test/ApplicationTest.php

@@ -10,6 +10,7 @@
 use PHPUnit\Framework\TestCase;
 use ReflectionMethod;
 use ReflectionProperty;
+use Zend\EventManager\EventInterface;
 use Zend\EventManager\EventManager;
 use Zend\Http\PhpEnvironment;
 use Zend\Mvc\MvcEvent;
@@ -121,4 +122,24 @@ public function testRouteListenerRaisingExceptionTriggersDispatchErrorAndSkipsDi
         $this->assertTrue($finishTriggered);
         $this->assertSame($response, $this->app->getResponse());
     }
+
+    public function testStopPropagationFromPrevEventShouldBeCleared()
+    {
+        $events   = $this->app->getEventManager();
+        $response = $this->prophesize(PhpEnvironment\Response::class)->reveal();
+
+        $events->attach('route', function (EventInterface $e) use ($response) {
+            $e->stopPropagation(true);
+            return $response;
+        });
+
+        $isStopPropagation = null;
+        $events->attach('finish', function (EventInterface $e) use (&$isStopPropagation) {
+            $isStopPropagation = $e->propagationIsStopped();
+        });
+
+        $this->app->run();
+
+        $this->assertFalse($isStopPropagation);
+    }
 }