[Mailer][Mandrill] Add subaccount to the payload

Author: andrehoong-pixieset

src/Symfony/Component/Mailer/Bridge/Mailchimp/CHANGELOG.md

@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+7.4
+---
+
+* Add support for specifying a subaccount using the `X-MC-Subaccount` header
+
 7.2
 ---
 

src/Symfony/Component/Mailer/Bridge/Mailchimp/Tests/Transport/MandrillApiTransportTest.php

@@ -66,6 +66,21 @@ public function testCustomHeader()
         $this->assertEquals('bar', $payload['message']['headers']['foo']);
     }
 
+    public function testSubaccountHeaderIsAddedToPayload()
+    {
+        $email = new Email();
+        $email->getHeaders()->addTextHeader('X-MC-Subaccount', 'foo-bar');
+        $envelope = new Envelope(new Address('[email protected]'), [new Address('[email protected]')]);
+
+        $transport = new MandrillApiTransport('ACCESS_KEY');
+        $method = new \ReflectionMethod(MandrillApiTransport::class, 'getPayload');
+        $payload = $method->invoke($transport, $email, $envelope);
+
+        $this->assertArrayHasKey('subaccount', $payload['message']);
+        $this->assertEquals('foo-bar', $payload['message']['subaccount']);
+        $this->assertArrayNotHasKey('headers', $payload['message']);
+    }
+
     public function testSend()
     {
         $client = new MockHttpClient(function (string $method, string $url, array $options): ResponseInterface {

src/Symfony/Component/Mailer/Bridge/Mailchimp/Transport/MandrillApiTransport.php

@@ -93,6 +93,10 @@ private function getPayload(Email $email, Envelope $envelope): array
             ],
         ];
 
+        if ($email->getHeaders()->get('X-MC-Subaccount')) {
+            $payload['message']['subaccount'] = $email->getHeaders()->get('X-MC-Subaccount')->getBodyAsString();
+        }
+
         if ('' !== $envelope->getSender()->getName()) {
             $payload['message']['from_name'] = $envelope->getSender()->getName();
         }
@@ -118,7 +122,7 @@ private function getPayload(Email $email, Envelope $envelope): array
         }
 
         foreach ($email->getHeaders()->all() as $name => $header) {
-            if (\in_array($name, ['from', 'to', 'cc', 'bcc', 'subject', 'content-type'], true)) {
+            if (\in_array($name, ['from', 'to', 'cc', 'bcc', 'subject', 'content-type', 'x-mc-subaccount'], true)) {
                 continue;
             }