[12.x] Pass TransportException without Response to NotificationFailed event (#56061)

Prevents including the CurlResponse object that cannot be serialized with
the NotificationFailed event.

Author: hackel

src/Illuminate/Notifications/NotificationSender.php

@@ -12,6 +12,8 @@
 use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
 use Illuminate\Support\Traits\Localizable;
+use Symfony\Component\Mailer\Exception\HttpTransportException;
+use Symfony\Component\Mailer\Exception\TransportException;
 use Throwable;
 
 class NotificationSender
@@ -159,6 +161,10 @@ protected function sendToNotifiable($notifiable, $id, $notification, $channel)
             $response = $this->manager->driver($channel)->send($notifiable, $notification);
         } catch (Throwable $exception) {
             if (! $this->failedEventWasDispatched) {
+                if ($exception instanceof HttpTransportException) {
+                    $exception = new TransportException($exception->getMessage(), $exception->getCode());
+                }
+
                 $this->events->dispatch(
                     new NotificationFailed($notifiable, $notification, $channel, ['exception' => $exception])
                 );

tests/Notifications/NotificationSenderTest.php

@@ -8,11 +8,16 @@
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\AnonymousNotifiable;
 use Illuminate\Notifications\ChannelManager;
+use Illuminate\Notifications\Events\NotificationFailed;
+use Illuminate\Notifications\Events\NotificationSending;
 use Illuminate\Notifications\Notifiable;
 use Illuminate\Notifications\Notification;
 use Illuminate\Notifications\NotificationSender;
 use Mockery as m;
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Mailer\Exception\HttpTransportException;
+use Symfony\Component\Mailer\Exception\TransportException;
+use Symfony\Contracts\HttpClient\ResponseInterface;
 
 class NotificationSenderTest extends TestCase
 {
@@ -138,6 +143,29 @@ public function testItCanSendQueuedWithViaConnectionsNotifications()
 
         $sender->send($notifiable, new DummyNotificationWithViaConnections);
     }
+
+    public function testNotificationFailedSentWithoutHttpTransportException()
+    {
+        $this->expectException(TransportException::class);
+
+        $notifiable = new AnonymousNotifiable();
+        $manager = m::mock(ChannelManager::class);
+        $manager->shouldReceive('driver')->andReturn($driver = m::mock());
+        $response = m::mock(ResponseInterface::class);
+        $driver->shouldReceive('send')->andThrow(new HttpTransportException('Transport error', $response));
+        $bus = m::mock(BusDispatcher::class);
+
+        $events = m::mock(EventDispatcher::class);
+        $events->shouldReceive('listen')->once();
+        $events->shouldReceive('until')->with(m::type(NotificationSending::class))->andReturn(true);
+        $events->shouldReceive('dispatch')->once()->withArgs(function ($event) {
+            return $event instanceof NotificationFailed && $event->data['exception'] instanceof TransportException;
+        });
+
+        $sender = new NotificationSender($manager, $bus, $events);
+
+        $sender->sendNow($notifiable, new DummyNotificationWithViaConnections(), ['mail']);
+    }
 }
 
 class DummyQueuedNotificationWithStringVia extends Notification implements ShouldQueue