symfony
diff --git a/‎src/Symfony/Component/Mailer/DelayedSmtpEnvelope.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Mailer/DelayedSmtpEnvelope.php
+2-2Lines changed: 2 additions & 2 deletions b/‎src/Symfony/Component/Mailer/DelayedSmtpEnvelope.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Mailer/DelayedSmtpEnvelope.php
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎src/Symfony/Component/Mailer/Tests/SmtpEnvelopeTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Mailer/Tests/SmtpEnvelopeTest.php
+16-5Lines changed: 16 additions & 5 deletions b/‎src/Symfony/Component/Mailer/Tests/SmtpEnvelopeTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Mailer/Tests/SmtpEnvelopeTest.php
+16-5Lines changed: 16 additions & 5 deletions
@@ -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;
                 }
             }
         }
 
@@ -56,19 +56,19 @@ public function testSenderFromHeaders()
         $headers->addPathHeader('Return-Path', new NamedAddress('return@symfony.com', 'return'));
         $headers->addMailboxListHeader('To', ['from@symfony.com']);
         $e = SmtpEnvelope::create(new Message($headers));
-        $this->assertEquals('return@symfony.com', $e->getSender()->getAddress());
+        $this->assertEquals(new NamedAddress('return@symfony.com', 'return'), $e->getSender());
 
         $headers = new Headers();
         $headers->addMailboxHeader('Sender', new NamedAddress('sender@symfony.com', 'sender'));
         $headers->addMailboxListHeader('To', ['from@symfony.com']);
         $e = SmtpEnvelope::create(new Message($headers));
-        $this->assertEquals('sender@symfony.com', $e->getSender()->getAddress());
+        $this->assertEquals(new NamedAddress('sender@symfony.com', 'sender'), $e->getSender());
 
         $headers = new Headers();
         $headers->addMailboxListHeader('From', [new NamedAddress('from@symfony.com', 'from'), 'some@symfony.com']);
         $headers->addMailboxListHeader('To', ['from@symfony.com']);
         $e = SmtpEnvelope::create(new Message($headers));
-        $this->assertEquals('from@symfony.com', $e->getSender()->getAddress());
+        $this->assertEquals(new NamedAddress('from@symfony.com', 'from'), $e->getSender());
     }
 
     public function testSenderFromHeadersWithoutFrom()
@@ -77,17 +77,28 @@ public function testSenderFromHeadersWithoutFrom()
         $headers->addMailboxListHeader('To', ['from@symfony.com']);
         $e = SmtpEnvelope::create($message = new Message($headers));
         $message->getHeaders()->addMailboxListHeader('From', [new NamedAddress('from@symfony.com', 'from')]);
-        $this->assertEquals('from@symfony.com', $e->getSender()->getAddress());
+        $this->assertEquals(new NamedAddress('from@symfony.com', 'from'), $e->getSender());
     }
 
     public function testRecipientsFromHeaders()
+    {
+        $headers = new Headers();
+        $headers->addPathHeader('Return-Path', 'return@symfony.com');
+        $headers->addMailboxListHeader('To', [new Address('to@symfony.com')]);
+        $headers->addMailboxListHeader('Cc', [new Address('cc@symfony.com')]);
+        $headers->addMailboxListHeader('Bcc', [new Address('bcc@symfony.com')]);
+        $e = SmtpEnvelope::create(new Message($headers));
+        $this->assertEquals([new Address('to@symfony.com'), new Address('cc@symfony.com'), new Address('bcc@symfony.com')], $e->getRecipients());
+    }
+
+    public function testRecipientsFromHeadersWithNames()
     {
         $headers = new Headers();
         $headers->addPathHeader('Return-Path', 'return@symfony.com');
         $headers->addMailboxListHeader('To', [new NamedAddress('to@symfony.com', 'to')]);
         $headers->addMailboxListHeader('Cc', [new NamedAddress('cc@symfony.com', 'cc')]);
         $headers->addMailboxListHeader('Bcc', [new NamedAddress('bcc@symfony.com', 'bcc')]);
         $e = SmtpEnvelope::create(new Message($headers));
-        $this->assertEquals([new Address('to@symfony.com'), new Address('cc@symfony.com'), new Address('bcc@symfony.com')], $e->getRecipients());
+        $this->assertEquals([new NamedAddress('to@symfony.com', 'to'), new NamedAddress('cc@symfony.com', 'cc'), new NamedAddress('bcc@symfony.com', 'bcc')], $e->getRecipients());
     }
 }
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public function getSender(): Address`
`47`	`47`	`return parent::getSender();`
`48`	`48`	`}`
`49`	`49`
`50`		`- return new Address(self::getSenderFromHeaders($this->message->getHeaders())->getAddress());`
	`50`	`+ return self::getSenderFromHeaders($this->message->getHeaders());`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`public function setRecipients(array $recipients): void`
`@@ -75,7 +75,7 @@ private static function getRecipientsFromHeaders(Headers $headers): array`
`75`	`75`	`foreach (['to', 'cc', 'bcc'] as $name) {`
`76`	`76`	`foreach ($headers->all($name) as $header) {`
`77`	`77`	`foreach ($header->getAddresses() as $address) {`
`78`		`- $recipients[] = new Address($address->getAddress());`
	`78`	`+ $recipients[] = $address;`
`79`	`79`	`}`
`80`	`80`	`}`
`81`	`81`	`}`