Skip to content

Commit f8dde2d

Browse files
miaulalalamiaulalala
authored
Merge pull request #48086 from nextcloud/refactor/move-to-new-activity-exception
refactor: move to new activity exception
2 parents 4e64a6e + 1ce46c1 commit f8dde2d

15 files changed

Lines changed: 53 additions & 41 deletions

File tree

‎apps/comments/lib/Activity/Provider.php‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
*/
66
namespace OCA\Comments\Activity;
77

8+
use OCP\Activity\Exceptions\UnknownActivityException;
89
use OCP\Activity\IEvent;
910
use OCP\Activity\IManager;
1011
use OCP\Activity\IProvider;
@@ -32,12 +33,12 @@ public function __construct(
3233
* @param IEvent $event
3334
* @param IEvent|null $previousEvent
3435
* @return IEvent
35-
* @throws \InvalidArgumentException
36+
* @throws UnknownActivityException
3637
* @since 11.0.0
3738
*/
3839
public function parse($language, IEvent $event, ?IEvent $previousEvent = null): IEvent {
3940
if ($event->getApp() !== 'comments') {
40-
throw new \InvalidArgumentException();
41+
throw new UnknownActivityException();
4142
}
4243

4344
$this->l = $this->languageFactory->get('comments', $language);
@@ -59,9 +60,9 @@ public function parse($language, IEvent $event, ?IEvent $previousEvent = null):
5960
}
6061

6162
return $this->parseLongVersion($event);
62-
} else {
63-
throw new \InvalidArgumentException();
6463
}
64+
throw new UnknownActivityException();
65+
6566
}
6667

6768
/**

‎apps/dav/lib/CalDAV/Activity/Provider/Calendar.php‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
*/
66
namespace OCA\DAV\CalDAV\Activity\Provider;
77

