maintain sender/recipient name in SMTP envelopes

Author: xabbuh

DelayedSmtpEnvelope.php

@@ -47,7 +47,7 @@ public function getSender(): Address
             return parent::getSender();
         }
 
-        return new Address(self::getSenderFromHeaders($this->message->getHeaders())->getAddress());
+        return self::getSenderFromHeaders($this->message->getHeaders());
     }
 
     public function setRecipients(array $recipients): void
@@ -75,7 +75,7 @@ private static function getRecipientsFromHeaders(Headers $headers): array
         foreach (['to', 'cc', 'bcc'] as $name) {
             foreach ($headers->all($name) as $header) {
                 foreach ($header->getAddresses() as $address) {
-                    $recipients[] = new Address($address->getAddress());
+                    $recipients[] = $address;
                 }
             }
         }

Tests/SmtpEnvelopeTest.php

@@ -56,19 +56,19 @@ public function testSenderFromHeaders()
         $headers->addPathHeader('Return-Path', new NamedAddress('[email protected]', 'return'));
         $headers->addMailboxListHeader('To', ['[email protected]']);
         $e = SmtpEnvelope::create(new Message($headers));
-        $this->assertEquals('[email protected]', $e->getSender()->getAddress());
+        $this->assertEquals(new NamedAddress('[email protected]', 'return'), $e->getSender());
 
         $headers = new Headers();
         $headers->addMailboxHeader('Sender', new NamedAddress('[email protected]', 'sender'));
         $headers->addMailboxListHeader('To', ['[email protected]']);
         $e = SmtpEnvelope::create(new Message($headers));
-        $this->assertEquals('[email protected]', $e->getSender()->getAddress());
+        $this->assertEquals(new NamedAddress('[email protected]', 'sender'), $e->getSender());
 
         $headers = new Headers();
         $headers->addMailboxListHeader('From', [new NamedAddress('[email protected]', 'from'), '[email protected]']);
         $headers->addMailboxListHeader('To', ['[email protected]']);
         $e = SmtpEnvelope::create(new Message($headers));
-        $this->assertEquals('[email protected]', $e->getSender()->getAddress());
+        $this->assertEquals(new NamedAddress('[email protected]', 'from'), $e->getSender());
     }
 
     public function testSenderFromHeadersWithoutFrom()
@@ -77,17 +77,28 @@ public function testSenderFromHeadersWithoutFrom()
         $headers->addMailboxListHeader('To', ['[email protected]']);
         $e = SmtpEnvelope::create($message = new Message($headers));
         $message->getHeaders()->addMailboxListHeader('From', [new NamedAddress('[email protected]', 'from')]);
-        $this->assertEquals('[email protected]', $e->getSender()->getAddress());
+        $this->assertEquals(new NamedAddress('[email protected]', 'from'), $e->getSender());
     }
 
     public function testRecipientsFromHeaders()
+    {
+        $headers = new Headers();
+        $headers->addPathHeader('Return-Path', '[email protected]');
+        $headers->addMailboxListHeader('To', [new Address('[email protected]')]);
+        $headers->addMailboxListHeader('Cc', [new Address('[email protected]')]);
+        $headers->addMailboxListHeader('Bcc', [new Address('[email protected]')]);
+        $e = SmtpEnvelope::create(new Message($headers));
+        $this->assertEquals([new Address('[email protected]'), new Address('[email protected]'), new Address('[email protected]')], $e->getRecipients());
+    }
+
+    public function testRecipientsFromHeadersWithNames()
     {
         $headers = new Headers();
         $headers->addPathHeader('Return-Path', '[email protected]');
         $headers->addMailboxListHeader('To', [new NamedAddress('[email protected]', 'to')]);
         $headers->addMailboxListHeader('Cc', [new NamedAddress('[email protected]', 'cc')]);
         $headers->addMailboxListHeader('Bcc', [new NamedAddress('[email protected]', 'bcc')]);
         $e = SmtpEnvelope::create(new Message($headers));
-        $this->assertEquals([new Address('[email protected]'), new Address('[email protected]'), new Address('[email protected]')], $e->getRecipients());
+        $this->assertEquals([new NamedAddress('[email protected]', 'to'), new NamedAddress('[email protected]', 'cc'), new NamedAddress('[email protected]', 'bcc')], $e->getRecipients());
     }
 }

Transport/Smtp/SmtpTransport.php

@@ -152,9 +152,9 @@ public function executeCommand(string $command, array $codes): string
     protected function doSend(SentMessage $message): void
     {
         $envelope = $message->getEnvelope();
-        $this->doMailFromCommand($envelope->getSender()->toString());
+        $this->doMailFromCommand($envelope->getSender()->getAddress());
         foreach ($envelope->getRecipients() as $recipient) {
-            $this->doRcptToCommand($recipient->toString());
+            $this->doRcptToCommand($recipient->getAddress());
         }
 
         $this->executeCommand("DATA\r\n", [354]);
@@ -170,12 +170,12 @@ protected function doHeloCommand(): void
         $this->executeCommand(sprintf("HELO %s\r\n", $this->domain), [250]);
     }
 
-    private function doMailFromCommand($address): void
+    private function doMailFromCommand(string $address): void
     {
         $this->executeCommand(sprintf("MAIL FROM:<%s>\r\n", $address), [250]);
     }
 
-    private function doRcptToCommand($address): void
+    private function doRcptToCommand(string $address): void
     {
         $this->executeCommand(sprintf("RCPT TO:<%s>\r\n", $address), [250, 251, 252]);
     }