feature #32896 [Mailer] added debug info to TransportExceptionInterface (fabpot)

fabpot · fabpot · commit eefcb33d80cb · 2019-08-03T11:01:05.000+02:00
This PR was merged into the 4.4 branch. Discussion ---------- [Mailer] added debug info to TransportExceptionInterface | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | no | New feature? | yes | BC breaks? | no  | Deprecations? | no  | Tests pass? | yes  | Fixed tickets | n/a | License | MIT | Doc PR | ~ In 4.4, you can get the debug information for the SMTP/HTTP data via `$message->getDebug()` (see #32583). But the data are probably even more important when there is an exception. That's what I implemented in this PR. Commits ------- 39ebb84 [Mailer] added debug info to TransportExceptionInterface
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
@@ -161,8 +161,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
`@@ -161,8 +161,11 @@ protected function doSend(SentMessage $message): void`
`161`	`161`	`}`
`162`	`162`	`$this->stream->flush();`
`163`	`163`	`$this->executeCommand("\r\n.\r\n", [250]);`
`164`		`- } finally {`
`165`	`164`	`$message->appendDebug($this->stream->getDebug());`
	`165`	`+ } catch (TransportExceptionInterface $e) {`
	`166`	`+ $e->appendDebug($this->stream->getDebug());`
	`167`	`+`
	`168`	`+ throw $e;`
`166`	`169`	`}`
`167`	`170`	`}`
`168`	`171`