nextcloud / server

lib/private/EventDispatcher/SymfonyAdapter.php

Indentation +139 added lines, -139 removed lines

@@ -41,143 +41,143 @@
  */
 class SymfonyAdapter implements EventDispatcherInterface {
 
-	/** @var EventDispatcher */
-	private $eventDispatcher;
-	/** @var ILogger */
-	private $logger;
-
-	/**
-	 * @deprecated 20.0.0
-	 */
-	public function __construct(EventDispatcher $eventDispatcher, ILogger $logger) {
-		$this->eventDispatcher = $eventDispatcher;
-		$this->logger = $logger;
-	}
-
-	/**
-	 * 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 {
-		// type hinting is not possible, due to usage of GenericEvent
-		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->info(
-				'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) {
-			$this->eventDispatcher->getSymfonyDispatcher()->dispatch($eventName);
-			return 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;
+    /** @var ILogger */
+    private $logger;
+
+    /**
+     * @deprecated 20.0.0
+     */
+    public function __construct(EventDispatcher $eventDispatcher, ILogger $logger) {
+        $this->eventDispatcher = $eventDispatcher;
+        $this->logger = $logger;
+    }
+
+    /**
+     * 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 {
+        // type hinting is not possible, due to usage of GenericEvent
+        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->info(
+                '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) {
+            $this->eventDispatcher->getSymfonyDispatcher()->dispatch($eventName);
+            return 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);
+    }
 }

lib/private/EventDispatcher/EventDispatcher.php

Indentation +67 added lines, -67 removed lines

@@ -41,71 +41,71 @@
 
 class EventDispatcher implements IEventDispatcher {
 
-	/** @var SymfonyDispatcher */
-	private $dispatcher;
-
-	/** @var IContainer */
-	private $container;
-
-	/** @var LoggerInterface */
-	private $logger;
-
-	public function __construct(SymfonyDispatcher $dispatcher,
-								IServerContainer $container,
-								LoggerInterface $logger) {
-		$this->dispatcher = $dispatcher;
-		$this->container = $container;
-		$this->logger = $logger;
-	}
-
-	public function addListener(string $eventName,
-								callable $listener,
-								int $priority = 0): void {
-		$this->dispatcher->addListener($eventName, $listener, $priority);
-	}
-
-	public function removeListener(string $eventName,
-								   callable $listener): void {
-		$this->dispatcher->removeListener($eventName, $listener);
-	}
-
-	public function addServiceListener(string $eventName,
-									   string $className,
-									   int $priority = 0): void {
-		$listener = new ServiceEventListener(
-			$this->container,
-			$className,
-			$this->logger
-		);
-
-		$this->addListener($eventName, $listener, $priority);
-	}
-
-	/**
-	 * @deprecated
-	 */
-	public function dispatch(string $eventName,
-							 Event $event): void {
-		$this->dispatcher->dispatch($event, $eventName);
-
-		if ($event instanceof ABroadcastedEvent && !$event->isPropagationStopped()) {
-			// Propagate broadcast
-			$this->dispatch(
-				IBroadcastEvent::class,
-				new BroadcastEvent($event)
-			);
-		}
-	}
-
-	public function dispatchTyped(Event $event): void {
-		$this->dispatch(get_class($event), $event);
-	}
-
-	/**
-	 * @return SymfonyDispatcher
-	 * @deprecated 20.0.0
-	 */
-	public function getSymfonyDispatcher(): SymfonyDispatcher {
-		return $this->dispatcher;
-	}
+    /** @var SymfonyDispatcher */
+    private $dispatcher;
+
+    /** @var IContainer */
+    private $container;
+
+    /** @var LoggerInterface */
+    private $logger;
+
+    public function __construct(SymfonyDispatcher $dispatcher,
+                                IServerContainer $container,
+                                LoggerInterface $logger) {
+        $this->dispatcher = $dispatcher;
+        $this->container = $container;
+        $this->logger = $logger;
+    }
+
+    public function addListener(string $eventName,
+                                callable $listener,
+                                int $priority = 0): void {
+        $this->dispatcher->addListener($eventName, $listener, $priority);
+    }
+
+    public function removeListener(string $eventName,
+                                    callable $listener): void {
+        $this->dispatcher->removeListener($eventName, $listener);
+    }
+
+    public function addServiceListener(string $eventName,
+                                        string $className,
+                                        int $priority = 0): void {
+        $listener = new ServiceEventListener(
+            $this->container,
+            $className,
+            $this->logger
+        );
+
+        $this->addListener($eventName, $listener, $priority);
+    }
+
+    /**
+     * @deprecated
+     */
+    public function dispatch(string $eventName,
+                                Event $event): void {
+        $this->dispatcher->dispatch($event, $eventName);
+
+        if ($event instanceof ABroadcastedEvent && !$event->isPropagationStopped()) {
+            // Propagate broadcast
+            $this->dispatch(
+                IBroadcastEvent::class,
+                new BroadcastEvent($event)
+            );
+        }
+    }
+
+    public function dispatchTyped(Event $event): void {
+        $this->dispatch(get_class($event), $event);
+    }
+
+    /**
+     * @return SymfonyDispatcher
+     * @deprecated 20.0.0
+     */
+    public function getSymfonyDispatcher(): SymfonyDispatcher {
+        return $this->dispatcher;
+    }
 }