[Mailgun Mailer] fixed issue when using html body

alOneh · alOneh · commit 4f766ba2225b · 2019-06-21T13:59:56.000+02:00
diff --git a/src/Symfony/Component/Mailer/Bridge/Mailgun/Http/Api/MailgunTransport.php b/src/Symfony/Component/Mailer/Bridge/Mailgun/Http/Api/MailgunTransport.php
@@ -68,7 +68,7 @@ private function getPayload(Email $email, SmtpEnvelope $envelope): array
     {
         $headers = $email->getHeaders();
         $html = $email->getHtmlBody();
-        if (null !== $html) {
+        if (null !== $html && \is_resource($html)) {
             if (stream_get_meta_data($html)['seekable'] ?? false) {
                 rewind($html);
             }
diff --git a/src/Symfony/Component/Mailer/Tests/TransportTest.php b/src/Symfony/Component/Mailer/Tests/TransportTest.php
@@ -168,6 +168,19 @@ public function testFromDsnMailgun()
         $transport = Transport::fromDsn('api://'.urlencode('u$er').':'.urlencode('pa$s').'@mailgun?region=us', $dispatcher, $client, $logger);
         $transport->send($message);
 
+        $message = (new Email())->from('me@me.com')->to('you@you.com')->subject('hello')->html('test');
+        $client = $this->createMock(HttpClientInterface::class);
+        $client->expects($this->once())->method('request')->with('POST', 'https://api.mailgun.net/v3/pa%24s/messages')->willReturn($response);
+        $transport = Transport::fromDsn('api://'.urlencode('u$er').':'.urlencode('pa$s').'@mailgun?region=us', $dispatcher, $client, $logger);
+        $transport->send($message);
+
+        $stream = fopen('data://text/plain,'.$message->getTextBody(), 'r');
+        $message->html($stream);
+        $client = $this->createMock(HttpClientInterface::class);
+        $client->expects($this->once())->method('request')->with('POST', 'https://api.mailgun.net/v3/pa%24s/messages')->willReturn($response);
+        $transport = Transport::fromDsn('api://'.urlencode('u$er').':'.urlencode('pa$s').'@mailgun?region=us', $dispatcher, $client, $logger);
+        $transport->send($message);
+
         $this->expectException(LogicException::class);
         Transport::fromDsn('foo://mailgun');
     }

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ private function getPayload(Email $email, SmtpEnvelope $envelope): array`
`68`	`68`	`{`
`69`	`69`	`$headers = $email->getHeaders();`
`70`	`70`	`$html = $email->getHtmlBody();`
`71`		`- if (null !== $html) {`
	`71`	`+ if (null !== $html && \is_resource($html)) {`
`72`	`72`	`if (stream_get_meta_data($html)['seekable'] ?? false) {`
`73`	`73`	`rewind($html);`
`74`	`74`	`}`