[Mailer] fixed Mailgun support when a response is not JSON as expected

fabpot · fabpot · commit e1959fbc3897 · 2019-09-02T17:20:17.000+02:00
diff --git a/Mailgun/Http/Api/MailgunTransport.php b/Mailgun/Http/Api/MailgunTransport.php
@@ -58,9 +58,11 @@ protected function doSendEmail(Email $email, SmtpEnvelope $envelope): void
         ]);
 
         if (200 !== $response->getStatusCode()) {
-            $error = $response->toArray(false);
+            if ('application/json' === $response->getHeaders(false)['content-type'][0]) {
+                throw new TransportException(sprintf('Unable to send an email: %s (code %s).', $response->toArray(false)['message'], $response->getStatusCode()));
+            }
 
-            throw new TransportException(sprintf('Unable to send an email: %s (code %s).', $error['message'], $response->getStatusCode()));
+            throw new TransportException(sprintf('Unable to send an email: %s (code %s).', $response->getContent(false), $response->getStatusCode()));
         }
     }
 
diff --git a/Mailgun/Http/MailgunTransport.php b/Mailgun/Http/MailgunTransport.php
@@ -59,9 +59,11 @@ protected function doSend(SentMessage $message): void
         ]);
 
         if (200 !== $response->getStatusCode()) {
-            $error = $response->toArray(false);
+            if ('application/json' === $response->getHeaders(false)['content-type'][0]) {
+                throw new TransportException(sprintf('Unable to send an email: %s (code %s).', $response->toArray(false)['message'], $response->getStatusCode()));
+            }
 
-            throw new TransportException(sprintf('Unable to send an email: %s (code %s).', $error['message'], $response->getStatusCode()));
+            throw new TransportException(sprintf('Unable to send an email: %s (code %s).', $response->getContent(false), $response->getStatusCode()));
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -58,9 +58,11 @@ protected function doSendEmail(Email $email, SmtpEnvelope $envelope): void`
`58`	`58`	`]);`
`59`	`59`
`60`	`60`	`if (200 !== $response->getStatusCode()) {`
`61`		`- $error = $response->toArray(false);`
	`61`	`+ if ('application/json' === $response->getHeaders(false)['content-type'][0]) {`
	`62`	`+ throw new TransportException(sprintf('Unable to send an email: %s (code %s).', $response->toArray(false)['message'], $response->getStatusCode()));`
	`63`	`+ }`
`62`	`64`
`63`		`- throw new TransportException(sprintf('Unable to send an email: %s (code %s).', $error['message'], $response->getStatusCode()));`
	`65`	`+ throw new TransportException(sprintf('Unable to send an email: %s (code %s).', $response->getContent(false), $response->getStatusCode()));`
`64`	`66`	`}`
`65`	`67`	`}`
`66`	`68`
Original file line number	Diff line number	Diff line change
`@@ -59,9 +59,11 @@ protected function doSend(SentMessage $message): void`
`59`	`59`	`]);`
`60`	`60`
`61`	`61`	`if (200 !== $response->getStatusCode()) {`
`62`		`- $error = $response->toArray(false);`
	`62`	`+ if ('application/json' === $response->getHeaders(false)['content-type'][0]) {`
	`63`	`+ throw new TransportException(sprintf('Unable to send an email: %s (code %s).', $response->toArray(false)['message'], $response->getStatusCode()));`
	`64`	`+ }`
`63`	`65`
`64`		`- throw new TransportException(sprintf('Unable to send an email: %s (code %s).', $error['message'], $response->getStatusCode()));`
	`66`	`+ throw new TransportException(sprintf('Unable to send an email: %s (code %s).', $response->getContent(false), $response->getStatusCode()));`
`65`	`67`	`}`
`66`	`68`	`}`
`67`	`69`	`}`