@@ -521,6 +521,7 @@ public function testWillNotDispatchWhenAnMvcEventResultIsAlreadySet($alreadySetR
521
521
$ routeMatch = new RouteMatch (['middleware ' => $ middlewareName ]);
522
522
/* @var $application Application|\PHPUnit_Framework_MockObject_MockObject */
523
523
$ application = $ this ->createMock (Application::class);
524
+ $ eventManager = new EventManager ();
524
525
$ middleware = $ this ->getMockBuilder (\stdClass::class)->setMethods (['__invoke ' ])->getMock ();
525
526
$ serviceManager = new ServiceManager ([
526
527
'factories ' => [
@@ -534,7 +535,7 @@ public function testWillNotDispatchWhenAnMvcEventResultIsAlreadySet($alreadySetR
534
535
]);
535
536
536
537
$ application ->expects (self ::any ())->method ('getRequest ' )->willReturn (new Request ());
537
- $ application ->expects (self ::any ())->method ('getEventManager ' )->willReturn (new EventManager () );
538
+ $ application ->expects (self ::any ())->method ('getEventManager ' )->willReturn ($ eventManager );
538
539
$ application ->expects (self ::any ())->method ('getServiceManager ' )->willReturn ($ serviceManager );
539
540
$ application ->expects (self ::any ())->method ('getResponse ' )->willReturn (new Response ());
540
541
$ middleware ->expects (self ::never ())->method ('__invoke ' );
@@ -549,6 +550,10 @@ public function testWillNotDispatchWhenAnMvcEventResultIsAlreadySet($alreadySetR
549
550
550
551
$ listener = new MiddlewareListener ();
551
552
553
+ $ eventManager ->attach (MvcEvent::EVENT_DISPATCH_ERROR , function () {
554
+ self ::fail ('No dispatch failures should be raised - dispatch should be skipped ' );
555
+ });
556
+
552
557
$ listener ->onDispatch ($ event );
553
558
554
559
self ::assertSame ($ alreadySetResult , $ event ->getResult (), 'The event result was not replaced ' );
0 commit comments