nextcloud / server

lib/private/EventDispatcher/GenericEventWrapper.php

Indentation +91 added lines, -91 removed lines

@@ -30,95 +30,95 @@
 use Symfony\Component\EventDispatcher\GenericEvent;
 
 class GenericEventWrapper extends GenericEvent {
-	private LoggerInterface $logger;
-
-	/** @var GenericEvent */
-	private $event;
-
-	/** @var string */
-	private $eventName;
-
-	/** @var bool */
-	private $deprecationNoticeLogged = false;
-
-	public function __construct(LoggerInterface $logger, string $eventName, ?GenericEvent $event) {
-		parent::__construct($eventName);
-		$this->logger = $logger;
-		$this->event = $event;
-		$this->eventName = $eventName;
-	}
-
-	private function log() {
-		if ($this->deprecationNoticeLogged) {
-			return;
-		}
-
-		$class = ($this->event !== null && is_object($this->event)) ? get_class($this->event) : 'null';
-		$this->logger->debug(
-			'Deprecated event type for {name}: {class} is used',
-			[ 'name' => $this->eventName, 'class' => $class]
-		);
-		$this->deprecationNoticeLogged = true;
-	}
-
-	public function isPropagationStopped(): bool {
-		$this->log();
-		return $this->event->isPropagationStopped();
-	}
-
-	public function stopPropagation(): void {
-		$this->log();
-		$this->event->stopPropagation();
-	}
-
-	public function getSubject() {
-		$this->log();
-		return $this->event->getSubject();
-	}
-
-	public function getArgument($key) {
-		$this->log();
-		return $this->event->getArgument($key);
-	}
-
-	public function setArgument($key, $value) {
-		$this->log();
-		return $this->event->setArgument($key, $value);
-	}
-
-	public function getArguments() {
-		return $this->event->getArguments();
-	}
-
-	public function setArguments(array $args = []) {
-		return $this->event->setArguments($args);
-	}
-
-	public function hasArgument($key) {
-		return $this->event->hasArgument($key);
-	}
-
-	/**
-	 * @return mixed
-	 */
-	#[\ReturnTypeWillChange]
-	public function offsetGet($key) {
-		return $this->event->offsetGet($key);
-	}
-
-	public function offsetSet($key, $value): void {
-		$this->event->offsetSet($key, $value);
-	}
-
-	public function offsetUnset($key): void {
-		$this->event->offsetUnset($key);
-	}
-
-	public function offsetExists($key): bool {
-		return $this->event->offsetExists($key);
-	}
-
-	public function getIterator() {
-		return$this->event->getIterator();
-	}
+    private LoggerInterface $logger;
+
+    /** @var GenericEvent */
+    private $event;
+
+    /** @var string */
+    private $eventName;
+
+    /** @var bool */
+    private $deprecationNoticeLogged = false;
+
+    public function __construct(LoggerInterface $logger, string $eventName, ?GenericEvent $event) {
+        parent::__construct($eventName);
+        $this->logger = $logger;
+        $this->event = $event;
+        $this->eventName = $eventName;
+    }
+
+    private function log() {
+        if ($this->deprecationNoticeLogged) {
+            return;
+        }
+
+        $class = ($this->event !== null && is_object($this->event)) ? get_class($this->event) : 'null';
+        $this->logger->debug(
+            'Deprecated event type for {name}: {class} is used',
+            [ 'name' => $this->eventName, 'class' => $class]
+        );
+        $this->deprecationNoticeLogged = true;
+    }
+
+    public function isPropagationStopped(): bool {
+        $this->log();
+        return $this->event->isPropagationStopped();
+    }
+
+    public function stopPropagation(): void {
+        $this->log();
+        $this->event->stopPropagation();
+    }
+
+    public function getSubject() {
+        $this->log();
+        return $this->event->getSubject();
+    }
+
+    public function getArgument($key) {
+        $this->log();
+        return $this->event->getArgument($key);
+    }
+
+    public function setArgument($key, $value) {
+        $this->log();
+        return $this->event->setArgument($key, $value);
+    }
+
+    public function getArguments() {
+        return $this->event->getArguments();
+    }
+
+    public function setArguments(array $args = []) {
+        return $this->event->setArguments($args);
+    }
+
+    public function hasArgument($key) {
+        return $this->event->hasArgument($key);
+    }
+
+    /**
+     * @return mixed
+     */
+    #[\ReturnTypeWillChange]
+    public function offsetGet($key) {
+        return $this->event->offsetGet($key);
+    }
+
+    public function offsetSet($key, $value): void {
+        $this->event->offsetSet($key, $value);
+    }
+
+    public function offsetUnset($key): void {
+        $this->event->offsetUnset($key);
+    }
+
+    public function offsetExists($key): bool {
+        return $this->event->offsetExists($key);
+    }
+
+    public function getIterator() {
+        return$this->event->getIterator();
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
 		$class = ($this->event !== null && is_object($this->event)) ? get_class($this->event) : 'null';
 		$this->logger->debug(
 			'Deprecated event type for {name}: {class} is used',
-			[ 'name' => $this->eventName, 'class' => $class]
+			['name' => $this->eventName, 'class' => $class]
 		);
 		$this->deprecationNoticeLogged = true;
 	}

lib/private/EventDispatcher/SymfonyAdapter.php

Indentation +166 added lines, -166 removed lines

@@ -40,170 +40,170 @@
  * @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) {
-			$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;
+    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) {
+            $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);
+    }
 }