[9.x] Bug fix: Use correct parameters to send email through SES via S…

…esV2Client (#37881) * use correct parameters for sending raw email via SES v2 * remove FromEmailAddress parameter
laravel · Jul 2, 2021 · 8a1a7b5 · 8a1a7b5
1 parent fb33213
commit 8a1a7b5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/Illuminate/Mail/Transport/SesTransport.php b/src/Illuminate/Mail/Transport/SesTransport.php
@@ -44,9 +44,8 @@ public function send(Swift_Mime_SimpleMessage $message, &$failedRecipients = nul
         $result = $this->ses->sendEmail(
             array_merge(
                 $this->options, [
-                    'FromEmailAddress' => key($message->getSender() ?: $message->getFrom()),
-                    'RawMessage' => [
-                        'Data' => $message->toString(),
+                    'Content' => [
+                        'Raw' => ['Data' => $message->toString()],
                     ],
                 ]
             )

diff --git a/tests/Mail/MailSesTransportTest.php b/tests/Mail/MailSesTransportTest.php
@@ -59,8 +59,9 @@ public function testSend()
         $client->expects($this->once())
             ->method('sendEmail')
             ->with($this->equalTo([
-                'FromEmailAddress' => 'myself@example.com',
-                'RawMessage' => ['Data' => (string) $message],
+                'Content' => [
+                    'Raw' => ['Data' => (string) $message],
+                ],
             ]))
             ->willReturn($sendRawEmailMock);