aboutsummaryrefslogtreecommitdiffstats
path: root/apps/settings
diff options
context:
space:
mode:
authorJoas Schilling <coding@schilljs.com>2024-09-18 16:16:58 +0200
committerJoas Schilling <coding@schilljs.com>2024-09-23 12:31:59 +0200
commit096f893d46c0b8d226ca086d4086efed18f66230 (patch)
tree9efda514533c3e08ccfc9bca220938ab76c04e0f /apps/settings
parent0dc23639cad1373052fdaea5ca1d1d3c092a959c (diff)
downloadnextcloud-server-096f893d46c0b8d226ca086d4086efed18f66230.tar.gz
nextcloud-server-096f893d46c0b8d226ca086d4086efed18f66230.zip
fix(activity): Update more activity providers to use new exceptionsfollowup/48086/fix-more-activity-providers
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'apps/settings')
-rw-r--r--apps/settings/lib/Activity/GroupProvider.php3
-rw-r--r--apps/settings/lib/Activity/Provider.php7
-rw-r--r--apps/settings/tests/Activity/SecurityProviderTest.php6
3 files changed, 5 insertions, 11 deletions
diff --git a/apps/settings/lib/Activity/GroupProvider.php b/apps/settings/lib/Activity/GroupProvider.php
index fc7189c774d..abf3e5613c0 100644
--- a/apps/settings/lib/Activity/GroupProvider.php
+++ b/apps/settings/lib/Activity/GroupProvider.php
@@ -103,9 +103,6 @@ class GroupProvider implements IProvider {
return $event;
}
- /**
- * @throws \InvalidArgumentException
- */
protected function setSubjects(IEvent $event, string $subject, array $parameters): void {
$event->setRichSubject($subject, $parameters);
}
diff --git a/apps/settings/lib/Activity/Provider.php b/apps/settings/lib/Activity/Provider.php
index 8d726c8da22..e1de18554d9 100644
--- a/apps/settings/lib/Activity/Provider.php
+++ b/apps/settings/lib/Activity/Provider.php
@@ -118,7 +118,7 @@ class Provider implements IProvider {
/**
* @param IEvent $event
* @return array
- * @throws \InvalidArgumentException
+ * @throws UnknownActivityException
*/
protected function getParameters(IEvent $event): array {
$subject = $event->getSubject();
@@ -162,12 +162,9 @@ class Provider implements IProvider {
];
}
- throw new \InvalidArgumentException('Unknown subject');
+ throw new UnknownActivityException('Unknown subject');
}
- /**
- * @throws \InvalidArgumentException
- */
protected function setSubjects(IEvent $event, string $subject, array $parameters): void {
$event->setRichSubject($subject, $parameters);
}
diff --git a/apps/settings/tests/Activity/SecurityProviderTest.php b/apps/settings/tests/Activity/SecurityProviderTest.php
index b00c62281cc..35526995a67 100644
--- a/apps/settings/tests/Activity/SecurityProviderTest.php
+++ b/apps/settings/tests/Activity/SecurityProviderTest.php
@@ -5,8 +5,8 @@
*/
namespace OCA\Settings\Tests;
-use InvalidArgumentException;
use OCA\Settings\Activity\SecurityProvider;
+use OCP\Activity\Exceptions\UnknownActivityException;
use OCP\Activity\IEvent;
use OCP\Activity\IManager;
use OCP\IL10N;
@@ -45,7 +45,7 @@ class SecurityProviderTest extends TestCase {
$event->expects($this->once())
->method('getType')
->willReturn('comments');
- $this->expectException(InvalidArgumentException::class);
+ $this->expectException(UnknownActivityException::class);
$this->provider->parse($lang, $event);
}
@@ -112,7 +112,7 @@ class SecurityProviderTest extends TestCase {
->method('getSubject')
->willReturn('unrelated');
- $this->expectException(InvalidArgumentException::class);
+ $this->expectException(UnknownActivityException::class);
$this->provider->parse($lang, $event);
}
}