[Mime] Keep Sender full address when used by non-SMTP transports

fabpot · fabpot · commit 1ca9be77aadc · 2020-07-15T08:28:59.000+02:00
diff --git a/src/Symfony/Component/Mailer/Envelope.php b/src/Symfony/Component/Mailer/Envelope.php
@@ -44,9 +44,13 @@ public static function create(RawMessage $message): self
 
     public function setSender(Address $sender): void
     {
-        $this->sender = new Address($sender->getAddress());
+        $this->sender = $sender;
     }
 
+    /**
+     * @return Address Returns a "mailbox" as specified by RFC 2822
+     *                 Must be converted to an "addr-spec" when used as a "MAIL FROM" value in SMTP (use getAddress())
+     */
     public function getSender(): Address
     {
         return $this->sender;
diff --git a/src/Symfony/Component/Mailer/Tests/EnvelopeTest.php b/src/Symfony/Component/Mailer/Tests/EnvelopeTest.php
@@ -29,8 +29,8 @@ public function testConstructorWithAddressSender()
 
     public function testConstructorWithNamedAddressSender()
     {
-        $e = new Envelope(new Address('fabien@symfony.com', 'Fabien'), [new Address('thomas@symfony.com')]);
-        $this->assertEquals(new Address('fabien@symfony.com'), $e->getSender());
+        $e = new Envelope($sender = new Address('fabien@symfony.com', 'Fabien'), [new Address('thomas@symfony.com')]);
+        $this->assertEquals($sender, $e->getSender());
     }
 
     public function testConstructorWithAddressRecipients()
@@ -54,31 +54,31 @@ public function testConstructorWithWrongRecipients()
     public function testSenderFromHeaders()
     {
         $headers = new Headers();
-        $headers->addPathHeader('Return-Path', new Address('return@symfony.com', 'return'));
-        $headers->addMailboxListHeader('To', ['from@symfony.com']);
+        $headers->addPathHeader('Return-Path', $return = new Address('return@symfony.com', 'return'));
+        $headers->addMailboxListHeader('To', ['to@symfony.com']);
         $e = Envelope::create(new Message($headers));
-        $this->assertEquals(new Address('return@symfony.com', 'return'), $e->getSender());
+        $this->assertEquals($return, $e->getSender());
 
         $headers = new Headers();
-        $headers->addMailboxHeader('Sender', new Address('sender@symfony.com', 'sender'));
-        $headers->addMailboxListHeader('To', ['from@symfony.com']);
+        $headers->addMailboxHeader('Sender', $sender = new Address('sender@symfony.com', 'sender'));
+        $headers->addMailboxListHeader('To', ['to@symfony.com']);
         $e = Envelope::create(new Message($headers));
-        $this->assertEquals(new Address('sender@symfony.com', 'sender'), $e->getSender());
+        $this->assertEquals($sender, $e->getSender());
 
         $headers = new Headers();
-        $headers->addMailboxListHeader('From', [new Address('from@symfony.com', 'from'), 'some@symfony.com']);
-        $headers->addMailboxListHeader('To', ['from@symfony.com']);
+        $headers->addMailboxListHeader('From', [$from = new Address('from@symfony.com', 'from'), 'some@symfony.com']);
+        $headers->addMailboxListHeader('To', ['to@symfony.com']);
         $e = Envelope::create(new Message($headers));
-        $this->assertEquals(new Address('from@symfony.com', 'from'), $e->getSender());
+        $this->assertEquals($from, $e->getSender());
     }
 
     public function testSenderFromHeadersWithoutFrom()
     {
         $headers = new Headers();
-        $headers->addMailboxListHeader('To', ['from@symfony.com']);
+        $headers->addMailboxListHeader('To', ['to@symfony.com']);
         $e = Envelope::create($message = new Message($headers));
-        $message->getHeaders()->addMailboxListHeader('From', [new Address('from@symfony.com', 'from')]);
-        $this->assertEquals(new Address('from@symfony.com', 'from'), $e->getSender());
+        $message->getHeaders()->addMailboxListHeader('From', [$from = new Address('from@symfony.com', 'from')]);
+        $this->assertEquals($from, $e->getSender());
     }
 
     public function testRecipientsFromHeaders()

Original file line number	Diff line number	Diff line change
`@@ -44,9 +44,13 @@ public static function create(RawMessage $message): self`
`44`	`44`
`45`	`45`	`public function setSender(Address $sender): void`
`46`	`46`	`{`
`47`		`- $this->sender = new Address($sender->getAddress());`
	`47`	`+ $this->sender = $sender;`
`48`	`48`	`}`
`49`	`49`
	`50`	`+ /**`
	`51`	`+ * @return Address Returns a "mailbox" as specified by RFC 2822`
	`52`	`+ * Must be converted to an "addr-spec" when used as a "MAIL FROM" value in SMTP (use getAddress())`
	`53`	`+ */`
`50`	`54`	`public function getSender(): Address`
`51`	`55`	`{`
`52`	`56`	`return $this->sender;`