nextcloud / server

lib/private/EventDispatcher/SymfonyAdapter.php

Indentation +165 added lines, -165 removed lines

@@ -40,169 +40,169 @@
  * @deprecated 20.0.0 use \OCP\EventDispatcher\IEventDispatcher
  */
 class SymfonyAdapter implements EventDispatcherInterface {
-	/** @var EventDispatcher */
-	private $eventDispatcher;
-	private LoggerInterface $logger;
-
-	/**
-	 * @deprecated 20.0.0
-	 */
-	public function __construct(EventDispatcher $eventDispatcher, LoggerInterface $logger) {
-		$this->eventDispatcher = $eventDispatcher;
-		$this->logger = $logger;
-	}
-
-	private static function detectEventAndName($a, $b) {
-		if (is_object($a) && (is_string($b) || $b === null)) {
-			// a is the event, the other one is the optional name
-			return [$a, $b];
-		}
-		if (is_object($b) && (is_string($a) || $a === null)) {
-			// b is the event, the other one is the optional name
-			return [$b, $a];
-		}
-		if (is_string($a) && $b === null) {
-			// a is a payload-less event
-			return [null, $a];
-		}
-		if (is_string($b) && $a === null) {
-			// b is a payload-less event
-			return [null, $b];
-		}
-
-		// Anything else we can't detect
-		return [$a, $b];
-	}
-
-	/**
-	 * Dispatches an event to all registered listeners.
-	 *
-	 * @param string $eventName The name of the event to dispatch. The name of
-	 *                              the event is the name of the method that is
-	 *                              invoked on listeners.
-	 * @param Event|null $event The event to pass to the event handlers/listeners
-	 *                              If not supplied, an empty Event instance is created
-	 *
-	 * @return object the emitted event
-	 * @deprecated 20.0.0
-	 */
-	public function dispatch($eventName, $event = null): object {
-		[$event, $eventName] = self::detectEventAndName($event, $eventName);
-
-		// 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;
-		}
-
-		if ($event instanceof GenericEvent && get_class($event) === GenericEvent::class) {
-			$newEvent = new GenericEventWrapper($this->logger, $eventName, $event);
-		} else {
-			$newEvent = $event;
-
-			// Legacy event
-			$this->logger->debug(
-				'Deprecated event type for {name}: {class}',
-				['name' => $eventName, 'class' => is_object($event) ? get_class($event) : 'null']
-			);
-		}
-
-		// Event with no payload (object) need special handling
-		if ($newEvent === null) {
-			$newEvent = new Event();
-		}
-
-		// Flip the argument order for Symfony to prevent a trigger_error
-		return $this->eventDispatcher->getSymfonyDispatcher()->dispatch($newEvent, $eventName);
-	}
-
-	/**
-	 * Adds an event listener that listens on the specified events.
-	 *
-	 * @param string $eventName The event to listen on
-	 * @param callable $listener The listener
-	 * @param int $priority The higher this value, the earlier an event
-	 *                            listener will be triggered in the chain (defaults to 0)
-	 * @deprecated 20.0.0
-	 */
-	public function addListener($eventName, $listener, $priority = 0) {
-		if (is_callable($listener)) {
-			$this->eventDispatcher->addListener($eventName, $listener, $priority);
-		} else {
-			// Legacy listener
-			$this->eventDispatcher->getSymfonyDispatcher()->addListener($eventName, $listener, $priority);
-		}
-	}
-
-	/**
-	 * Adds an event subscriber.
-	 *
-	 * The subscriber is asked for all the events it is
-	 * interested in and added as a listener for these events.
-	 * @deprecated 20.0.0
-	 */
-	public function addSubscriber(EventSubscriberInterface $subscriber) {
-		$this->eventDispatcher->getSymfonyDispatcher()->addSubscriber($subscriber);
-	}
-
-	/**
-	 * Removes an event listener from the specified events.
-	 *
-	 * @param string $eventName The event to remove a listener from
-	 * @param callable $listener The listener to remove
-	 * @deprecated 20.0.0
-	 */
-	public function removeListener($eventName, $listener) {
-		$this->eventDispatcher->getSymfonyDispatcher()->removeListener($eventName, $listener);
-	}
-
-	/**
-	 * @deprecated 20.0.0
-	 */
-	public function removeSubscriber(EventSubscriberInterface $subscriber) {
-		$this->eventDispatcher->getSymfonyDispatcher()->removeSubscriber($subscriber);
-	}
-
-	/**
-	 * Gets the listeners of a specific event or all listeners sorted by descending priority.
-	 *
-	 * @param string|null $eventName The name of the event
-	 *
-	 * @return array The event listeners for the specified event, or all event listeners by event name
-	 * @deprecated 20.0.0
-	 */
-	public function getListeners($eventName = null) {
-		return $this->eventDispatcher->getSymfonyDispatcher()->getListeners($eventName);
-	}
-
-	/**
-	 * Gets the listener priority for a specific event.
-	 *
-	 * Returns null if the event or the listener does not exist.
-	 *
-	 * @param string $eventName The name of the event
-	 * @param callable $listener The listener
-	 *
-	 * @return int|null The event listener priority
-	 * @deprecated 20.0.0
-	 */
-	public function getListenerPriority($eventName, $listener) {
-		return $this->eventDispatcher->getSymfonyDispatcher()->getListenerPriority($eventName, $listener);
-	}
-
-	/**
-	 * Checks whether an event has any registered listeners.
-	 *
-	 * @param string|null $eventName The name of the event
-	 *
-	 * @return bool true if the specified event has any listeners, false otherwise
-	 * @deprecated 20.0.0
-	 */
-	public function hasListeners($eventName = null) {
-		return $this->eventDispatcher->getSymfonyDispatcher()->hasListeners($eventName);
-	}
+    /** @var EventDispatcher */
+    private $eventDispatcher;
+    private LoggerInterface $logger;
+
+    /**
+     * @deprecated 20.0.0
+     */
+    public function __construct(EventDispatcher $eventDispatcher, LoggerInterface $logger) {
+        $this->eventDispatcher = $eventDispatcher;
+        $this->logger = $logger;
+    }
+
+    private static function detectEventAndName($a, $b) {
+        if (is_object($a) && (is_string($b) || $b === null)) {
+            // a is the event, the other one is the optional name
+            return [$a, $b];
+        }
+        if (is_object($b) && (is_string($a) || $a === null)) {
+            // b is the event, the other one is the optional name
+            return [$b, $a];
+        }
+        if (is_string($a) && $b === null) {
+            // a is a payload-less event
+            return [null, $a];
+        }
+        if (is_string($b) && $a === null) {
+            // b is a payload-less event
+            return [null, $b];
+        }
+
+        // Anything else we can't detect
+        return [$a, $b];
+    }
+
+    /**
+     * Dispatches an event to all registered listeners.
+     *
+     * @param string $eventName The name of the event to dispatch. The name of
+     *                              the event is the name of the method that is
+     *                              invoked on listeners.
+     * @param Event|null $event The event to pass to the event handlers/listeners
+     *                              If not supplied, an empty Event instance is created
+     *
+     * @return object the emitted event
+     * @deprecated 20.0.0
+     */
+    public function dispatch($eventName, $event = null): object {
+        [$event, $eventName] = self::detectEventAndName($event, $eventName);
+
+        // 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;
+        }
+
+        if ($event instanceof GenericEvent && get_class($event) === GenericEvent::class) {
+            $newEvent = new GenericEventWrapper($this->logger, $eventName, $event);
+        } else {
+            $newEvent = $event;
+
+            // Legacy event
+            $this->logger->debug(
+                'Deprecated event type for {name}: {class}',
+                ['name' => $eventName, 'class' => is_object($event) ? get_class($event) : 'null']
+            );
+        }
+
+        // Event with no payload (object) need special handling
+        if ($newEvent === null) {
+            $newEvent = new Event();
+        }
+
+        // Flip the argument order for Symfony to prevent a trigger_error
+        return $this->eventDispatcher->getSymfonyDispatcher()->dispatch($newEvent, $eventName);
+    }
+
+    /**
+     * Adds an event listener that listens on the specified events.
+     *
+     * @param string $eventName The event to listen on
+     * @param callable $listener The listener
+     * @param int $priority The higher this value, the earlier an event
+     *                            listener will be triggered in the chain (defaults to 0)
+     * @deprecated 20.0.0
+     */
+    public function addListener($eventName, $listener, $priority = 0) {
+        if (is_callable($listener)) {
+            $this->eventDispatcher->addListener($eventName, $listener, $priority);
+        } else {
+            // Legacy listener
+            $this->eventDispatcher->getSymfonyDispatcher()->addListener($eventName, $listener, $priority);
+        }
+    }
+
+    /**
+     * Adds an event subscriber.
+     *
+     * The subscriber is asked for all the events it is
+     * interested in and added as a listener for these events.
+     * @deprecated 20.0.0
+     */
+    public function addSubscriber(EventSubscriberInterface $subscriber) {
+        $this->eventDispatcher->getSymfonyDispatcher()->addSubscriber($subscriber);
+    }
+
+    /**
+     * Removes an event listener from the specified events.
+     *
+     * @param string $eventName The event to remove a listener from
+     * @param callable $listener The listener to remove
+     * @deprecated 20.0.0
+     */
+    public function removeListener($eventName, $listener) {
+        $this->eventDispatcher->getSymfonyDispatcher()->removeListener($eventName, $listener);
+    }
+
+    /**
+     * @deprecated 20.0.0
+     */
+    public function removeSubscriber(EventSubscriberInterface $subscriber) {
+        $this->eventDispatcher->getSymfonyDispatcher()->removeSubscriber($subscriber);
+    }
+
+    /**
+     * Gets the listeners of a specific event or all listeners sorted by descending priority.
+     *
+     * @param string|null $eventName The name of the event
+     *
+     * @return array The event listeners for the specified event, or all event listeners by event name
+     * @deprecated 20.0.0
+     */
+    public function getListeners($eventName = null) {
+        return $this->eventDispatcher->getSymfonyDispatcher()->getListeners($eventName);
+    }
+
+    /**
+     * Gets the listener priority for a specific event.
+     *
+     * Returns null if the event or the listener does not exist.
+     *
+     * @param string $eventName The name of the event
+     * @param callable $listener The listener
+     *
+     * @return int|null The event listener priority
+     * @deprecated 20.0.0
+     */
+    public function getListenerPriority($eventName, $listener) {
+        return $this->eventDispatcher->getSymfonyDispatcher()->getListenerPriority($eventName, $listener);
+    }
+
+    /**
+     * Checks whether an event has any registered listeners.
+     *
+     * @param string|null $eventName The name of the event
+     *
+     * @return bool true if the specified event has any listeners, false otherwise
+     * @deprecated 20.0.0
+     */
+    public function hasListeners($eventName = null) {
+        return $this->eventDispatcher->getSymfonyDispatcher()->hasListeners($eventName);
+    }
 }

