Fixed error messages in NotificationEventSubscriber

tg666 · tg666 · commit 0918085d02b4 · 2022-04-30T17:28:34.000+02:00
diff --git a/src/EventSubscriber/NotificationEventSubscriber.php b/src/EventSubscriber/NotificationEventSubscriber.php
@@ -256,8 +256,11 @@ private function createErrorNotificationBuilder(string $messageBase, ExceptionIn
 	{
 		$notifier = $this->getNotifier();
 
-		if ($e instanceof TranslatableException) {
-			return $notifier->error($messageBase . '.' . $e->getMessage(), $e->getArgs());
+		if ($e instanceof TranslatableException || $e->getPrevious() instanceof TranslatableException) {
+			$translatableException = $e instanceof TranslatableException ? $e : $e->getPrevious();
+			assert($translatableException instanceof TranslatableException);
+
+			return $notifier->error($messageBase . '.' . $translatableException->getMessage(), $translatableException->getArgs());
 		}
 
 		return $notifier->error($messageBase . '.default', [

Original file line number	Diff line number	Diff line change
`@@ -256,8 +256,11 @@ private function createErrorNotificationBuilder(string $messageBase, ExceptionIn`
`256`	`256`	`{`
`257`	`257`	`$notifier = $this->getNotifier();`
`258`	`258`
`259`		`- if ($e instanceof TranslatableException) {`
`260`		`- return $notifier->error($messageBase . '.' . $e->getMessage(), $e->getArgs());`
	`259`	`+ if ($e instanceof TranslatableException \|\| $e->getPrevious() instanceof TranslatableException) {`
	`260`	`+ $translatableException = $e instanceof TranslatableException ? $e : $e->getPrevious();`
	`261`	`+ assert($translatableException instanceof TranslatableException);`
	`262`	`+`
	`263`	`+ return $notifier->error($messageBase . '.' . $translatableException->getMessage(), $translatableException->getArgs());`
`261`	`264`	`}`
`262`	`265`
`263`	`266`	`return $notifier->error($messageBase . '.default', [`