use getWrappedExceptions method where getNestedExceptions was used

Jeroeny · Jeroeny · commit 3645641ae700 · 2023-09-30T15:18:23.000+02:00
diff --git a/src/Symfony/Bridge/Doctrine/Messenger/DoctrineTransactionMiddleware.php b/src/Symfony/Bridge/Doctrine/Messenger/DoctrineTransactionMiddleware.php
@@ -39,7 +39,7 @@ protected function handleForManager(EntityManagerInterface $entityManager, Envel
             if ($exception instanceof HandlerFailedException) {
                 // Remove all HandledStamp from the envelope so the retry will execute all handlers again.
                 // When a handler fails, the queries of allegedly successful previous handlers just got rolled back.
-                throw new HandlerFailedException($exception->getEnvelope()->withoutAll(HandledStamp::class), $exception->getNestedExceptions());
+                throw new HandlerFailedException($exception->getEnvelope()->withoutAll(HandledStamp::class), $exception->getWrappedExceptions());
             }
 
             throw $exception;
diff --git a/src/Symfony/Component/Mailer/Mailer.php b/src/Symfony/Component/Mailer/Mailer.php
@@ -65,7 +65,7 @@ public function send(RawMessage $message, Envelope $envelope = null): void
         try {
             $this->bus->dispatch(new SendEmailMessage($message, $envelope), $stamps);
         } catch (HandlerFailedException $e) {
-            foreach ($e->getNestedExceptions() as $nested) {
+            foreach ($e->getWrappedExceptions() as $nested) {
                 if ($nested instanceof TransportExceptionInterface) {
                     throw $nested;
                 }
diff --git a/src/Symfony/Component/Messenger/EventListener/SendFailedMessageForRetryListener.php b/src/Symfony/Component/Messenger/EventListener/SendFailedMessageForRetryListener.php
@@ -128,7 +128,7 @@ private function shouldRetry(\Throwable $e, Envelope $envelope, RetryStrategyInt
         // if ALL nested Exceptions are an instance of UnrecoverableExceptionInterface we should not retry
         if ($e instanceof HandlerFailedException) {
             $shouldNotRetry = true;
-            foreach ($e->getNestedExceptions() as $nestedException) {
+            foreach ($e->getWrappedExceptions() as $nestedException) {
                 if ($nestedException instanceof RecoverableExceptionInterface) {
                     return true;
                 }
diff --git a/src/Symfony/Component/Messenger/EventListener/StopWorkerOnCustomStopExceptionListener.php b/src/Symfony/Component/Messenger/EventListener/StopWorkerOnCustomStopExceptionListener.php
@@ -31,7 +31,7 @@ public function onMessageFailed(WorkerMessageFailedEvent $event): void
             $this->stop = true;
         }
         if ($th instanceof HandlerFailedException) {
-            foreach ($th->getNestedExceptions() as $e) {
+            foreach ($th->getWrappedExceptions() as $e) {
                 if ($e instanceof StopWorkerExceptionInterface) {
                     $this->stop = true;
                     break;
diff --git a/src/Symfony/Component/Notifier/EventListener/SendFailedMessageToNotifierListener.php b/src/Symfony/Component/Notifier/EventListener/SendFailedMessageToNotifierListener.php
@@ -42,7 +42,8 @@ public function onMessageFailed(WorkerMessageFailedEvent $event)
 
         $throwable = $event->getThrowable();
         if ($throwable instanceof HandlerFailedException) {
-            $throwable = $throwable->getNestedExceptions()[0];
+            $exceptions = $throwable->getWrappedExceptions();
+            $throwable = $exceptions[array_key_first($exceptions)];
         }
         $envelope = $event->getEnvelope();
         $notification = Notification::fromThrowable($throwable)->importance(Notification::IMPORTANCE_HIGH);

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ protected function handleForManager(EntityManagerInterface $entityManager, Envel`
`39`	`39`	`if ($exception instanceof HandlerFailedException) {`
`40`	`40`	`// Remove all HandledStamp from the envelope so the retry will execute all handlers again.`
`41`	`41`	`// When a handler fails, the queries of allegedly successful previous handlers just got rolled back.`
`42`		`- throw new HandlerFailedException($exception->getEnvelope()->withoutAll(HandledStamp::class), $exception->getNestedExceptions());`
	`42`	`+ throw new HandlerFailedException($exception->getEnvelope()->withoutAll(HandledStamp::class), $exception->getWrappedExceptions());`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`throw $exception;`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public function send(RawMessage $message, Envelope $envelope = null): void`
`65`	`65`	`try {`
`66`	`66`	`$this->bus->dispatch(new SendEmailMessage($message, $envelope), $stamps);`
`67`	`67`	`} catch (HandlerFailedException $e) {`
`68`		`- foreach ($e->getNestedExceptions() as $nested) {`
	`68`	`+ foreach ($e->getWrappedExceptions() as $nested) {`
`69`	`69`	`if ($nested instanceof TransportExceptionInterface) {`
`70`	`70`	`throw $nested;`
`71`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ private function shouldRetry(\Throwable $e, Envelope $envelope, RetryStrategyInt`
`128`	`128`	`// if ALL nested Exceptions are an instance of UnrecoverableExceptionInterface we should not retry`
`129`	`129`	`if ($e instanceof HandlerFailedException) {`
`130`	`130`	`$shouldNotRetry = true;`
`131`		`- foreach ($e->getNestedExceptions() as $nestedException) {`
	`131`	`+ foreach ($e->getWrappedExceptions() as $nestedException) {`
`132`	`132`	`if ($nestedException instanceof RecoverableExceptionInterface) {`
`133`	`133`	`return true;`
`134`	`134`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public function onMessageFailed(WorkerMessageFailedEvent $event): void`
`31`	`31`	`$this->stop = true;`
`32`	`32`	`}`
`33`	`33`	`if ($th instanceof HandlerFailedException) {`
`34`		`- foreach ($th->getNestedExceptions() as $e) {`
	`34`	`+ foreach ($th->getWrappedExceptions() as $e) {`
`35`	`35`	`if ($e instanceof StopWorkerExceptionInterface) {`
`36`	`36`	`$this->stop = true;`
`37`	`37`	`break;`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,8 @@ public function onMessageFailed(WorkerMessageFailedEvent $event)`
`42`	`42`
`43`	`43`	`$throwable = $event->getThrowable();`
`44`	`44`	`if ($throwable instanceof HandlerFailedException) {`
`45`		`- $throwable = $throwable->getNestedExceptions()[0];`
	`45`	`+ $exceptions = $throwable->getWrappedExceptions();`
	`46`	`+ $throwable = $exceptions[array_key_first($exceptions)];`
`46`	`47`	`}`
`47`	`48`	`$envelope = $event->getEnvelope();`
`48`	`49`	`$notification = Notification::fromThrowable($throwable)->importance(Notification::IMPORTANCE_HIGH);`