Fix the legacy dispatcher argument order

Signed-off-by: Christoph Wurst <[email protected]>

Author: ChristophWurst

lib/private/EventDispatcher/SymfonyAdapter.php

@@ -68,6 +68,10 @@ public function __construct(EventDispatcher $eventDispatcher, ILogger $logger) {
 	 */
 	public function dispatch($eventName, $event = null): object {
 		// type hinting is not possible, due to usage of GenericEvent
+		if ($event instanceof Event && $eventName === null) {
+			$this->eventDispatcher->dispatchTyped($event);
+			return $event;
+		}
 		if ($event instanceof Event) {
 			$this->eventDispatcher->dispatch($eventName, $event);
 			return $event;

tests/lib/EventDispatcher/SymfonyAdapterTest.php

@@ -100,6 +100,27 @@ public function testDispatchSymfonyGenericEvent(): void {
 		self::assertEquals($result, $wrapped);
 	}
 
+	public function testDispatchOldSymfonyEventWithFlippedArgumentOrder(): void {
+		$this->markTestSkipped('todo');
+
+		$event = new SymfonyEvent();
+		$eventName = 'symfony';
+		$symfonyDispatcher = $this->createMock(SymfonyDispatcher::class);
+		$this->eventDispatcher->expects(self::once())
+			->method('getSymfonyDispatcher')
+			->willReturn($symfonyDispatcher);
+		$symfonyDispatcher->expects(self::once())
+			->method('dispatch')
+			->with(
+				$eventName,
+				$event
+			);
+
+		$result = $this->adapter->dispatch($eventName, $event);
+
+		self::assertSame($result, $event);
+	}
+
 	public function testDispatchOldSymfonyEvent(): void {
 		$event = new SymfonyEvent();
 		$eventName = 'symfony';
@@ -120,6 +141,24 @@ public function testDispatchOldSymfonyEvent(): void {
 		self::assertSame($result, $event);
 	}
 
+	public function testDispatchCustomGenericEventWithFlippedArgumentOrder(): void {
+		$this->markTestSkipped('todo');
+
+		$event = new GenericEvent();
+		$eventName = 'symfony';
+		$this->eventDispatcher->expects(self::once())
+			->method('dispatch')
+			->with(
+				$eventName,
+				$event
+			)
+			->willReturnArgument(1);
+
+		$result = $this->adapter->dispatch($eventName, $event);
+
+		self::assertSame($result, $event);
+	}
+
 	public function testDispatchCustomGenericEvent(): void {
 		$event = new GenericEvent();
 		$eventName = 'symfony';