apps/lookup_server_connector/lib/AppInfo/Application.php

Indentation +22 added lines, -22 removed lines

@@ -40,31 +40,31 @@
 use Symfony\Component\EventDispatcher\GenericEvent;
 
 class Application extends App implements IBootstrap {
-	public const APP_ID = 'lookup_server_connector';
+    public const APP_ID = 'lookup_server_connector';
 
-	public function __construct() {
-		parent::__construct(self::APP_ID);
-	}
+    public function __construct() {
+        parent::__construct(self::APP_ID);
+    }
 
-	public function register(IRegistrationContext $context): void {
-	}
+    public function register(IRegistrationContext $context): void {
+    }
 
-	public function boot(IBootContext $context): void {
-		$context->injectFn(Closure::fromCallable([$this, 'registerEventListeners']));
-	}
+    public function boot(IBootContext $context): void {
+        $context->injectFn(Closure::fromCallable([$this, 'registerEventListeners']));
+    }
 
-	/**
-	 * @todo move the OCP events and then move the registration to `register`
-	 */
-	private function registerEventListeners(EventDispatcherInterface $dispatcher,
-											ContainerInterface $appContainer): void {
-		$dispatcher->addListener('OC\AccountManager::userUpdated', function (GenericEvent $event) use ($appContainer) {
-			/** @var IUser $user */
-			$user = $event->getSubject();
+    /**
+     * @todo move the OCP events and then move the registration to `register`
+     */
+    private function registerEventListeners(EventDispatcherInterface $dispatcher,
+                                            ContainerInterface $appContainer): void {
+        $dispatcher->addListener('OC\AccountManager::userUpdated', function (GenericEvent $event) use ($appContainer) {
+            /** @var IUser $user */
+            $user = $event->getSubject();
 
-			/** @var UpdateLookupServer $updateLookupServer */
-			$updateLookupServer = $appContainer->get(UpdateLookupServer::class);
-			$updateLookupServer->userUpdated($user);
-		});
-	}
+            /** @var UpdateLookupServer $updateLookupServer */
+            $updateLookupServer = $appContainer->get(UpdateLookupServer::class);
+            $updateLookupServer->userUpdated($user);
+        });
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
 	 */
 	private function registerEventListeners(EventDispatcherInterface $dispatcher,
 											ContainerInterface $appContainer): void {
-		$dispatcher->addListener('OC\AccountManager::userUpdated', function (GenericEvent $event) use ($appContainer) {
+		$dispatcher->addListener('OC\AccountManager::userUpdated', function(GenericEvent $event) use ($appContainer) {
 			/** @var IUser $user */
 			$user = $event->getSubject();
 

apps/systemtags/lib/AppInfo/Application.php

Indentation +44 added lines, -44 removed lines

@@ -36,56 +36,56 @@
 use OCP\SystemTag\MapperEvent;
 
 class Application extends App implements IBootstrap {
-	public const APP_ID = 'systemtags';
+    public const APP_ID = 'systemtags';
 
-	public function __construct() {
-		parent::__construct(self::APP_ID);
-	}
+    public function __construct() {
+        parent::__construct(self::APP_ID);
+    }
 
-	public function register(IRegistrationContext $context): void {
-		$context->registerSearchProvider(TagSearchProvider::class);
-	}
+    public function register(IRegistrationContext $context): void {
+        $context->registerSearchProvider(TagSearchProvider::class);
+    }
 
-	public function boot(IBootContext $context): void {
-		$context->injectFn(function (IEventDispatcher $dispatcher) use ($context) {
-			/*
+    public function boot(IBootContext $context): void {
+        $context->injectFn(function (IEventDispatcher $dispatcher) use ($context) {
+            /*
 			 * @todo move the OCP events and then move the registration to `register`
 			 */
-			$dispatcher->addListener(
-				'OCA\Files::loadAdditionalScripts',
-				function () {
-					\OCP\Util::addScript('core', 'systemtags');
-					\OCP\Util::addScript(self::APP_ID, 'systemtags');
-				}
-			);
+            $dispatcher->addListener(
+                'OCA\Files::loadAdditionalScripts',
+                function () {
+                    \OCP\Util::addScript('core', 'systemtags');
+                    \OCP\Util::addScript(self::APP_ID, 'systemtags');
+                }
+            );
 
-			$managerListener = function (ManagerEvent $event) use ($context) {
-				/** @var \OCA\SystemTags\Activity\Listener $listener */
-				$listener = $context->getServerContainer()->query(Listener::class);
-				$listener->event($event);
-			};
-			$dispatcher->addListener(ManagerEvent::EVENT_CREATE, $managerListener);
-			$dispatcher->addListener(ManagerEvent::EVENT_DELETE, $managerListener);
-			$dispatcher->addListener(ManagerEvent::EVENT_UPDATE, $managerListener);
+            $managerListener = function (ManagerEvent $event) use ($context) {
+                /** @var \OCA\SystemTags\Activity\Listener $listener */
+                $listener = $context->getServerContainer()->query(Listener::class);
+                $listener->event($event);
+            };
+            $dispatcher->addListener(ManagerEvent::EVENT_CREATE, $managerListener);
+            $dispatcher->addListener(ManagerEvent::EVENT_DELETE, $managerListener);
+            $dispatcher->addListener(ManagerEvent::EVENT_UPDATE, $managerListener);
 
-			$mapperListener = function (MapperEvent $event) use ($context) {
-				/** @var \OCA\SystemTags\Activity\Listener $listener */
-				$listener = $context->getServerContainer()->query(Listener::class);
-				$listener->mapperEvent($event);
-			};
-			$dispatcher->addListener(MapperEvent::EVENT_ASSIGN, $mapperListener);
-			$dispatcher->addListener(MapperEvent::EVENT_UNASSIGN, $mapperListener);
-		});
+            $mapperListener = function (MapperEvent $event) use ($context) {
+                /** @var \OCA\SystemTags\Activity\Listener $listener */
+                $listener = $context->getServerContainer()->query(Listener::class);
+                $listener->mapperEvent($event);
+            };
+            $dispatcher->addListener(MapperEvent::EVENT_ASSIGN, $mapperListener);
+            $dispatcher->addListener(MapperEvent::EVENT_UNASSIGN, $mapperListener);
+        });
 
-		\OCA\Files\App::getNavigationManager()->add(function () {
-			$l = \OC::$server->getL10N(self::APP_ID);
-			return [
-				'id' => 'systemtagsfilter',
-				'appname' => self::APP_ID,
-				'script' => 'list.php',
-				'order' => 25,
-				'name' => $l->t('Tags'),
-			];
-		});
-	}
+        \OCA\Files\App::getNavigationManager()->add(function () {
+            $l = \OC::$server->getL10N(self::APP_ID);
+            return [
+                'id' => 'systemtagsfilter',
+                'appname' => self::APP_ID,
+                'script' => 'list.php',
+                'order' => 25,
+                'name' => $l->t('Tags'),
+            ];
+        });
+    }
 }

Spacing +5 added lines, -5 removed lines

@@ -47,19 +47,19 @@ 
 	}
 
 	public function boot(IBootContext $context): void {
-		$context->injectFn(function (IEventDispatcher $dispatcher) use ($context) {
+		$context->injectFn(function(IEventDispatcher $dispatcher) use ($context) {
 			/*
 			 * @todo move the OCP events and then move the registration to `register`
 			 */
 			$dispatcher->addListener(
 				'OCA\Files::loadAdditionalScripts',
-				function () {
+				function() {
 					\OCP\Util::addScript('core', 'systemtags');
 					\OCP\Util::addScript(self::APP_ID, 'systemtags');
 				}
 			);
 
-			$managerListener = function (ManagerEvent $event) use ($context) {
+			$managerListener = function(ManagerEvent $event) use ($context) {
 				/** @var \OCA\SystemTags\Activity\Listener $listener */
 				$listener = $context->getServerContainer()->query(Listener::class);
 				$listener->event($event);
@@ -68,7 +68,7 @@ 
 			$dispatcher->addListener(ManagerEvent::EVENT_DELETE, $managerListener);
 			$dispatcher->addListener(ManagerEvent::EVENT_UPDATE, $managerListener);
 
-			$mapperListener = function (MapperEvent $event) use ($context) {
+			$mapperListener = function(MapperEvent $event) use ($context) {
 				/** @var \OCA\SystemTags\Activity\Listener $listener */
 				$listener = $context->getServerContainer()->query(Listener::class);
 				$listener->mapperEvent($event);
@@ -77,7 +77,7 @@ 
 			$dispatcher->addListener(MapperEvent::EVENT_UNASSIGN, $mapperListener);
 		});
 
-		\OCA\Files\App::getNavigationManager()->add(function () {
+		\OCA\Files\App::getNavigationManager()->add(function() {
 			$l = \OC::$server->getL10N(self::APP_ID);
 			return [
 				'id' => 'systemtagsfilter',