Merge branch '3.4' into 4.4

nicolas-grekas · nicolas-grekas · commit 32571f4f26be · 2020-05-04T17:32:48.000+02:00
* 3.4:
  Fix exception messages containing exception messages
diff --git a/Transport/AbstractApiTransport.php b/Transport/AbstractApiTransport.php
@@ -31,7 +31,7 @@ protected function doSendHttp(SentMessage $message): ResponseInterface
         try {
             $email = MessageConverter::toEmail($message->getOriginalMessage());
         } catch (\Exception $e) {
-            throw new RuntimeException(sprintf('Unable to send message with the "%s" transport: '.$e->getMessage(), __CLASS__), 0, $e);
+            throw new RuntimeException(sprintf('Unable to send message with the "%s" transport: ', __CLASS__).$e->getMessage(), 0, $e);
         }
 
         return $this->doSendApi($message, $email, $message->getEnvelope());

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ protected function doSendHttp(SentMessage $message): ResponseInterface`
`31`	`31`	`try {`
`32`	`32`	`$email = MessageConverter::toEmail($message->getOriginalMessage());`
`33`	`33`	`} catch (\Exception $e) {`
`34`		`- throw new RuntimeException(sprintf('Unable to send message with the "%s" transport: '.$e->getMessage(), __CLASS__), 0, $e);`
	`34`	`+ throw new RuntimeException(sprintf('Unable to send message with the "%s" transport: ', __CLASS__).$e->getMessage(), 0, $e);`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`return $this->doSendApi($message, $email, $message->getEnvelope());`