1 files changed, 14 insertions, 39 deletions

diff --git a/core/Notification/CoreNotifier.php b/core/Notification/CoreNotifier.php
index 6665389dbac..83a86513e03 100644
--- a/core/Notification/CoreNotifier.php
+++ b/core/Notification/CoreNotifier.php
@@ -3,28 +3,8 @@
 declare(strict_types=1);
 
 /**
- * @copyright Copyright (c) 2019, Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @author Christoph Wurst <christoph@winzerhof-wurst.at>
- * @author Joas Schilling <coding@schilljs.com>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-FileCopyrightText: 2019 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 namespace OC\Core\Notification;
 
@@ -34,19 +14,14 @@ use OCP\L10N\IFactory;
 use OCP\Notification\IAction;
 use OCP\Notification\INotification;
 use OCP\Notification\INotifier;
+use OCP\Notification\UnknownNotificationException;
 
 class CoreNotifier implements INotifier {
-	/** @var IConfig */
-	private $config;
-	/** @var IFactory */
-	private $l10nFactory;
-	/** @var IURLGenerator */
-	private $url;
-
-	public function __construct(IConfig $config, IFactory $factory, IURLGenerator $url) {
-		$this->config = $config;
-		$this->l10nFactory = $factory;
-		$this->url = $url;
+	public function __construct(
+		private IConfig $config,
+		private IFactory $factory,
+		private IURLGenerator $url,
+	) {
 	}
 
 	/**
@@ -66,14 +41,14 @@ class CoreNotifier implements INotifier {
 	 * @since 17.0.0
 	 */
 	public function getName(): string {
-		return $this->l10nFactory->get('core')->t('Nextcloud Server');
+		return $this->factory->get('core')->t('Nextcloud Server');
 	}
 
 	public function prepare(INotification $notification, string $languageCode): INotification {
 		if ($notification->getApp() !== 'core') {
-			throw new \InvalidArgumentException();
+			throw new UnknownNotificationException();
 		}
-		$l = $this->l10nFactory->get('core', $languageCode);
+		$l = $this->factory->get('core', $languageCode);
 
 		if ($notification->getSubject() === 'repair_exposing_links') {
 			$notification->setParsedSubject($l->t('Some of your link shares have been removed'));
@@ -83,8 +58,8 @@ class CoreNotifier implements INotifier {
 		}
 
 		if ($notification->getSubject() === 'user_limit_reached') {
-			$notification->setParsedSubject($l->t('The user limit of this instance is reached.'));
-			$notification->setParsedMessage($l->t('Enter your subscription key in the support app in order to increase the user limit. This does also grant you all additional benefits that Nextcloud Enterprise offers and is highly recommended for the operation in companies.'));
+			$notification->setParsedSubject($l->t('The account limit of this instance is reached.'));
+			$notification->setParsedMessage($l->t('Enter your subscription key in the support app in order to increase the account limit. This does also grant you all additional benefits that Nextcloud Enterprise offers and is highly recommended for the operation in companies.'));
 			$notification->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/contacts.svg')));
 			$action = $notification->createAction();
 			$label = $l->t('Learn more ↗');
@@ -97,6 +72,6 @@ class CoreNotifier implements INotifier {
 			return $notification;
 		}
 
-		throw new \InvalidArgumentException('Invalid subject');
+		throw new UnknownNotificationException('Invalid subject');
 	}
 }