event dispatcher test

tattali · Dec 15, 2019 · c2310a9 · c2310a9
1 parent 10178f3
commit c2310a9
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 30 deletions.
diff --git a/src/Controller/CalendarController.php b/src/Controller/CalendarController.php
@@ -54,7 +54,7 @@ public function loadAction(Request $request): Response
         return $response;
     }
 
-    public function dispatchWithBC($event, string $eventName)
+    public function dispatchWithBC($event, ?string $eventName = null)
     {
         if ($this->eventDispatcher instanceof ContractsEventDispatcherInterface) {
             return $this->eventDispatcher->dispatch($event, $eventName);

diff --git a/tests/Controller/CalendarControllerTest.php b/tests/Controller/CalendarControllerTest.php
@@ -15,7 +15,6 @@
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Kernel;
-use Symfony\Contracts\EventDispatcher\EventDispatcherInterface as ContractsEventDispatcherInterface;
 
 class CalendarControllerTest extends TestCase
 {
@@ -48,18 +47,7 @@ public function testItProvidesAnEventsFeedForACalendar()
 
         $this->calendarEvent->getEvents()->willReturn([$this->event]);
 
-        $dispatcher = $this->getEventDispatcherMock();
-        if (Kernel::VERSION_ID >= 40300) {
-            $this->eventDispatcher
-                ->dispatch(Argument::type(CalendarEvent::class), CalendarEvents::SET_DATA)
-                ->willReturn($this->calendarEvent)
-            ;
-        } else {
-            $this->eventDispatcher
-                ->dispatch(CalendarEvents::SET_DATA, Argument::type(CalendarEvent::class))
-                ->willReturn($this->calendarEvent)
-            ;
-        }
+        $this->eventDispatcherWithBC(Argument::type(CalendarEvent::class), CalendarEvents::SET_DATA);
 
         $data = json_encode([
             [
@@ -95,18 +83,7 @@ public function testItNotFindAnyEvents()
         $this->request->get('filters', '{}')->willReturn('{}');
 
         $this->calendarEvent->getEvents()->willReturn([$this->event]);
-        $dispatcher = $this->getEventDispatcherMock();
-        if ($dispatcher instanceof ContractsEventDispatcherInterface) {
-            $this->eventDispatcher
-                ->dispatch(Argument::type(CalendarEvent::class), CalendarEvents::SET_DATA)
-                ->willReturn($this->calendarEvent)
-            ;
-        } else {
-            $this->eventDispatcher
-                ->dispatch(CalendarEvents::SET_DATA, Argument::type(CalendarEvent::class))
-                ->willReturn($this->calendarEvent)
-            ;
-        }
+        $this->eventDispatcherWithBC(Argument::type(CalendarEvent::class), CalendarEvents::SET_DATA);
 
         $data = '';
 
@@ -123,10 +100,17 @@ public function testItNotFindAnyEvents()
         $this->assertEquals(Response::HTTP_NO_CONTENT, $response->getStatusCode());
     }
 
-    private function getEventDispatcherMock()
+    private function eventDispatcherWithBC($event, ?string $eventName = null)
     {
-        return $this->getMockBuilder(EventDispatcherInterface::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        if (Kernel::VERSION_ID >= 40300) {
+            $this->eventDispatcher
+                ->dispatch($event, $eventName)
+                ->willReturn($this->calendarEvent)
+            ;
+        }
+        $this->eventDispatcher
+            ->dispatch($eventName, $event)
+            ->willReturn($this->calendarEvent)
+        ;
     }
 }