wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Handle InvalidArgumentException more gracefully

Browse source
This commit is contained in:
Joas Schilling 2015-09-01 10:24:21 +02:00
parent f16c5a38a8
commit 0bcae89d14
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lib/private/notification/manager.php
View file

@ -122,7 +122,10 @@ class Manager implements IManager {
$apps = $this->getApps();
foreach ($apps as $app) {
$app->notify($notification);
try {
$app->notify($notification);
} catch (\InvalidArgumentException $e) {
}
}
}
@ -139,11 +142,13 @@ class Manager implements IManager {
foreach ($notifiers as $notifier) {
try {
$notifier->prepare($notification, $languageCode);
} catch (\InvalidArgumentException $e) {}
}
} catch (\InvalidArgumentException $e) {
continue;
}
if (!$notification->isValidParsed()) {
throw new \InvalidArgumentException('The given notification has not been handled');
if (!$notification->isValidParsed()) {
throw new \InvalidArgumentException('The given notification has not been handled');
}
}
return $notification;