[Mailer] added debug info to TransportExceptionInterface

fabpot · fabpot · commit 39ebb846020c · 2019-08-03T10:39:50.000+02:00
diff --git a/src/Symfony/Component/Mailer/Exception/TransportException.php b/src/Symfony/Component/Mailer/Exception/TransportException.php
@@ -16,4 +16,15 @@
  */
 class TransportException extends RuntimeException implements TransportExceptionInterface
 {
+    private $debug = '';
+
+    public function getDebug(): string
+    {
+        return $this->debug;
+    }
+
+    public function appendDebug(string $debug): void
+    {
+        $this->debug .= $debug;
+    }
 }
diff --git a/src/Symfony/Component/Mailer/Exception/TransportExceptionInterface.php b/src/Symfony/Component/Mailer/Exception/TransportExceptionInterface.php
@@ -16,4 +16,7 @@
  */
 interface TransportExceptionInterface extends ExceptionInterface
 {
+    public function getDebug(): string;
+
+    public function appendDebug(string $debug): void;
 }
diff --git a/src/Symfony/Component/Mailer/Transport/Smtp/SmtpTransport.php b/src/Symfony/Component/Mailer/Transport/Smtp/SmtpTransport.php
@@ -157,8 +157,11 @@ protected function doSend(SentMessage $message): void
             }
             $this->stream->flush();
             $this->executeCommand("\r\n.\r\n", [250]);
-        } finally {
             $message->appendDebug($this->stream->getDebug());
+        } catch (TransportExceptionInterface $e) {
+            $e->appendDebug($this->stream->getDebug());
+
+            throw $e;
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -16,4 +16,7 @@`
`16`	`16`	`*/`
`17`	`17`	`interface TransportExceptionInterface extends ExceptionInterface`
`18`	`18`	`{`
	`19`	`+ public function getDebug(): string;`
	`20`	`+`
	`21`	`+ public function appendDebug(string $debug): void;`
`19`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -157,8 +157,11 @@ protected function doSend(SentMessage $message): void`
`157`	`157`	`}`
`158`	`158`	`$this->stream->flush();`
`159`	`159`	`$this->executeCommand("\r\n.\r\n", [250]);`
`160`		`- } finally {`
`161`	`160`	`$message->appendDebug($this->stream->getDebug());`
	`161`	`+ } catch (TransportExceptionInterface $e) {`
	`162`	`+ $e->appendDebug($this->stream->getDebug());`
	`163`	`+`
	`164`	`+ throw $e;`
`162`	`165`	`}`
`163`	`166`	`}`
`164`	`167`