[Mailer] Revert changes for Mailgun HTTP transport type with custom "h:sender" header

Romanavr · Romanavr · commit 0035d17e992a · 2023-10-12T16:09:31.000+03:00
diff --git a/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Transport/MailgunHttpTransportTest.php b/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Transport/MailgunHttpTransportTest.php
@@ -69,8 +69,6 @@ public function testSend()
             $this->assertStringContainsString('Subject: Hello!', $content);
             $this->assertStringContainsString('To: Saif Eddin <saif.gmati@symfony.com>', $content);
             $this->assertStringContainsString('From: Fabien <fabpot@symfony.com>', $content);
-            $this->assertStringContainsString('Sender: Senior Fabien Eddin <fabpot@symfony.com>', $content);
-            $this->assertStringContainsString('h:sender: "Senior Fabien Eddin" <fabpot@symfony.com>', $content);
             $this->assertStringContainsString('Hello There!', $content);
 
             return new MockResponse(json_encode(['id' => 'foobar']), [
@@ -81,17 +79,11 @@ public function testSend()
         $transport->setPort(8984);
 
         $mail = new Email();
-        $toAddress = new Address('saif.gmati@symfony.com', 'Saif Eddin');
-        $fromAddress = new Address('fabpot@symfony.com', 'Fabien');
-        $senderAddress = new Address('fabpot@symfony.com', 'Senior Fabien Eddin');
         $mail->subject('Hello!')
-            ->to($toAddress)
-            ->from($fromAddress)
-            ->sender($senderAddress)
+            ->to(new Address('saif.gmati@symfony.com', 'Saif Eddin'))
+            ->from(new Address('fabpot@symfony.com', 'Fabien'))
             ->text('Hello There!');
 
-        $mail->getHeaders()->addHeader('h:sender', $mail->getSender()->toString());
-
         $message = $transport->send($mail);
 
         $this->assertSame('foobar', $message->getMessageId());
diff --git a/src/Symfony/Component/Mailer/Bridge/Mailgun/Transport/MailgunHttpTransport.php b/src/Symfony/Component/Mailer/Bridge/Mailgun/Transport/MailgunHttpTransport.php
@@ -53,7 +53,6 @@ public function __toString(): string
     protected function doSendHttp(SentMessage $message): ResponseInterface
     {
         $body = new FormDataPart([
-            'h:sender' => $message->getEnvelope()->getSender()->toString(),
             'to' => implode(',', $this->stringifyAddresses($message->getEnvelope()->getRecipients())),
             'message' => new DataPart($message->toString(), 'message.mime'),
         ]);

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,6 @@ public function __toString(): string`
`53`	`53`	`protected function doSendHttp(SentMessage $message): ResponseInterface`
`54`	`54`	`{`
`55`	`55`	`$body = new FormDataPart([`
`56`		`- 'h:sender' => $message->getEnvelope()->getSender()->toString(),`
`57`	`56`	`'to' => implode(',', $this->stringifyAddresses($message->getEnvelope()->getRecipients())),`
`58`	`57`	`'message' => new DataPart($message->toString(), 'message.mime'),`
`59`	`58`	`]);`