Skip to content

Commit dde2109

Browse files
committed
fix: use unknownActivityException
Signed-off-by: grnd-alt <git@belakkaf.net>
1 parent c80f76c commit dde2109

2 files changed

Lines changed: 7 additions & 5 deletions

File tree

lib/Activity/DeckProvider.php

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
use OCA\Deck\Db\Acl;
1111
use OCA\Deck\Service\CardService;
1212
use OCA\Deck\Service\CirclesService;
13+
use OCP\Activity\Exceptions\UnknownActivityException;
1314
use OCP\Activity\IEvent;
1415
use OCP\Activity\IProvider;
1516
use OCP\Comments\IComment;
@@ -61,12 +62,12 @@ public function __construct(IURLGenerator $urlGenerator, ActivityManager $activi
6162
* To do so, simply use setChildEvent($previousEvent) after setting the
6263
* combined subject on the current event.
6364
* @return IEvent
64-
* @throws \InvalidArgumentException Should be thrown if your provider does not know this event
65+
* @throws UnknownActivityException Should be thrown if your provider does not know this event
6566
* @since 11.0.0
6667
*/
6768
public function parse($language, IEvent $event, ?IEvent $previousEvent = null): IEvent {
6869
if ($event->getApp() !== 'deck') {
69-
throw new \InvalidArgumentException();
70+
throw new UnknownActivityException();
7071
}
7172

7273
$event = $this->getIcon($event);
@@ -107,7 +108,7 @@ public function parse($language, IEvent $event, ?IEvent $previousEvent = null):
107108
}
108109
if ($event->getObjectType() === ActivityManager::DECK_OBJECT_BOARD) {
109110
if (!$this->activityManager->canSeeBoardActivity($event->getObjectId(), $event->getAffectedUser())) {
110-
throw new \InvalidArgumentException();
111+
throw new UnknownActivityException();
111112
}
112113
if (isset($subjectParams['board']) && $event->getObjectName() === '') {
113114
$event->setObject($event->getObjectType(), $event->getObjectId(), $subjectParams['board']['title']);
@@ -124,7 +125,7 @@ public function parse($language, IEvent $event, ?IEvent $previousEvent = null):
124125

125126
if (isset($subjectParams['card']) && $event->getObjectType() === ActivityManager::DECK_OBJECT_CARD) {
126127
if (!$this->activityManager->canSeeCardActivity($event->getObjectId(), $event->getAffectedUser())) {
127-
throw new \InvalidArgumentException();
128+
throw new UnknownActivityException();
128129
}
129130
if ($event->getObjectName() === '') {
130131
$event->setObject($event->getObjectType(), $event->getObjectId(), $subjectParams['card']['title']);

tests/unit/Activity/DeckProviderTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
use OCA\Deck\Db\Card;
3030
use OCA\Deck\Service\CardService;
3131
use OCA\Deck\Service\CirclesService;
32+
use OCP\Activity\Exceptions\UnknownActivityException;
3233
use OCP\Activity\IEvent;
3334
use OCP\Comments\IComment;
3435
use OCP\Comments\ICommentsManager;
@@ -122,7 +123,7 @@ private function mockEvent($objectType, $objectId, $objectName, $subject, $subje
122123
}
123124

124125
public function testParseFailureApp() {
125-
$this->expectException(\InvalidArgumentException::class);
126+
$this->expectException(UnknownActivityException::class);
126127
$event = $this->createMock(IEvent::class);
127128
$event->expects($this->once())->method('getApp')->willReturn('notdeck');
128129
$this->provider->parse('en_US', $event, $event);

0 commit comments

Comments
 (0)