bug #32908 [Mailer] Add debug info on HTTP transport exceptions (fabpot)

fabpot · fabpot · commit f1801a4f8d98 · 2019-08-03T17:48:11.000+02:00
This PR was merged into the 4.4 branch. Discussion ---------- [Mailer] Add debug info on HTTP transport exceptions | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no  | BC breaks? | no  | Deprecations? | no  | Tests pass? | yes  | Fixed tickets | n/a | License | MIT | Doc PR | n/a Same as #32896 but for HTTP transports. Commits ------- 4cfb4b9 [Mailer] added debug info on HTTP transport exceptions
diff --git a/src/Symfony/Component/Mailer/Transport/AbstractHttpTransport.php b/src/Symfony/Component/Mailer/Transport/AbstractHttpTransport.php
@@ -47,14 +47,11 @@ protected function doSend(SentMessage $message): void
         $response = null;
         try {
             $response = $this->doSendHttp($message);
+            $message->appendDebug($response->getInfo('debug'));
         } catch (HttpTransportException $e) {
-            $response = $e->getResponse();
+            $e->appendDebug($e->getResponse()->getInfo('debug'));
 
             throw $e;
-        } finally {
-            if (null !== $response) {
-                $message->appendDebug($response->getInfo('debug'));
-            }
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -47,14 +47,11 @@ protected function doSend(SentMessage $message): void`
`47`	`47`	`$response = null;`
`48`	`48`	`try {`
`49`	`49`	`$response = $this->doSendHttp($message);`
	`50`	`+ $message->appendDebug($response->getInfo('debug'));`
`50`	`51`	`} catch (HttpTransportException $e) {`
`51`		`- $response = $e->getResponse();`
	`52`	`+ $e->appendDebug($e->getResponse()->getInfo('debug'));`
`52`	`53`
`53`	`54`	`throw $e;`
`54`		`- } finally {`
`55`		`- if (null !== $response) {`
`56`		`- $message->appendDebug($response->getInfo('debug'));`
`57`		`- }`
`58`	`55`	`}`
`59`	`56`	`}`
`60`	`57`	`}`