Merge pull request #17 from dsoriano/master

Update the way that events are triggered
kokspflanze · Jul 28, 2020 · ac7cce6 · ac7cce6
2 parents 2672cdb + 08d9954
commit ac7cce6
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 21 deletions.
diff --git a/src/BjyAuthorize/Guard/Controller.php b/src/BjyAuthorize/Guard/Controller.php
@@ -105,13 +105,10 @@ public function onDispatch(MvcEvent $event)
         /* @var $app \Laminas\Mvc\ApplicationInterface */
         $app = $event->getTarget();
         $eventManager = $app->getEventManager();
-        $eventManager->setEventPrototype($event);
 
-        $results = $eventManager->trigger(
-            MvcEvent::EVENT_DISPATCH_ERROR,
-            null,
-            $event->getParams()
-        );
+        $event->setName(MvcEvent::EVENT_DISPATCH_ERROR);
+        $results = $eventManager->triggerEvent($event);
+
         $return  = $results->last();
         if (! $return) {
             return $event->getResult();

diff --git a/src/BjyAuthorize/Guard/Route.php b/src/BjyAuthorize/Guard/Route.php
@@ -67,13 +67,10 @@ public function onRoute(MvcEvent $event)
         /* @var $app \Laminas\Mvc\Application */
         $app = $event->getTarget();
         $eventManager = $app->getEventManager();
-        $eventManager->setEventPrototype($event);
 
-        $results = $eventManager->trigger(
-            MvcEvent::EVENT_DISPATCH_ERROR,
-            null,
-            $event->getParams()
-        );
+        $event->setName(MvcEvent::EVENT_DISPATCH_ERROR);
+        $results = $eventManager->triggerEvent($event);
+
         $return  = $results->last();
         if (! $return) {
             return $event->getResult();

diff --git a/tests/BjyAuthorizeTest/Guard/ControllerTest.php b/tests/BjyAuthorizeTest/Guard/ControllerTest.php
@@ -149,7 +149,7 @@ public function testGetResourceName()
     public function testOnDispatchWithValidController()
     {
         $event = $this->createMvcEvent('test-controller');
-        $event->getTarget()->getEventManager()->expects($this->never())->method('trigger');
+        $event->getTarget()->getEventManager()->expects($this->never())->method('triggerEvent');
         $this
             ->authorize
             ->expects($this->any())
@@ -171,7 +171,7 @@ function ($resource) {
     public function testOnDispatchWithValidControllerAndAction()
     {
         $event = $this->createMvcEvent('test-controller', 'test-action');
-        $event->getTarget()->getEventManager()->expects($this->never())->method('trigger');
+        $event->getTarget()->getEventManager()->expects($this->never())->method('triggerEvent');
         $this
             ->authorize
             ->expects($this->any())
@@ -193,7 +193,7 @@ function ($resource) {
     public function testOnDispatchWithValidControllerAndMethod()
     {
         $event = $this->createMvcEvent('test-controller', null, 'PUT');
-        $event->getTarget()->getEventManager()->expects($this->never())->method('trigger');
+        $event->getTarget()->getEventManager()->expects($this->never())->method('triggerEvent');
         $this
             ->authorize
             ->expects($this->any())
@@ -215,7 +215,7 @@ function ($resource) {
     public function testOnDispatchWithValidControllerAction()
     {
         $event = $this->createMvcEvent('test-controller', 'test-action');
-        $event->getTarget()->getEventManager()->expects($this->never())->method('trigger');
+        $event->getTarget()->getEventManager()->expects($this->never())->method('triggerEvent');
         $this
             ->authorize
             ->expects($this->any())
@@ -251,12 +251,13 @@ public function testOnDispatchWithInvalidResource()
         $responseCollection = $this->getMockBuilder(\Laminas\EventManager\ResponseCollection::class)
             ->getMock();
 
+        $event->setName(MvcEvent::EVENT_DISPATCH_ERROR);
         $event
             ->getTarget()
             ->getEventManager()
             ->expects($this->once())
-            ->method('trigger')
-            ->with(MvcEvent::EVENT_DISPATCH_ERROR, null, [])
+            ->method('triggerEvent')
+            ->with($event)
             ->willReturn($responseCollection);
 
         $this->assertNull($this->controllerGuard->onDispatch($event), 'Does not stop event propagation');

diff --git a/tests/BjyAuthorizeTest/Guard/RouteTest.php b/tests/BjyAuthorizeTest/Guard/RouteTest.php
@@ -176,7 +176,7 @@ public function testGetRulesWithAssertion()
     public function testOnRouteWithValidRoute()
     {
         $event = $this->createMvcEvent('test-route');
-        $event->getTarget()->getEventManager()->expects($this->never())->method('trigger');
+        $event->getTarget()->getEventManager()->expects($this->never())->method('triggerEvent');
         $this
             ->authorize
             ->expects($this->any())
@@ -216,12 +216,13 @@ public function testOnRouteWithInvalidResource()
         $responseCollection = $this->getMockBuilder(\Laminas\EventManager\ResponseCollection::class)
             ->getMock();
 
+        $event->setName(MvcEvent::EVENT_DISPATCH_ERROR);
         $event
             ->getTarget()
             ->getEventManager()
             ->expects($this->once())
-            ->method('trigger')
-            ->with(MvcEvent::EVENT_DISPATCH_ERROR, null, $event->getParams())
+            ->method('triggerEvent')
+            ->with($event)
             ->willReturn($responseCollection);
 
         $this->assertNull($this->routeGuard->onRoute($event), 'Does not stop event propagation');