refactor: move to new activity exception

Signed-off-by: Anna Larch <anna@nextcloud.com>

diff --git a/apps/comments/lib/Activity/Provider.php b/apps/comments/lib/Activity/Provider.php
index e537070a55296e54c17584ffc3bf0c483197deec..4fb0c8d58beb852dc11c3d75691c04ddd9dcf788 100644 (file)
--- a/apps/comments/lib/Activity/Provider.php
+++ b/apps/comments/lib/Activity/Provider.php
@@ -5,6 +5,7 @@
  */
 namespace OCA\Comments\Activity;
 
+use OCP\Activity\Exceptions\UnknownActivityException;
 use OCP\Activity\IEvent;
 use OCP\Activity\IManager;
 use OCP\Activity\IProvider;
@@ -32,12 +33,12 @@ class Provider implements IProvider {
         * @param IEvent $event
         * @param IEvent|null $previousEvent
         * @return IEvent
-        * @throws \InvalidArgumentException
+        * @throws UnknownActivityException
         * @since 11.0.0
         */
        public function parse($language, IEvent $event, ?IEvent $previousEvent = null): IEvent {
                if ($event->getApp() !== 'comments') {
-                       throw new \InvalidArgumentException();
+                       throw new UnknownActivityException();
                }
 
                $this->l = $this->languageFactory->get('comments', $language);
@@ -59,9 +60,9 @@ class Provider implements IProvider {
                        }
 
                        return $this->parseLongVersion($event);
-               } else {
-                       throw new \InvalidArgumentException();
                }
+               throw new UnknownActivityException();
+
        }
 
        /**

diff --git a/apps/dav/lib/CalDAV/Activity/Provider/Calendar.php b/apps/dav/lib/CalDAV/Activity/Provider/Calendar.php
index a7509831f2966525af921227dea2b04500506ee6..25d3260c7a60e3805c127620294ce4c36df36439 100644 (file)
--- a/apps/dav/lib/CalDAV/Activity/Provider/Calendar.php
+++ b/apps/dav/lib/CalDAV/Activity/Provider/Calendar.php
@@ -5,6 +5,7 @@
  */
 namespace OCA\DAV\CalDAV\Activity\Provider;
 
+use OCP\Activity\Exceptions\UnknownActivityException;
 use OCP\Activity\IEvent;
 use OCP\Activity\IEventMerger;
 use OCP\Activity\IManager;
