Merge pull request #4035 from nextcloud/ref/minimum-nc-30

update ocp and remove deprecations

Author: dartcafe

composer.json

@@ -39,7 +39,7 @@
 		"doctrine/dbal": "3.8.6",
 		"league/factory-muffin": "^3.0",
 		"league/factory-muffin-faker": "^2.0",
-		"nextcloud/ocp": "dev-stable29"
+		"nextcloud/ocp": "dev-stable30"
 	},
 	"scripts": {
 		"lint": "find . -name \\*.php -not -path './vendor*/*' -print0 | xargs -0 -n1 php -l",

composer.lock

@@ -17,6 +17,7 @@
 use OCP\L10N\IFactory;
 use OCP\Notification\INotification;
 use OCP\Notification\INotifier;
+use OCP\Notification\UnknownNotificationException;
 use Psr\Log\LoggerInterface;
 
 class Notifier implements INotifier {
@@ -56,7 +57,7 @@ public function getName(): string {
 	public function prepare(INotification $notification, string $languageCode): INotification {
 		$l = $this->l10nFactory->get(AppConstants::APP_ID, $languageCode);
 		if ($notification->getApp() !== AppConstants::APP_ID) {
-			throw new \InvalidArgumentException();
+			throw new UnknownNotificationException();
 		}
 		$parameters = $notification->getSubjectParameters();
 
@@ -104,7 +105,7 @@ public function prepare(INotification $notification, string $languageCode): INot
 				self::SUBJECT_RICH => $l->t('{actor} archived your poll "%s".', $pollTitle),
 			],
 			// Unknown subject => Unknown notification => throw
-			default => throw new \InvalidArgumentException(),
+			default => throw new UnknownNotificationException(),
 		};
 
 		switch ($notification->getSubject()) {

lib/Notification/Notifier.php

@@ -8,12 +8,12 @@
 
 namespace OCA\Polls\Provider;
 
-use InvalidArgumentException;
 use OCA\Polls\AppConstants;
 use OCA\Polls\Db\ShareMapper;
 use OCA\Polls\Db\UserMapper;
 use OCA\Polls\Model\UserBase;
 use OCA\Polls\Service\ActivityService;
+use OCP\Activity\Exceptions\UnknownActivityException;
 use OCP\Activity\IEvent;
 use OCP\Activity\IEventMerger;
 use OCP\Activity\IManager as ActivityManager;
@@ -40,14 +40,14 @@ public function __construct(
 
 	public function parse($language, IEvent $event, ?IEvent $previousEvent = null) {
 		if ($event->getApp() !== AppConstants::APP_ID) {
-			throw new \InvalidArgumentException();
+			throw new UnknownActivityException();
 		}
 
 		$this->l10n = $this->transFactory->get($event->getApp(), $language);
 		$event->setIcon($this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath($event->getApp(), 'polls-dark.svg')));
 		$subject = $this->activityService->getActivityMessage($event, $language, $this->activityManager->isFormattingFilteredObject());
 		if (!$subject) {
-			throw new InvalidArgumentException();
+			throw new UnknownActivityException();
 		}
 		$this->setSubjects($event, $subject);
 		return $event;