nextcloud / server

lib/private/Notification/Manager.php

Indentation +233 added lines, -233 removed lines

@@ -32,237 +32,237 @@
 use OCP\RichObjectStrings\IValidator;
 
 class Manager implements IManager {
-	/** @var IValidator */
-	protected $validator;
-
-	/** @var IApp[] */
-	protected $apps;
-
-	/** @var INotifier[] */
-	protected $notifiers;
-
-	/** @var array[] */
-	protected $notifiersInfo;
-
-	/** @var \Closure[] */
-	protected $appsClosures;
-
-	/** @var \Closure[] */
-	protected $notifiersClosures;
-
-	/** @var \Closure[] */
-	protected $notifiersInfoClosures;
-
-	/** @var bool */
-	protected $preparingPushNotification;
-
-	/**
-	 * Manager constructor.
-	 *
-	 * @param IValidator $validator
-	 */
-	public function __construct(IValidator $validator) {
-		$this->validator = $validator;
-		$this->apps = [];
-		$this->notifiers = [];
-		$this->notifiersInfo = [];
-		$this->appsClosures = [];
-		$this->notifiersClosures = [];
-		$this->notifiersInfoClosures = [];
-		$this->preparingPushNotification = false;
-	}
-
-	/**
-	 * @param \Closure $service The service must implement IApp, otherwise a
-	 *                          \InvalidArgumentException is thrown later
-	 * @since 8.2.0
-	 */
-	public function registerApp(\Closure $service) {
-		$this->appsClosures[] = $service;
-		$this->apps = [];
-	}
-
-	/**
-	 * @param \Closure $service The service must implement INotifier, otherwise a
-	 *                          \InvalidArgumentException is thrown later
-	 * @param \Closure $info    An array with the keys 'id' and 'name' containing
-	 *                          the app id and the app name
-	 * @since 8.2.0 - Parameter $info was added in 9.0.0
-	 */
-	public function registerNotifier(\Closure $service, \Closure $info) {
-		$this->notifiersClosures[] = $service;
-		$this->notifiersInfoClosures[] = $info;
-		$this->notifiers = [];
-		$this->notifiersInfo = [];
-	}
-
-	/**
-	 * @return IApp[]
-	 */
-	protected function getApps(): array {
-		if (!empty($this->apps)) {
-			return $this->apps;
-		}
-
-		$this->apps = [];
-		foreach ($this->appsClosures as $closure) {
-			$app = $closure();
-			if (!($app instanceof IApp)) {
-				throw new \InvalidArgumentException('The given notification app does not implement the IApp interface');
-			}
-			$this->apps[] = $app;
-		}
-
-		return $this->apps;
-	}
-
-	/**
-	 * @return INotifier[]
-	 */
-	protected function getNotifiers(): array {
-		if (!empty($this->notifiers)) {
-			return $this->notifiers;
-		}
-
-		$this->notifiers = [];
-		foreach ($this->notifiersClosures as $closure) {
-			$notifier = $closure();
-			if (!($notifier instanceof INotifier)) {
-				throw new \InvalidArgumentException('The given notifier does not implement the INotifier interface');
-			}
-			$this->notifiers[] = $notifier;
-		}
-
-		return $this->notifiers;
-	}
-
-	/**
-	 * @return array[]
-	 */
-	public function listNotifiers(): array {
-		if (!empty($this->notifiersInfo)) {
-			return $this->notifiersInfo;
-		}
-
-		$this->notifiersInfo = [];
-		foreach ($this->notifiersInfoClosures as $closure) {
-			$notifier = $closure();
-			if (!\is_array($notifier) || \count($notifier) !== 2 || !isset($notifier['id'], $notifier['name'])) {
-				throw new \InvalidArgumentException('The given notifier information is invalid');
-			}
-			if (isset($this->notifiersInfo[$notifier['id']])) {
-				throw new \InvalidArgumentException('The given notifier ID ' . $notifier['id'] . ' is already in use');
-			}
-			$this->notifiersInfo[$notifier['id']] = $notifier['name'];
-		}
-
-		return $this->notifiersInfo;
-	}
-
-	/**
-	 * @return INotification
-	 * @since 8.2.0
-	 */
-	public function createNotification(): INotification {
-		return new Notification($this->validator);
-	}
-
-	/**
-	 * @return bool
-	 * @since 8.2.0
-	 */
-	public function hasNotifiers(): bool {
-		return !empty($this->notifiersClosures);
-	}
-
-	/**
-	 * @param bool $preparingPushNotification
-	 * @since 14.0.0
-	 */
-	public function setPreparingPushNotification($preparingPushNotification) {
-		$this->preparingPushNotification = $preparingPushNotification;
-	}
-
-	/**
-	 * @return bool
-	 * @since 14.0.0
-	 */
-	public function isPreparingPushNotification(): bool {
-		return $this->preparingPushNotification;
-	}
-
-	/**
-	 * @param INotification $notification
-	 * @throws \InvalidArgumentException When the notification is not valid
-	 * @since 8.2.0
-	 */
-	public function notify(INotification $notification) {
-		if (!$notification->isValid()) {
-			throw new \InvalidArgumentException('The given notification is invalid');
-		}
-
-		$apps = $this->getApps();
-
-		foreach ($apps as $app) {
-			try {
-				$app->notify($notification);
-			} catch (\InvalidArgumentException $e) {
-			}
-		}
-	}
-
-	/**
-	 * @param INotification $notification
-	 * @param string $languageCode The code of the language that should be used to prepare the notification
-	 * @return INotification
-	 * @throws \InvalidArgumentException When the notification was not prepared by a notifier
-	 * @since 8.2.0
-	 */
-	public function prepare(INotification $notification, $languageCode): INotification {
-		$notifiers = $this->getNotifiers();
-
-		foreach ($notifiers as $notifier) {
-			try {
-				$notification = $notifier->prepare($notification, $languageCode);
-			} catch (\InvalidArgumentException $e) {
-				continue;
-			}
-
-			if (!($notification instanceof INotification) || !$notification->isValidParsed()) {
-				throw new \InvalidArgumentException('The given notification has not been handled');
-			}
-		}
-
-		if (!($notification instanceof INotification) || !$notification->isValidParsed()) {
-			throw new \InvalidArgumentException('The given notification has not been handled');
-		}
-
-		return $notification;
-	}
-
-	/**
-	 * @param INotification $notification
-	 */
-	public function markProcessed(INotification $notification) {
-		$apps = $this->getApps();
-
-		foreach ($apps as $app) {
-			$app->markProcessed($notification);
-		}
-	}
-
-	/**
-	 * @param INotification $notification
-	 * @return int
-	 */
-	public function getCount(INotification $notification): int {
-		$apps = $this->getApps();
-
-		$count = 0;
-		foreach ($apps as $app) {
-			$count += $app->getCount($notification);
-		}
-
-		return $count;
-	}
+    /** @var IValidator */
+    protected $validator;
+
+    /** @var IApp[] */
+    protected $apps;
+
+    /** @var INotifier[] */
+    protected $notifiers;
+
+    /** @var array[] */
+    protected $notifiersInfo;
+
+    /** @var \Closure[] */
+    protected $appsClosures;
+
+    /** @var \Closure[] */
+    protected $notifiersClosures;
+
+    /** @var \Closure[] */
+    protected $notifiersInfoClosures;
+
+    /** @var bool */
+    protected $preparingPushNotification;
+
+    /**
+     * Manager constructor.
+     *
+     * @param IValidator $validator
+     */
+    public function __construct(IValidator $validator) {
+        $this->validator = $validator;
+        $this->apps = [];
+        $this->notifiers = [];
+        $this->notifiersInfo = [];
+        $this->appsClosures = [];
+        $this->notifiersClosures = [];
+        $this->notifiersInfoClosures = [];
+        $this->preparingPushNotification = false;
+    }
+
+    /**
+     * @param \Closure $service The service must implement IApp, otherwise a
+     *                          \InvalidArgumentException is thrown later
+     * @since 8.2.0
+     */
+    public function registerApp(\Closure $service) {
+        $this->appsClosures[] = $service;
+        $this->apps = [];
+    }
+
+    /**
+     * @param \Closure $service The service must implement INotifier, otherwise a
+     *                          \InvalidArgumentException is thrown later
+     * @param \Closure $info    An array with the keys 'id' and 'name' containing
+     *                          the app id and the app name
+     * @since 8.2.0 - Parameter $info was added in 9.0.0
+     */
+    public function registerNotifier(\Closure $service, \Closure $info) {
+        $this->notifiersClosures[] = $service;
+        $this->notifiersInfoClosures[] = $info;
+        $this->notifiers = [];
+        $this->notifiersInfo = [];
+    }
+
+    /**
+     * @return IApp[]
+     */
+    protected function getApps(): array {
+        if (!empty($this->apps)) {
+            return $this->apps;
+        }
+
+        $this->apps = [];
+        foreach ($this->appsClosures as $closure) {
+            $app = $closure();
+            if (!($app instanceof IApp)) {
+                throw new \InvalidArgumentException('The given notification app does not implement the IApp interface');
+            }
+            $this->apps[] = $app;
+        }
+
+        return $this->apps;
+    }
+
+    /**
+     * @return INotifier[]
+     */
+    protected function getNotifiers(): array {
+        if (!empty($this->notifiers)) {
+            return $this->notifiers;
+        }
+
+        $this->notifiers = [];
+        foreach ($this->notifiersClosures as $closure) {
+            $notifier = $closure();
+            if (!($notifier instanceof INotifier)) {
+                throw new \InvalidArgumentException('The given notifier does not implement the INotifier interface');
+            }
+            $this->notifiers[] = $notifier;
+        }
+
+        return $this->notifiers;
+    }
+
+    /**
+     * @return array[]
+     */
+    public function listNotifiers(): array {
+        if (!empty($this->notifiersInfo)) {
+            return $this->notifiersInfo;
+        }
+
+        $this->notifiersInfo = [];
+        foreach ($this->notifiersInfoClosures as $closure) {
+            $notifier = $closure();
+            if (!\is_array($notifier) || \count($notifier) !== 2 || !isset($notifier['id'], $notifier['name'])) {
+                throw new \InvalidArgumentException('The given notifier information is invalid');
+            }
+            if (isset($this->notifiersInfo[$notifier['id']])) {
+                throw new \InvalidArgumentException('The given notifier ID ' . $notifier['id'] . ' is already in use');
+            }
+            $this->notifiersInfo[$notifier['id']] = $notifier['name'];
+        }
+
+        return $this->notifiersInfo;
+    }
+
+    /**
+     * @return INotification
+     * @since 8.2.0
+     */
+    public function createNotification(): INotification {
+        return new Notification($this->validator);
+    }
+
+    /**
+     * @return bool
+     * @since 8.2.0
+     */
+    public function hasNotifiers(): bool {
+        return !empty($this->notifiersClosures);
+    }
+
+    /**
+     * @param bool $preparingPushNotification
+     * @since 14.0.0
+     */
+    public function setPreparingPushNotification($preparingPushNotification) {
+        $this->preparingPushNotification = $preparingPushNotification;
+    }
+
+    /**
+     * @return bool
+     * @since 14.0.0
+     */
+    public function isPreparingPushNotification(): bool {
+        return $this->preparingPushNotification;
+    }
+
+    /**
+     * @param INotification $notification
+     * @throws \InvalidArgumentException When the notification is not valid
+     * @since 8.2.0
+     */
+    public function notify(INotification $notification) {
+        if (!$notification->isValid()) {
+            throw new \InvalidArgumentException('The given notification is invalid');
+        }
+
+        $apps = $this->getApps();
+
+        foreach ($apps as $app) {
+            try {
+                $app->notify($notification);
+            } catch (\InvalidArgumentException $e) {
+            }
+        }
+    }
+
+    /**
+     * @param INotification $notification
+     * @param string $languageCode The code of the language that should be used to prepare the notification
+     * @return INotification
+     * @throws \InvalidArgumentException When the notification was not prepared by a notifier
+     * @since 8.2.0
+     */
+    public function prepare(INotification $notification, $languageCode): INotification {
+        $notifiers = $this->getNotifiers();
+
+        foreach ($notifiers as $notifier) {
+            try {
+                $notification = $notifier->prepare($notification, $languageCode);
+            } catch (\InvalidArgumentException $e) {
+                continue;
+            }
+
+            if (!($notification instanceof INotification) || !$notification->isValidParsed()) {
+                throw new \InvalidArgumentException('The given notification has not been handled');
+            }
+        }
+
+        if (!($notification instanceof INotification) || !$notification->isValidParsed()) {
+            throw new \InvalidArgumentException('The given notification has not been handled');
+        }
+
+        return $notification;
+    }
+
+    /**
+     * @param INotification $notification
+     */
+    public function markProcessed(INotification $notification) {
+        $apps = $this->getApps();
+
+        foreach ($apps as $app) {
+            $app->markProcessed($notification);
+        }
+    }
+
+    /**
+     * @param INotification $notification
+     * @return int
+     */
+    public function getCount(INotification $notification): int {
+        $apps = $this->getApps();
+
+        $count = 0;
+        foreach ($apps as $app) {
+            $count += $app->getCount($notification);
+        }
+
+        return $count;
+    }
 }