@@ -59,12 +60,12 @@ class Calendar extends Base {
         * @param IEvent $event
         * @param IEvent|null $previousEvent
         * @return IEvent
-        * @throws \InvalidArgumentException
+        * @throws UnknownActivityException
         * @since 11.0.0
         */
        public function parse($language, IEvent $event, ?IEvent $previousEvent = null) {
                if ($event->getApp() !== 'dav' || $event->getType() !== 'calendar') {
-                       throw new \InvalidArgumentException();
+                       throw new UnknownActivityException();
                }
 
                $this->l = $this->languageFactory->get('dav', $language);
@@ -122,7 +123,7 @@ class Calendar extends Base {
                } elseif ($event->getSubject() === self::SUBJECT_UNSHARE_GROUP . '_by') {
                        $subject = $this->l->t('{actor} unshared calendar {calendar} from group {group}');
                } else {
-                       throw new \InvalidArgumentException();
+                       throw new UnknownActivityException();
                }
 
                $parsedParameters = $this->getParameters($event);

diff --git a/apps/dav/lib/CalDAV/Activity/Provider/Event.php b/apps/dav/lib/CalDAV/Activity/Provider/Event.php
index 959c0a815dd7438df89a7e344df93a3dfbc07c6e..26bf69aecdd78739ead42f1de59cc086ee72b41b 100644 (file)
--- a/apps/dav/lib/CalDAV/Activity/Provider/Event.php
+++ b/apps/dav/lib/CalDAV/Activity/Provider/Event.php
@@ -6,6 +6,7 @@
 namespace OCA\DAV\CalDAV\Activity\Provider;
 
 use OC_App;
+use OCP\Activity\Exceptions\UnknownActivityException;
 use OCP\Activity\IEvent;
 use OCP\Activity\IEventMerger;
 use OCP\Activity\IManager;
@@ -106,12 +107,12 @@ class Event extends Base {
         * @param IEvent $event
         * @param IEvent|null $previousEvent
         * @return IEvent
-        * @throws \InvalidArgumentException
+        * @throws UnknownActivityException
         * @since 11.0.0
         */
        public function parse($language, IEvent $event, ?IEvent $previousEvent = null) {
                if ($event->getApp() !== 'dav' || $event->getType() !== 'calendar_event') {
-                       throw new \InvalidArgumentException();
+                       throw new UnknownActivityException();
                }
 
                $this->l = $this->languageFactory->get('dav', $language);
@@ -147,7 +148,7 @@ class Event extends Base {
                } elseif ($event->getSubject() === self::SUBJECT_OBJECT_RESTORE . '_event_self') {
                        $subject = $this->l->t('You restored event {event} of calendar {calendar}');
                } else {
-                       throw new \InvalidArgumentException();
+                       throw new UnknownActivityException();
                }
 
                $parsedParameters = $this->getParameters($event);

diff --git a/apps/dav/lib/CalDAV/Activity/Provider/Todo.php b/apps/dav/lib/CalDAV/Activity/Provider/Todo.php
index 68a95341ff24ba2a106bbfc73489b48962ff5386..1e817663439ba62ea81a3dfae5916925385ea2f2 100644 (file)
--- a/apps/dav/lib/CalDAV/Activity/Provider/Todo.php
+++ b/apps/dav/lib/CalDAV/Activity/Provider/Todo.php
@@ -5,6 +5,7 @@
  */
 namespace OCA\DAV\CalDAV\Activity\Provider;
 
+use OCP\Activity\Exceptions\UnknownActivityException;
 use OCP\Activity\IEvent;
 
 class Todo extends Event {
@@ -14,12 +15,12 @@ class Todo extends Event {
         * @param IEvent $event
         * @param IEvent|null $previousEvent
         * @return IEvent
-        * @throws \InvalidArgumentException
+        * @throws UnknownActivityException
         * @since 11.0.0
         */
        public function parse($language, IEvent $event, ?IEvent $previousEvent = null) {
                if ($event->getApp() !== 'dav' || $event->getType() !== 'calendar_todo') {
-                       throw new \InvalidArgumentException();
+                       throw new UnknownActivityException();
                }
 
                $this->l = $this->languageFactory->get('dav', $language);
@@ -55,7 +56,7 @@ class Todo extends Event {
                } elseif ($event->getSubject() === self::SUBJECT_OBJECT_MOVE . '_todo_self') {
                        $subject = $this->l->t('You moved to-do {todo} from list {sourceCalendar} to list {targetCalendar}');
                } else {
-                       throw new \InvalidArgumentException();
+                       throw new UnknownActivityException();
                }
 
                $parsedParameters = $this->getParameters($event);

diff --git a/apps/dav/lib/CardDAV/Activity/Provider/Addressbook.php b/apps/dav/lib/CardDAV/Activity/Provider/Addressbook.php
index 189c6a8e9eda89142f6b111124a738cbdbe1c82a..31f26554d674af08a188ddfc9f969342d21abc81 100644 (file)
--- a/apps/dav/lib/CardDAV/Activity/Provider/Addressbook.php
+++ b/apps/dav/lib/CardDAV/Activity/Provider/Addressbook.php
@@ -8,6 +8,7 @@ declare(strict_types=1);
  */
 namespace OCA\DAV\CardDAV\Activity\Provider;
 
+use OCP\Activity\Exceptions\UnknownActivityException;
 use OCP\Activity\IEvent;
 use OCP\Activity\IEventMerger;
 use OCP\Activity\IManager;
@@ -52,11 +53,11 @@ class Addressbook extends Base {
         * @param IEvent $event
         * @param IEvent|null $previousEvent
         * @return IEvent
-        * @throws \InvalidArgumentException
+        * @throws UnknownActivityException
         */
        public function parse($language, IEvent $event, ?IEvent $previousEvent = null): IEvent {
                if ($event->getApp() !== 'dav' || $event->getType() !== 'contacts') {
-                       throw new \InvalidArgumentException();
+                       throw new UnknownActivityException();
                }
 
                $l = $this->languageFactory->get('dav', $language);
@@ -102,7 +103,7 @@ class Addressbook extends Base {
                } elseif ($event->getSubject() === self::SUBJECT_UNSHARE_GROUP . '_by') {
                        $subject = $l->t('{actor} unshared address book {addressbook} from group {group}');
                } else {
-                       throw new \InvalidArgumentException();
+                       throw new UnknownActivityException();
                }
 
                $parsedParameters = $this->getParameters($event, $l);

diff --git a/apps/dav/lib/CardDAV/Activity/Provider/Card.php b/apps/dav/lib/CardDAV/Activity/Provider/Card.php
index 7e8bf9b0d4d687f6afc236508dcd306c77dfe146..aa821f592d9ce4a8bd8eb7ae1a854e28ba202c2f 100644 (file)
--- a/apps/dav/lib/CardDAV/Activity/Provider/Card.php
+++ b/apps/dav/lib/CardDAV/Activity/Provider/Card.php
@@ -8,6 +8,7 @@ declare(strict_types=1);
  */
 namespace OCA\DAV\CardDAV\Activity\Provider;
 
+use OCP\Activity\Exceptions\UnknownActivityException;
 use OCP\Activity\IEvent;
 use OCP\Activity\IEventMerger;
 use OCP\Activity\IManager;
@@ -54,11 +55,11 @@ class Card extends Base {
         * @param IEvent $event
         * @param IEvent|null $previousEvent
         * @return IEvent
-        * @throws \InvalidArgumentException
+        * @throws UnknownActivityException
         */
        public function parse($language, IEvent $event, ?IEvent $previousEvent = null): IEvent {
                if ($event->getApp() !== 'dav' || $event->getType() !== 'contacts') {
-                       throw new \InvalidArgumentException();
+                       throw new UnknownActivityException();
                }
 
                $l = $this->languageFactory->get('dav', $language);
@@ -82,7 +83,7 @@ class Card extends Base {
                } elseif ($event->getSubject() === self::SUBJECT_UPDATE . '_self') {
                        $subject = $l->t('You updated contact {card} in address book {addressbook}');
                } else {
-                       throw new \InvalidArgumentException();
+                       throw new UnknownActivityException();
                }
 
                $parsedParameters = $this->getParameters($event, $l);

diff --git a/apps/files/lib/Activity/FavoriteProvider.php b/apps/files/lib/Activity/FavoriteProvider.php
index 00f1387df94fa922b4b65017e423c0aeab4694cf..8cfc1a837988194e52a4fe24bdbfb89ee12ebebc 100644 (file)
--- a/apps/files/lib/Activity/FavoriteProvider.php
+++ b/apps/files/lib/Activity/FavoriteProvider.php
@@ -5,6 +5,7 @@
  */
 namespace OCA\Files\Activity;
 
+use OCP\Activity\Exceptions\UnknownActivityException;
 use OCP\Activity\IEvent;
 use OCP\Activity\IEventMerger;
 use OCP\Activity\IManager;
@@ -50,12 +51,12 @@ class FavoriteProvider implements IProvider {
         * @param IEvent $event
         * @param IEvent|null $previousEvent
         * @return IEvent
-        * @throws \InvalidArgumentException
+        * @throws UnknownActivityException
         * @since 11.0.0
         */
        public function parse($language, IEvent $event, ?IEvent $previousEvent = null) {
                if ($event->getApp() !== 'files' || $event->getType() !== 'favorite') {
-                       throw new \InvalidArgumentException();
+                       throw new UnknownActivityException();
                }
 
                $this->l = $this->languageFactory->get('files', $language);

diff --git a/apps/files/lib/Activity/Provider.php b/apps/files/lib/Activity/Provider.php
index aa3ef062a162ee67975955926dc475365e463049..f777d11c02ed491cff16fb371851230fbeaf4df4 100644 (file)
--- a/apps/files/lib/Activity/Provider.php
+++ b/apps/files/lib/Activity/Provider.php
@@ -5,6 +5,7 @@
  */
 namespace OCA\Files\Activity;
 
+use OCP\Activity\Exceptions\UnknownActivityException;
 use OCP\Activity\IEvent;
 use OCP\Activity\IEventMerger;
 use OCP\Activity\IManager;
@@ -79,12 +80,12 @@ class Provider implements IProvider {
         * @param IEvent $event
         * @param IEvent|null $previousEvent
         * @return IEvent
-        * @throws \InvalidArgumentException
+        * @throws UnknownActivityException
         * @since 11.0.0
         */
        public function parse($language, IEvent $event, ?IEvent $previousEvent = null) {
                if ($event->getApp() !== 'files') {
-                       throw new \InvalidArgumentException();
+                       throw new UnknownActivityException();
                }
 
                $this->l = $this->languageFactory->get('files', $language);

diff --git a/apps/files_sharing/lib/Activity/Providers/Base.php b/apps/files_sharing/lib/Activity/Providers/Base.php
index 5bf63b7e2afddae53f0e059a2352825cddbff4a2..13bf3fea0e7647e18000277b8a4e9e0a7aa844e5 100644 (file)
--- a/apps/files_sharing/lib/Activity/Providers/Base.php
+++ b/apps/files_sharing/lib/Activity/Providers/Base.php
@@ -5,6 +5,7 @@
  */
 namespace OCA\Files_Sharing\Activity\Providers;
 
+use OCP\Activity\Exceptions\UnknownActivityException;
 use OCP\Activity\IEvent;
 use OCP\Activity\IEventMerger;
 use OCP\Activity\IManager;
@@ -65,12 +66,12 @@ abstract class Base implements IProvider {
         * @param IEvent $event
         * @param IEvent|null $previousEvent
         * @return IEvent
-        * @throws \InvalidArgumentException
+        * @throws UnknownActivityException
         * @since 11.0.0
         */
        public function parse($language, IEvent $event, ?IEvent $previousEvent = null) {
                if ($event->getApp() !== 'files_sharing') {
-                       throw new \InvalidArgumentException();
+                       throw new UnknownActivityException();
                }
 
                $this->l = $this->languageFactory->get('files_sharing', $language);

diff --git a/apps/settings/lib/Activity/GroupProvider.php b/apps/settings/lib/Activity/GroupProvider.php
index bad2c0c7a3530aac614fdb807855f3777c822ce1..fc7189c774db5bcf399cb4009efafab172c43772 100644 (file)
--- a/apps/settings/lib/Activity/GroupProvider.php
+++ b/apps/settings/lib/Activity/GroupProvider.php
@@ -5,7 +5,7 @@
  */
 namespace OCA\Settings\Activity;
 
-use InvalidArgumentException;
+use OCP\Activity\Exceptions\UnknownActivityException;
 use OCP\Activity\IEvent;
 use OCP\Activity\IManager;
 use OCP\Activity\IProvider;
@@ -48,7 +48,7 @@ class GroupProvider implements IProvider {
 
        public function parse($language, IEvent $event, ?IEvent $previousEvent = null) {
                if ($event->getType() !== 'group_settings') {
-                       throw new InvalidArgumentException();
+                       throw new UnknownActivityException();
                }
 
                $l = $this->l10n->get('settings', $language);
@@ -95,7 +95,7 @@ class GroupProvider implements IProvider {
                                }
                                break;
                        default:
-                               throw new InvalidArgumentException();
+                               throw new UnknownActivityException();
                }
 
                $this->setSubjects($event, $subject, $parsedParameters);

diff --git a/apps/settings/lib/Activity/Provider.php b/apps/settings/lib/Activity/Provider.php
index ab9a8e3c85c324b7d836bc484b4b18a9b1248f25..8d726c8da22b1146a0de13df5e041c34eeb9814c 100644 (file)
--- a/apps/settings/lib/Activity/Provider.php
+++ b/apps/settings/lib/Activity/Provider.php
@@ -8,6 +8,7 @@ declare(strict_types=1);
  */
 namespace OCA\Settings\Activity;
 
+use OCP\Activity\Exceptions\UnknownActivityException;
 use OCP\Activity\IEvent;
 use OCP\Activity\IManager;
 use OCP\Activity\IProvider;
@@ -60,12 +61,12 @@ class Provider implements IProvider {
         * @param IEvent $event
         * @param IEvent|null $previousEvent
         * @return IEvent
-        * @throws \InvalidArgumentException
+        * @throws UnknownActivityException
         * @since 11.0.0
         */
        public function parse($language, IEvent $event, ?IEvent $previousEvent = null): IEvent {
                if ($event->getApp() !== 'settings') {
-                       throw new \InvalidArgumentException('Unknown app');
+                       throw new UnknownActivityException('Unknown app');
                }
 
                $this->l = $this->languageFactory->get('settings', $language);
@@ -105,7 +106,7 @@ class Provider implements IProvider {
                } elseif ($event->getSubject() === self::APP_TOKEN_FILESYSTEM_REVOKED) {
                        $subject = $this->l->t('You revoked filesystem access from app password "{token}"');
                } else {
-                       throw new \InvalidArgumentException('Unknown subject');
+                       throw new UnknownActivityException('Unknown subject');
                }
 
                $parsedParameters = $this->getParameters($event);

diff --git a/apps/settings/lib/Activity/SecurityProvider.php b/apps/settings/lib/Activity/SecurityProvider.php
index a67b9cf365e396c0e92087e25b639385916ec4b4..8e2b4f8f45ac83d0f12952395d21780d11409233 100644 (file)
--- a/apps/settings/lib/Activity/SecurityProvider.php
+++ b/apps/settings/lib/Activity/SecurityProvider.php
@@ -8,7 +8,7 @@ declare(strict_types=1);
  */
 namespace OCA\Settings\Activity;
 
-use InvalidArgumentException;
+use OCP\Activity\Exceptions\UnknownActivityException;
 use OCP\Activity\IEvent;
 use OCP\Activity\IManager;
 use OCP\Activity\IProvider;
@@ -34,7 +34,7 @@ class SecurityProvider implements IProvider {
 
        public function parse($language, IEvent $event, ?IEvent $previousEvent = null) {
                if ($event->getType() !== 'security') {
-                       throw new InvalidArgumentException();
+                       throw new UnknownActivityException();
                }
 
                $l = $this->l10n->get('settings', $language);
@@ -85,7 +85,7 @@ class SecurityProvider implements IProvider {
                                }
                                break;
                        default:
-                               throw new InvalidArgumentException();
+                               throw new UnknownActivityException();
                }
                return $event;
        }

diff --git a/apps/sharebymail/lib/Activity.php b/apps/sharebymail/lib/Activity.php
index bee75c48264c5686032deb39043bbfeacc868599..be9deeb7290f3c9fcaca40e6270416c3f8554243 100644 (file)
--- a/apps/sharebymail/lib/Activity.php
+++ b/apps/sharebymail/lib/Activity.php
@@ -5,6 +5,7 @@
  */
 namespace OCA\ShareByMail;
 
+use OCP\Activity\Exceptions\UnknownActivityException;
 use OCP\Activity\IEvent;
 use OCP\Activity\IManager;
 use OCP\Activity\IProvider;
@@ -62,12 +63,12 @@ class Activity implements IProvider {
         * @param IEvent $event
         * @param IEvent|null $previousEvent
         * @return IEvent
-        * @throws \InvalidArgumentException
+        * @throws UnknownActivityException
         * @since 11.0.0
         */
        public function parse($language, IEvent $event, ?IEvent $previousEvent = null) {
                if ($event->getApp() !== 'sharebymail') {
-                       throw new \InvalidArgumentException();
+                       throw new UnknownActivityException();
                }
 
                $this->l = $this->languageFactory->get('sharebymail', $language);

diff --git a/apps/systemtags/lib/Activity/Provider.php b/apps/systemtags/lib/Activity/Provider.php
index b3685990ffd7844fe078560ad12f5cfb40ec2bd3..ba24dff31a875ec95c997f8a662281e8140e1c7a 100644 (file)
--- a/apps/systemtags/lib/Activity/Provider.php
+++ b/apps/systemtags/lib/Activity/Provider.php
@@ -5,6 +5,7 @@
  */
 namespace OCA\SystemTags\Activity;
 
+use OCP\Activity\Exceptions\UnknownActivityException;
 use OCP\Activity\IEvent;
 use OCP\Activity\IManager;
 use OCP\Activity\IProvider;
@@ -54,12 +55,12 @@ class Provider implements IProvider {
         * @param IEvent $event
         * @param IEvent|null $previousEvent
         * @return IEvent
-        * @throws \InvalidArgumentException
+        * @throws UnknownActivityException
         * @since 11.0.0
         */
        public function parse($language, IEvent $event, ?IEvent $previousEvent = null) {
                if ($event->getApp() !== 'systemtags') {
-                       throw new \InvalidArgumentException();
+                       throw new UnknownActivityException();
                }
 
                $this->l = $this->languageFactory->get('systemtags', $language);

diff --git a/apps/twofactor_backupcodes/lib/Activity/Provider.php b/apps/twofactor_backupcodes/lib/Activity/Provider.php
index 567d2c4995cd7cb7ffce48875853f55214fdc4ab..7bf0db04e77b813f584813f5ea2d92d7c5db7fbd 100644 (file)
--- a/apps/twofactor_backupcodes/lib/Activity/Provider.php
+++ b/apps/twofactor_backupcodes/lib/Activity/Provider.php
@@ -8,7 +8,7 @@ declare(strict_types=1);
  */
 namespace OCA\TwoFactorBackupCodes\Activity;
 
-use InvalidArgumentException;
+use OCP\Activity\Exceptions\UnknownActivityException;
 use OCP\Activity\IEvent;
 use OCP\Activity\IManager;
 use OCP\Activity\IProvider;
@@ -39,7 +39,7 @@ class Provider implements IProvider {
 
        public function parse($language, IEvent $event, ?IEvent $previousEvent = null): IEvent {
                if ($event->getApp() !== 'twofactor_backupcodes') {
-                       throw new InvalidArgumentException();
+                       throw new UnknownActivityException();
                }
 
                $l = $this->l10n->get('twofactor_backupcodes', $language);
@@ -55,7 +55,7 @@ class Provider implements IProvider {
                                }
                                break;
                        default:
-                               throw new InvalidArgumentException();
+                               throw new UnknownActivityException();
                }
                return $event;
        }