2 files changed, 25 insertions, 51 deletions

diff --git a/apps/files_sharing/lib/Notification/Listener.php b/apps/files_sharing/lib/Notification/Listener.php
index aaac32897d7..1cf0f845e7a 100644
--- a/apps/files_sharing/lib/Notification/Listener.php
+++ b/apps/files_sharing/lib/Notification/Listener.php
@@ -20,21 +20,11 @@ use Symfony\Component\EventDispatcher\GenericEvent;
 
 class Listener {
 
-	/** @var INotificationManager */
-	protected $notificationManager;
-	/** @var IShareManager */
-	protected $shareManager;
-	/** @var IGroupManager */
-	protected $groupManager;
-
 	public function __construct(
-		INotificationManager $notificationManager,
-		IShareManager $shareManager,
-		IGroupManager $groupManager
+		protected INotificationManager $notificationManager,
+		protected IShareManager $shareManager,
+		protected IGroupManager $groupManager,
 	) {
-		$this->notificationManager = $notificationManager;
-		$this->shareManager = $shareManager;
-		$this->groupManager = $groupManager;
 	}
 
 	public function shareNotification(ShareCreatedEvent $event): void {
@@ -50,8 +40,8 @@ class Listener {
 			$group = $this->groupManager->get($share->getSharedWith());
 
 			foreach ($group->getUsers() as $user) {
-				if ($user->getUID() === $share->getShareOwner() ||
-					$user->getUID() === $share->getSharedBy()) {
+				if ($user->getUID() === $share->getShareOwner()
+					|| $user->getUID() === $share->getSharedBy()) {
 					continue;
 				}
 
@@ -82,8 +72,8 @@ class Listener {
 					continue;
 				}
 
-				if ($user->getUID() === $share->getShareOwner() ||
-					$user->getUID() === $share->getSharedBy()) {
+				if ($user->getUID() === $share->getShareOwner()
+					|| $user->getUID() === $share->getSharedBy()) {
 					continue;
 				}
 
diff --git a/apps/files_sharing/lib/Notification/Notifier.php b/apps/files_sharing/lib/Notification/Notifier.php
index 42dc21b0b4a..e4434ef0b37 100644
--- a/apps/files_sharing/lib/Notification/Notifier.php
+++ b/apps/files_sharing/lib/Notification/Notifier.php
@@ -19,6 +19,7 @@ use OCP\L10N\IFactory;
 use OCP\Notification\AlreadyProcessedException;
 use OCP\Notification\INotification;
 use OCP\Notification\INotifier;
+use OCP\Notification\UnknownNotificationException;
 use OCP\Share\Exceptions\ShareNotFound;
 use OCP\Share\IManager;
 use OCP\Share\IShare;
@@ -27,31 +28,14 @@ class Notifier implements INotifier {
 	public const INCOMING_USER_SHARE = 'incoming_user_share';
 	public const INCOMING_GROUP_SHARE = 'incoming_group_share';
 
-	/** @var IFactory */
-	protected $l10nFactory;
-	/** @var IManager */
-	private $shareManager;
-	/** @var IRootFolder */
-	private $rootFolder;
-	/** @var IGroupManager  */
-	protected $groupManager;
-	/** @var IUserManager  */
-	protected $userManager;
-	/** @var IURLGenerator */
-	protected $url;
-
-	public function __construct(IFactory $l10nFactory,
-		IManager $shareManager,
-		IRootFolder $rootFolder,
-		IGroupManager $groupManager,
-		IUserManager $userManager,
-		IURLGenerator $url) {
-		$this->l10nFactory = $l10nFactory;
-		$this->shareManager = $shareManager;
-		$this->rootFolder = $rootFolder;
-		$this->groupManager = $groupManager;
-		$this->userManager = $userManager;
-		$this->url = $url;
+	public function __construct(
+		protected IFactory $l10nFactory,
+		private IManager $shareManager,
+		private IRootFolder $rootFolder,
+		protected IGroupManager $groupManager,
+		protected IUserManager $userManager,
+		protected IURLGenerator $url,
+	) {
 	}
 
 	/**
@@ -78,15 +62,15 @@ class Notifier implements INotifier {
 	 * @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
+	 * @throws UnknownNotificationException When the notification was not prepared by a notifier
 	 * @throws AlreadyProcessedException When the notification is not needed anymore and should be deleted
 	 * @since 9.0.0
 	 */
 	public function prepare(INotification $notification, string $languageCode): INotification {
-		if ($notification->getApp() !== 'files_sharing' ||
-			($notification->getSubject() !== 'expiresTomorrow' &&
-				$notification->getObjectType() !== 'share')) {
-			throw new \InvalidArgumentException('Unhandled app or subject');
+		if ($notification->getApp() !== 'files_sharing'
+			|| ($notification->getSubject() !== 'expiresTomorrow'
+				&& $notification->getObjectType() !== 'share')) {
+			throw new UnknownNotificationException('Unhandled app or subject');
 		}
 
 		$l = $this->l10nFactory->get('files_sharing', $languageCode);
@@ -125,9 +109,9 @@ class Notifier implements INotifier {
 				[
 					'node' => [
 						'type' => 'file',
-						'id' => $node->getId(),
+						'id' => (string)$node->getId(),
 						'name' => $node->getName(),
-						'path' => $path,
+						'path' => (string)$path,
 					],
 				]
 			);
@@ -145,7 +129,7 @@ class Notifier implements INotifier {
 				throw new AlreadyProcessedException();
 			}
 		} else {
-			throw new \InvalidArgumentException('Invalid share type');
+			throw new UnknownNotificationException('Invalid share type');
 		}
 
 		switch ($notification->getSubject()) {
@@ -216,7 +200,7 @@ class Notifier implements INotifier {
 				break;
 
 			default:
-				throw new \InvalidArgumentException('Invalid subject');
+				throw new UnknownNotificationException('Invalid subject');
 		}
 
 		$notification->setRichSubject($subject, $subjectParameters)