Merge branch '3.4' into 4.4

nicolas-grekas · nicolas-grekas · commit a077f043600c · 2020-05-30T22:06:45.000+02:00
* 3.4:
  Various cleanups
diff --git a/Transport/MailgunApiTransport.php b/Transport/MailgunApiTransport.php
@@ -65,10 +65,10 @@ protected function doSendApi(SentMessage $sentMessage, Email $email, Envelope $e
         $result = $response->toArray(false);
         if (200 !== $response->getStatusCode()) {
             if ('application/json' === $response->getHeaders(false)['content-type'][0]) {
-                throw new HttpTransportException(sprintf('Unable to send an email: '.$result['message'].' (code %d).', $response->getStatusCode()), $response);
+                throw new HttpTransportException('Unable to send an email: '.$result['message'].sprintf(' (code %d).', $response->getStatusCode()), $response);
             }
 
-            throw new HttpTransportException(sprintf('Unable to send an email: '.$response->getContent(false).' (code %d).', $response->getStatusCode()), $response);
+            throw new HttpTransportException('Unable to send an email: '.$response->getContent(false).sprintf(' (code %d).', $response->getStatusCode()), $response);
         }
 
         $sentMessage->setMessageId($result['id']);
diff --git a/Transport/MailgunHttpTransport.php b/Transport/MailgunHttpTransport.php
@@ -67,10 +67,10 @@ protected function doSendHttp(SentMessage $message): ResponseInterface
         $result = $response->toArray(false);
         if (200 !== $response->getStatusCode()) {
             if ('application/json' === $response->getHeaders(false)['content-type'][0]) {
-                throw new HttpTransportException(sprintf('Unable to send an email: '.$result['message'].' (code %d).', $response->getStatusCode()), $response);
+                throw new HttpTransportException('Unable to send an email: '.$result['message'].sprintf(' (code %d).', $response->getStatusCode()), $response);
             }
 
-            throw new HttpTransportException(sprintf('Unable to send an email: '.$response->getContent(false).' (code %d).', $response->getStatusCode()), $response);
+            throw new HttpTransportException('Unable to send an email: '.$response->getContent(false).sprintf(' (code %d).', $response->getStatusCode()), $response);
         }
 
         $message->setMessageId($result['id']);

Original file line number	Diff line number	Diff line change
`@@ -65,10 +65,10 @@ protected function doSendApi(SentMessage $sentMessage, Email $email, Envelope $e`
`65`	`65`	`$result = $response->toArray(false);`
`66`	`66`	`if (200 !== $response->getStatusCode()) {`
`67`	`67`	`if ('application/json' === $response->getHeaders(false)['content-type'][0]) {`
`68`		`- throw new HttpTransportException(sprintf('Unable to send an email: '.$result['message'].' (code %d).', $response->getStatusCode()), $response);`
	`68`	`+ throw new HttpTransportException('Unable to send an email: '.$result['message'].sprintf(' (code %d).', $response->getStatusCode()), $response);`
`69`	`69`	`}`
`70`	`70`
`71`		`- throw new HttpTransportException(sprintf('Unable to send an email: '.$response->getContent(false).' (code %d).', $response->getStatusCode()), $response);`
	`71`	`+ throw new HttpTransportException('Unable to send an email: '.$response->getContent(false).sprintf(' (code %d).', $response->getStatusCode()), $response);`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`$sentMessage->setMessageId($result['id']);`
Original file line number	Diff line number	Diff line change
`@@ -67,10 +67,10 @@ protected function doSendHttp(SentMessage $message): ResponseInterface`
`67`	`67`	`$result = $response->toArray(false);`
`68`	`68`	`if (200 !== $response->getStatusCode()) {`
`69`	`69`	`if ('application/json' === $response->getHeaders(false)['content-type'][0]) {`
`70`		`- throw new HttpTransportException(sprintf('Unable to send an email: '.$result['message'].' (code %d).', $response->getStatusCode()), $response);`
	`70`	`+ throw new HttpTransportException('Unable to send an email: '.$result['message'].sprintf(' (code %d).', $response->getStatusCode()), $response);`
`71`	`71`	`}`
`72`	`72`
`73`		`- throw new HttpTransportException(sprintf('Unable to send an email: '.$response->getContent(false).' (code %d).', $response->getStatusCode()), $response);`
	`73`	`+ throw new HttpTransportException('Unable to send an email: '.$response->getContent(false).sprintf(' (code %d).', $response->getStatusCode()), $response);`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`$message->setMessageId($result['id']);`