Merge pull request #3344 from nextcloud/fix/activity-unknown-activity-exception

fix(activity): throw UnknownActivityException for unknown events

Author: pringelmann

lib/Activity/Provider.php

@@ -11,6 +11,7 @@
 
 use OCA\Forms\Db\FormMapper;
 use OCA\Forms\Service\CirclesService;
+use OCP\Activity\Exceptions\UnknownActivityException;
 use OCP\Activity\IEvent;
 use OCP\Activity\IEventMerger;
 use OCP\Activity\IProvider;
@@ -44,12 +45,12 @@ public function __construct(
 	 * @param IEvent $event
 	 * @param IEvent|null $previousEvent
 	 * @return IEvent
-	 * @throws \InvalidArgumentException
+	 * @throws UnknownActivityException
 	 */
 	public function parse($language, IEvent $event, ?IEvent $previousEvent = null): IEvent {
 		// Throw Exception, if not our activity. Necessary for workflow of Activity-App.
 		if ($event->getApp() !== $this->appName) {
-			throw new \InvalidArgumentException();
+			throw new UnknownActivityException();
 		}
 		$l10n = $this->l10nFactory->get($this->appName, $language);
 
@@ -72,7 +73,7 @@ public function parse($language, IEvent $event, ?IEvent $previousEvent = null):
 	 * Provide the translated string with placeholders
 	 * @param $subject The events subject
 	 * @return string
-	 * @throws \InvalidArgumentException
+	 * @throws UnknownActivityException
 	 */
 	public function getSubjectString(IL10N $l10n, string $subject): string {
 		switch ($subject) {
@@ -90,7 +91,7 @@ public function getSubjectString(IL10N $l10n, string $subject): string {
 
 			default:
 				$this->logger->warning('Some unknown activity has been found: ' . $subject);
-				throw new \InvalidArgumentException();
+				throw new UnknownActivityException();
 		}
 	}
 

tests/Unit/Activity/ProviderTest.php

@@ -12,6 +12,7 @@
 use OCA\Forms\Db\Form;
 use OCA\Forms\Db\FormMapper;
 use OCA\Forms\Service\CirclesService;
+use OCP\Activity\Exceptions\UnknownActivityException;
 use OCP\Activity\IEvent;
 use OCP\Activity\IEventMerger;
 use OCP\AppFramework\Db\DoesNotExistException;
@@ -92,7 +93,7 @@ public function testWrongApp() {
 			->method('getApp')
 			->willReturn('someOtherApp');
 
-		$this->expectException(\InvalidArgumentException::class);
+		$this->expectException(UnknownActivityException::class);
 		$this->provider->parse('de_DE', $event);
 	}
 
@@ -199,7 +200,7 @@ public function testGetUnknownSubjectString() {
 		$l10n->expects($this->never())
 			->method('t');
 
-		$this->expectException(\InvalidArgumentException::class);
+		$this->expectException(UnknownActivityException::class);
 		$this->provider->getSubjectString($l10n, 'someUnknownSubject');
 	}