lib/public/Notification/IManager.php

Indentation +39 added lines, -39 removed lines

@@ -29,49 +29,49 @@
  * @since 9.0.0
  */
 interface IManager extends IApp, INotifier {
-	/**
-	 * @param \Closure $service The service must implement IApp, otherwise a
-	 *                          \InvalidArgumentException is thrown later
-	 * @since 9.0.0
-	 */
-	public function registerApp(\Closure $service);
+    /**
+     * @param \Closure $service The service must implement IApp, otherwise a
+     *                          \InvalidArgumentException is thrown later
+     * @since 9.0.0
+     */
+    public function registerApp(\Closure $service);
 
-	/**
-	 * @param \Closure $service The service must implement INotifier, otherwise a
-	 *                          \InvalidArgumentException is thrown later
-	 * @param \Closure $info    An array with the keys 'id' and 'name' containing
-	 *                          the app id and the app name
-	 * @since 9.0.0
-	 */
-	public function registerNotifier(\Closure $service, \Closure $info);
+    /**
+     * @param \Closure $service The service must implement INotifier, otherwise a
+     *                          \InvalidArgumentException is thrown later
+     * @param \Closure $info    An array with the keys 'id' and 'name' containing
+     *                          the app id and the app name
+     * @since 9.0.0
+     */
+    public function registerNotifier(\Closure $service, \Closure $info);
 
-	/**
-	 * @return array App ID => App Name
-	 * @since 9.0.0
-	 */
-	public function listNotifiers();
+    /**
+     * @return array App ID => App Name
+     * @since 9.0.0
+     */
+    public function listNotifiers();
 
-	/**
-	 * @return INotification
-	 * @since 9.0.0
-	 */
-	public function createNotification();
+    /**
+     * @return INotification
+     * @since 9.0.0
+     */
+    public function createNotification();
 
-	/**
-	 * @return bool
-	 * @since 9.0.0
-	 */
-	public function hasNotifiers();
+    /**
+     * @return bool
+     * @since 9.0.0
+     */
+    public function hasNotifiers();
 
-	/**
-	 * @param bool $preparingPushNotification
-	 * @since 14.0.0
-	 */
-	public function setPreparingPushNotification($preparingPushNotification);
+    /**
+     * @param bool $preparingPushNotification
+     * @since 14.0.0
+     */
+    public function setPreparingPushNotification($preparingPushNotification);
 
-	/**
-	 * @return bool
-	 * @since 14.0.0
-	 */
-	public function isPreparingPushNotification();
+    /**
+     * @return bool
+     * @since 14.0.0
+     */
+    public function isPreparingPushNotification();
 }