fix(dispatcher): Migrate to OCP event dispatcher before symfony/event…

…-dispatcher upgrade

Signed-off-by: Joas Schilling <coding@schilljs.com>

apps/lookup_server_connector/lib/AppInfo/Application.php

@@ -34,9 +34,9 @@
 use OCP\AppFramework\Bootstrap\IBootContext;
 use OCP\AppFramework\Bootstrap\IBootstrap;
 use OCP\AppFramework\Bootstrap\IRegistrationContext;
-use OCP\AppFramework\IAppContainer;
 use OCP\IUser;
-use Symfony\Component\EventDispatcher\EventDispatcher;
+use Psr\Container\ContainerInterface;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\EventDispatcher\GenericEvent;
 
 class Application extends App implements IBootstrap {
@@ -56,8 +56,8 @@ public function boot(IBootContext $context): void {
 	/**
 	 * @todo move the OCP events and then move the registration to `register`
 	 */
-	private function registerEventListeners(EventDispatcher $dispatcher,
-											IAppContainer $appContainer): void {
+	private function registerEventListeners(EventDispatcherInterface $dispatcher,
+											ContainerInterface $appContainer): void {
 		$dispatcher->addListener('OC\AccountManager::userUpdated', function (GenericEvent $event) use ($appContainer) {
 			/** @var IUser $user */
 			$user = $event->getSubject();

apps/systemtags/lib/AppInfo/Application.php

@@ -31,9 +31,9 @@
 use OCP\AppFramework\Bootstrap\IBootContext;
 use OCP\AppFramework\Bootstrap\IBootstrap;
 use OCP\AppFramework\Bootstrap\IRegistrationContext;
+use OCP\EventDispatcher\IEventDispatcher;
 use OCP\SystemTag\ManagerEvent;
 use OCP\SystemTag\MapperEvent;
-use Symfony\Component\EventDispatcher\EventDispatcher;
 
 class Application extends App implements IBootstrap {
 	public const APP_ID = 'systemtags';
@@ -47,7 +47,7 @@ public function register(IRegistrationContext $context): void {
 	}
 
 	public function boot(IBootContext $context): void {
-		$context->injectFn(function (EventDispatcher $dispatcher) use ($context) {
+		$context->injectFn(function (IEventDispatcher $dispatcher) use ($context) {
 			/*
 			 * @todo move the OCP events and then move the registration to `register`
 			 */

lib/private/EventDispatcher/SymfonyAdapter.php

@@ -113,8 +113,7 @@ public function dispatch($eventName, $event = null): object {
 
 		// Event with no payload (object) need special handling
 		if ($newEvent === null) {
-			$this->eventDispatcher->getSymfonyDispatcher()->dispatch($eventName);
-			return new Event();
+			$newEvent = new Event();
 		}
 
 		// Flip the argument order for Symfony to prevent a trigger_error

tests/lib/EventDispatcher/SymfonyAdapterTest.php

@@ -179,6 +179,7 @@ public function testDispatchEventWithoutPayload(): void {
 		$symfonyDispatcher->expects(self::once())
 			->method('dispatch')
 			->with(
+				$this->anything(),
 				$eventName
 			)
 			->willReturnArgument(0);

tests/lib/Share20/LegacyHooksTest.php

@@ -23,12 +23,15 @@
 
 namespace Test\Share20;
 
+use OC\EventDispatcher\SymfonyAdapter;
 use OC\Share20\LegacyHooks;
 use OC\Share20\Manager;
 use OCP\Constants;
 use OCP\Files\Cache\ICacheEntry;
 use OCP\Files\File;
+use OCP\IServerContainer;
 use OCP\Share\IShare;
+use Psr\Log\LoggerInterface;
 use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\EventDispatcher\GenericEvent;
 use Test\TestCase;
@@ -46,7 +49,10 @@ class LegacyHooksTest extends TestCase {
 	protected function setUp(): void {
 		parent::setUp();
 
-		$this->eventDispatcher = new EventDispatcher();
+		$symfonyDispatcher = new \Symfony\Component\EventDispatcher\EventDispatcher();
+		$logger = $this->createMock(LoggerInterface::class);
+		$eventDispatcher = new \OC\EventDispatcher\EventDispatcher($symfonyDispatcher, \OC::$server->get(IServerContainer::class), $logger);
+		$this->eventDispatcher = new SymfonyAdapter($eventDispatcher, $logger);
 		$this->hooks = new LegacyHooks($this->eventDispatcher);
 		$this->manager = \OC::$server->getShareManager();
 	}