8+
use OCP\Activity\Exceptions\UnknownActivityException;
89
use OCP\Activity\IEvent;
910
use OCP\Activity\IEventMerger;
1011
use OCP\Activity\IManager;
@@ -59,12 +60,12 @@ public function __construct(IFactory $languageFactory, IURLGenerator $url, IMana
5960
* @param IEvent $event
6061
* @param IEvent|null $previousEvent
6162
* @return IEvent
62-
* @throws \InvalidArgumentException
63+
* @throws UnknownActivityException
6364
* @since 11.0.0
6465
*/
6566
public function parse($language, IEvent $event, ?IEvent $previousEvent = null) {
6667
if ($event->getApp() !== 'dav' || $event->getType() !== 'calendar') {
67-
throw new \InvalidArgumentException();
68+
throw new UnknownActivityException();
6869
}
6970

7071
$this->l = $this->languageFactory->get('dav', $language);
@@ -122,7 +123,7 @@ public function parse($language, IEvent $event, ?IEvent $previousEvent = null) {
122123
} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_GROUP . '_by') {
123124
$subject = $this->l->t('{actor} unshared calendar {calendar} from group {group}');
124125
} else {
125-
throw new \InvalidArgumentException();
126+
throw new UnknownActivityException();
126127
}
127128

128129
$parsedParameters = $this->getParameters($event);

‎apps/dav/lib/CalDAV/Activity/Provider/Event.php‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
namespace OCA\DAV\CalDAV\Activity\Provider;
77

88
use OC_App;
9+
use OCP\Activity\Exceptions\UnknownActivityException;
910
use OCP\Activity\IEvent;
1011
use OCP\Activity\IEventMerger;
1112
use OCP\Activity\IManager;
@@ -106,12 +107,12 @@ protected function generateObjectParameter(array $eventData, string $affectedUse
106107
* @param IEvent $event
107108
* @param IEvent|null $previousEvent
108109
* @return IEvent
109-
* @throws \InvalidArgumentException
110+
* @throws UnknownActivityException
110111
* @since 11.0.0
111112
*/
112113
public function parse($language, IEvent $event, ?IEvent $previousEvent = null) {
113114
if ($event->getApp() !== 'dav' || $event->getType() !== 'calendar_event') {
114-
throw new \InvalidArgumentException();
115+
throw new UnknownActivityException();
115116
}
116117

117118
$this->l = $this->languageFactory->get('dav', $language);
@@ -147,7 +148,7 @@ public function parse($language, IEvent $event, ?IEvent $previousEvent = null) {
147148
} elseif ($event->getSubject() === self::SUBJECT_OBJECT_RESTORE . '_event_self') {
148149
$subject = $this->l->t('You restored event {event} of calendar {calendar}');
149150
} else {
150-
throw new \InvalidArgumentException();
151+
throw new UnknownActivityException();
151152
}
152153

153154
$parsedParameters = $this->getParameters($event);

‎apps/dav/lib/CalDAV/Activity/Provider/Todo.php‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
*/
66
namespace OCA\DAV\CalDAV\Activity\Provider;
77

8+
use OCP\Activity\Exceptions\UnknownActivityException;
89
use OCP\Activity\IEvent;
910

1011
class Todo extends Event {
@@ -14,12 +15,12 @@ class Todo extends Event {
1415
* @param IEvent $event
1516
* @param IEvent|null $previousEvent
1617
* @return IEvent
17-
* @throws \InvalidArgumentException
18+
* @throws UnknownActivityException
1819
* @since 11.0.0
1920
*/
2021
public function parse($language, IEvent $event, ?IEvent $previousEvent = null) {
2122
if ($event->getApp() !== 'dav' || $event->getType() !== 'calendar_todo') {
22-
throw new \InvalidArgumentException();
23+
throw new UnknownActivityException();
2324
}
2425

2526
$this->l = $this->languageFactory->get('dav', $language);
@@ -55,7 +56,7 @@ public function parse($language, IEvent $event, ?IEvent $previousEvent = null) {
5556
} elseif ($event->getSubject() === self::SUBJECT_OBJECT_MOVE . '_todo_self') {
5657
$subject = $this->l->t('You moved to-do {todo} from list {sourceCalendar} to list {targetCalendar}');
5758
} else {
58-
throw new \InvalidArgumentException();
59+
throw new UnknownActivityException();
5960
}
6061

6162
$parsedParameters = $this->getParameters($event);

‎apps/dav/lib/CardDAV/Activity/Provider/Addressbook.php‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
*/
99
namespace OCA\DAV\CardDAV\Activity\Provider;
1010

11+
use OCP\Activity\Exceptions\UnknownActivityException;
1112
use OCP\Activity\IEvent;
1213
use OCP\Activity\IEventMerger;
1314
use OCP\Activity\IManager;
@@ -52,11 +53,11 @@ public function __construct(IFactory $languageFactory,
5253
* @param IEvent $event
5354
* @param IEvent|null $previousEvent
5455
* @return IEvent
55-
* @throws \InvalidArgumentException
56+
* @throws UnknownActivityException
5657
*/
5758
public function parse($language, IEvent $event, ?IEvent $previousEvent = null): IEvent {
5859
if ($event->getApp() !== 'dav' || $event->getType() !== 'contacts') {
59-
throw new \InvalidArgumentException();
60+
throw new UnknownActivityException();
6061
}
6162

6263
$l = $this->languageFactory->get('dav', $language);
@@ -102,7 +103,7 @@ public function parse($language, IEvent $event, ?IEvent $previousEvent = null):
102103
} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_GROUP . '_by') {
103104
$subject = $l->t('{actor} unshared address book {addressbook} from group {group}');
104105
} else {
105-
throw new \InvalidArgumentException();
106+
throw new UnknownActivityException();
106107
}
107108

108109
$parsedParameters = $this->getParameters($event, $l);

‎apps/dav/lib/CardDAV/Activity/Provider/Card.php‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
*/
99
namespace OCA\DAV\CardDAV\Activity\Provider;
1010

11+
use OCP\Activity\Exceptions\UnknownActivityException;
1112
use OCP\Activity\IEvent;
1213
use OCP\Activity\IEventMerger;
1314
use OCP\Activity\IManager;
@@ -54,11 +55,11 @@ public function __construct(IFactory $languageFactory,
5455
* @param IEvent $event
5556
* @param IEvent|null $previousEvent
5657
* @return IEvent
57-
* @throws \InvalidArgumentException
58+
* @throws UnknownActivityException
5859
*/
5960
public function parse($language, IEvent $event, ?IEvent $previousEvent = null): IEvent {
6061
if ($event->getApp() !== 'dav' || $event->getType() !== 'contacts') {
61-
throw new \InvalidArgumentException();
62+
throw new UnknownActivityException();
6263
}
6364

6465
$l = $this->languageFactory->get('dav', $language);
@@ -82,7 +83,7 @@ public function parse($language, IEvent $event, ?IEvent $previousEvent = null):
8283
} elseif ($event->getSubject() === self::SUBJECT_UPDATE . '_self') {
8384
$subject = $l->t('You updated contact {card} in address book {addressbook}');
8485
} else {
85-
throw new \InvalidArgumentException();
86+
throw new UnknownActivityException();
8687
}
8788

8889
$parsedParameters = $this->getParameters($event, $l);

‎apps/files/lib/Activity/FavoriteProvider.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
*/
66
namespace OCA\Files\Activity;
77

8+
use OCP\Activity\Exceptions\UnknownActivityException;
89
use OCP\Activity\IEvent;
910
use OCP\Activity\IEventMerger;
1011
use OCP\Activity\IManager;
@@ -50,12 +51,12 @@ public function __construct(IFactory $languageFactory, IURLGenerator $url, IMana
5051
* @param IEvent $event
5152
* @param IEvent|null $previousEvent
5253
* @return IEvent
53-
* @throws \InvalidArgumentException
54+
* @throws UnknownActivityException
5455
* @since 11.0.0
5556
*/
5657
public function parse($language, IEvent $event, ?IEvent $previousEvent = null) {
5758
if ($event->getApp() !== 'files' || $event->getType() !== 'favorite') {
58-
throw new \InvalidArgumentException();
59+
throw new UnknownActivityException();
5960
}
6061

6162
$this->l = $this->languageFactory->get('files', $language);

‎apps/files/lib/Activity/Provider.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
*/
66
namespace OCA\Files\Activity;
77

8+
use OCP\Activity\Exceptions\UnknownActivityException;
89
use OCP\Activity\IEvent;
910
use OCP\Activity\IEventMerger;
1011
use OCP\Activity\IManager;
@@ -79,12 +80,12 @@ public function __construct(IFactory $languageFactory,
7980
* @param IEvent $event
8081
* @param IEvent|null $previousEvent
8182
* @return IEvent
82-
* @throws \InvalidArgumentException
83+
* @throws UnknownActivityException
8384
* @since 11.0.0
8485
*/
8586
public function parse($language, IEvent $event, ?IEvent $previousEvent = null) {
8687
if ($event->getApp() !== 'files') {
87-
throw new \InvalidArgumentException();
88+
throw new UnknownActivityException();
8889
}
8990

9091
$this->l = $this->languageFactory->get('files', $language);

‎apps/files_sharing/lib/Activity/Providers/Base.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
*/
66
namespace OCA\Files_Sharing\Activity\Providers;
77

8+
use OCP\Activity\Exceptions\UnknownActivityException;
89
use OCP\Activity\IEvent;
910
use OCP\Activity\IEventMerger;
1011
use OCP\Activity\IManager;
@@ -65,12 +66,12 @@ public function __construct(IFactory $languageFactory,
6566
* @param IEvent $event
6667
* @param IEvent|null $previousEvent
6768
* @return IEvent
68-
* @throws \InvalidArgumentException
69+
* @throws UnknownActivityException
6970
* @since 11.0.0
7071
*/
7172
public function parse($language, IEvent $event, ?IEvent $previousEvent = null) {
7273
if ($event->getApp() !== 'files_sharing') {
73-
throw new \InvalidArgumentException();
74+
throw new UnknownActivityException();
7475
}
7576

7677
$this->l = $this->languageFactory->get('files_sharing', $language);

‎apps/settings/lib/Activity/GroupProvider.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66
namespace OCA\Settings\Activity;
77

8-
use InvalidArgumentException;
8+
use OCP\Activity\Exceptions\UnknownActivityException;
99
use OCP\Activity\IEvent;
1010
use OCP\Activity\IManager;
1111
use OCP\Activity\IProvider;
@@ -48,7 +48,7 @@ public function __construct(L10nFactory $l10n,
4848

4949
public function parse($language, IEvent $event, ?IEvent $previousEvent = null) {
5050
if ($event->getType() !== 'group_settings') {
51-
throw new InvalidArgumentException();
51+
throw new UnknownActivityException();
5252
}
5353

5454
$l = $this->l10n->get('settings', $language);
@@ -95,7 +95,7 @@ public function parse($language, IEvent $event, ?IEvent $previousEvent = null) {
9595
}
9696
break;
9797
default:
98-
throw new InvalidArgumentException();
98+
throw new UnknownActivityException();
9999
}
100100

101101
$this->setSubjects($event, $subject, $parsedParameters);

0 commit comments

Comments
 (0)