bug #59610 [Mailer] Ensure TransportExceptionInterface populates stream debug data (bytestream)

fabpot · fabpot · commit 2f6927033014 · 2025-01-25T10:41:26.000+01:00
This PR was merged into the 6.4 branch. Discussion ---------- [Mailer] Ensure TransportExceptionInterface populates stream debug data | Q | A | ------------- | --- | Branch? | 6.4  | Bug fix? | yes | New feature? | no  | Deprecations? | no  | Issues |  | License | MIT There is a discrepancy when `TransportExceptionInterface` is thrown. Sometimes `$e->getDebug()` is `''` and other times it contains information. Similarly, `$transport->getStream()->getDebug();` sometimes returns `''` because something else has already beaten you to the call... https://github.com/symfony/symfony/blob/05d5bb3b6a887c55b65d1247472d23e5dcbaa4f3/src/Symfony/Component/Mailer/Transport/Smtp/Stream/AbstractStream.php#L103 This results in you having to do something like the following to get the debug log... ``` } catch (TransportExceptionInterface $e) { $log = $e->getDebug() ?: $transport->getStream()->getDebug(); ``` This PR ensures that any `TransportExceptionInterface` thrown by `send()` sets the debug information. The notable case where this occurs is in `handleAuth` which is part of `start` (`doHeloCommand`).  Commits ------- 32a7d14 Ensure TransportExceptionInterface populates stream debug data
diff --git a/src/Symfony/Component/Mailer/Transport/Smtp/SmtpTransport.php b/src/Symfony/Component/Mailer/Transport/Smtp/SmtpTransport.php
@@ -205,11 +205,11 @@ protected function doSend(SentMessage $message): void
             $this->ping();
         }
 
-        if (!$this->started) {
-            $this->start();
-        }
-
         try {
+            if (!$this->started) {
+                $this->start();
+            }
+
             $envelope = $message->getEnvelope();
             $this->doMailFromCommand($envelope->getSender()->getEncodedAddress());
             foreach ($envelope->getRecipients() as $recipient) {
