bug symfony#37900 [Mailer] Fixed mandrill api header structure (wulff)

fabpot · fabpot · commit 1f4c61683e25 · 2020-08-21T08:31:54.000+02:00
This PR was submitted for the 5.1 branch but it was squashed and merged into the 4.4 branch instead. Discussion ---------- [Mailer] Fixed mandrill api header structure | Q | A | ------------- | --- | Branch? | 5.1 | Bug fix? | yes | New feature? | no | Deprecations? | no | License | MIT When using the Mandrill API transport, it is not possible to set a reply-to address. **How to reproduce** Create a new email and add a reply-to address: ```php $email = (new Email()) ->from('from@example.com') ->to('to@example.com') ->replyTo('replyto@example.com') ->subject('subject') ->text('text'); $mailer->send($email); ``` The expected result is a payload which contains the following headers: ``` "headers": { "reply-to": "replyto@example.com" } ``` But instead, the `getPayload()` method produces these headers: ``` "headers": [ "reply-to: replyto@example.com" ] ``` **Additional context** See https://mandrillapp.com/api/docs/messages.html. Commits ------- aeb4c5e [Mailer] Fixed mandrill api header structure
diff --git a/src/Symfony/Component/Mailer/Bridge/Mailchimp/Tests/Transport/MandrillApiTransportTest.php b/src/Symfony/Component/Mailer/Bridge/Mailchimp/Tests/Transport/MandrillApiTransportTest.php
@@ -63,7 +63,7 @@ public function testCustomHeader()
         $this->assertArrayHasKey('message', $payload);
         $this->assertArrayHasKey('headers', $payload['message']);
         $this->assertCount(1, $payload['message']['headers']);
-        $this->assertEquals('foo: bar', $payload['message']['headers'][0]);
+        $this->assertEquals('bar', $payload['message']['headers']['foo']);
     }
 
     public function testSend()
diff --git a/src/Symfony/Component/Mailer/Bridge/Mailchimp/Transport/MandrillApiTransport.php b/src/Symfony/Component/Mailer/Bridge/Mailchimp/Transport/MandrillApiTransport.php
@@ -111,7 +111,7 @@ private function getPayload(Email $email, Envelope $envelope): array
                 continue;
             }
 
-            $payload['message']['headers'][] = $name.': '.$header->getBodyAsString();
+            $payload['message']['headers'][$name] = $header->getBodyAsString();
         }
 
         return $payload;

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public function testCustomHeader()`
`63`	`63`	`$this->assertArrayHasKey('message', $payload);`
`64`	`64`	`$this->assertArrayHasKey('headers', $payload['message']);`
`65`	`65`	`$this->assertCount(1, $payload['message']['headers']);`
`66`		`- $this->assertEquals('foo: bar', $payload['message']['headers'][0]);`
	`66`	`+ $this->assertEquals('bar', $payload['message']['headers']['foo']);`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`public function testSend()`
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ private function getPayload(Email $email, Envelope $envelope): array`
`111`	`111`	`continue;`
`112`	`112`	`}`
`113`	`113`
`114`		`- $payload['message']['headers'][] = $name.': '.$header->getBodyAsString();`
	`114`	`+ $payload['message']['headers'][$name] = $header->getBodyAsString();`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`return $payload;`