fixed sender/recipients in SMTP Envelope

fabpot · fabpot · commit 866f1a1814a9 · 2019-06-11T21:40:57.000+02:00
diff --git a/DelayedSmtpEnvelope.php b/DelayedSmtpEnvelope.php
@@ -47,7 +47,7 @@ public function getSender(): Address
             return parent::getSender();
         }
 
-        return self::getSenderFromHeaders($this->message->getHeaders());
+        return new Address(self::getSenderFromHeaders($this->message->getHeaders())->getAddress());
     }
 
     public function setRecipients(array $recipients): void
@@ -74,7 +74,9 @@ private static function getRecipientsFromHeaders(Headers $headers): array
         $recipients = [];
         foreach (['to', 'cc', 'bcc'] as $name) {
             foreach ($headers->getAll($name) as $header) {
-                $recipients = array_merge($recipients, $header->getAddresses());
+                foreach ($header->getAddresses() as $address) {
+                    $recipients[] = new Address($address->getAddress());
+                }
             }
         }
 
diff --git a/SmtpEnvelopeTest.php b/SmtpEnvelopeTest.php
@@ -17,7 +17,6 @@
 use Symfony\Component\Mime\Header\Headers;
 use Symfony\Component\Mime\Message;
 use Symfony\Component\Mime\NamedAddress;
-use Symfony\Component\Mime\RawMessage;
 
 class SmtpEnvelopeTest extends TestCase
 {
@@ -54,19 +53,19 @@ public function testConstructorWithWrongRecipients()
     public function testSenderFromHeaders()
     {
         $headers = new Headers();
-        $headers->addPathHeader('Return-Path', 'return@symfony.com');
+        $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());
 
         $headers = new Headers();
-        $headers->addMailboxHeader('Sender', 'sender@symfony.com');
+        $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());
 
         $headers = new Headers();
-        $headers->addMailboxListHeader('From', ['from@symfony.com', 'some@symfony.com']);
+        $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());
@@ -77,17 +76,17 @@ public function testSenderFromHeadersWithoutFrom()
         $headers = new Headers();
         $headers->addMailboxListHeader('To', ['from@symfony.com']);
         $e = SmtpEnvelope::create($message = new Message($headers));
-        $message->getHeaders()->addMailboxListHeader('From', ['from@symfony.com']);
+        $message->getHeaders()->addMailboxListHeader('From', [new NamedAddress('from@symfony.com', 'from')]);
         $this->assertEquals('from@symfony.com', $e->getSender()->getAddress());
     }
 
     public function testRecipientsFromHeaders()
     {
         $headers = new Headers();
         $headers->addPathHeader('Return-Path', 'return@symfony.com');
-        $headers->addMailboxListHeader('To', ['to@symfony.com']);
-        $headers->addMailboxListHeader('Cc', ['cc@symfony.com']);
-        $headers->addMailboxListHeader('Bcc', ['bcc@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());
     }
diff --git a/Tests/SmtpEnvelopeTest.php b/Tests/SmtpEnvelopeTest.php
@@ -17,7 +17,6 @@
 use Symfony\Component\Mime\Header\Headers;
 use Symfony\Component\Mime\Message;
 use Symfony\Component\Mime\NamedAddress;
-use Symfony\Component\Mime\RawMessage;
 
 class SmtpEnvelopeTest extends TestCase
 {
@@ -54,19 +53,19 @@ public function testConstructorWithWrongRecipients()
     public function testSenderFromHeaders()
     {
         $headers = new Headers();
-        $headers->addPathHeader('Return-Path', 'return@symfony.com');
+        $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());
 
         $headers = new Headers();
-        $headers->addMailboxHeader('Sender', 'sender@symfony.com');
+        $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());
 
         $headers = new Headers();
-        $headers->addMailboxListHeader('From', ['from@symfony.com', 'some@symfony.com']);
+        $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());
@@ -77,17 +76,17 @@ public function testSenderFromHeadersWithoutFrom()
         $headers = new Headers();
         $headers->addMailboxListHeader('To', ['from@symfony.com']);
         $e = SmtpEnvelope::create($message = new Message($headers));
-        $message->getHeaders()->addMailboxListHeader('From', ['from@symfony.com']);
+        $message->getHeaders()->addMailboxListHeader('From', [new NamedAddress('from@symfony.com', 'from')]);
         $this->assertEquals('from@symfony.com', $e->getSender()->getAddress());
     }
 
     public function testRecipientsFromHeaders()
     {
         $headers = new Headers();
         $headers->addPathHeader('Return-Path', 'return@symfony.com');
-        $headers->addMailboxListHeader('To', ['to@symfony.com']);
-        $headers->addMailboxListHeader('Cc', ['cc@symfony.com']);
-        $headers->addMailboxListHeader('Bcc', ['bcc@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());
     }

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 self::getSenderFromHeaders($this->message->getHeaders());`
	`50`	`+ return new Address(self::getSenderFromHeaders($this->message->getHeaders())->getAddress());`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`public function setRecipients(array $recipients): void`
`@@ -74,7 +74,9 @@ private static function getRecipientsFromHeaders(Headers $headers): array`
`74`	`74`	`$recipients = [];`
`75`	`75`	`foreach (['to', 'cc', 'bcc'] as $name) {`
`76`	`76`	`foreach ($headers->getAll($name) as $header) {`
`77`		`- $recipients = array_merge($recipients, $header->getAddresses());`
	`77`	`+ foreach ($header->getAddresses() as $address) {`
	`78`	`+ $recipients[] = new Address($address->getAddress());`
	`79`	`+ }`
`78`	`80`	`}`
`79`	`81`	`}`
`80`	`82`
-Original file line number
+Diff line change
 use Symfony\Component\Mime\Header\Headers;
 use Symfony\Component\Mime\Message;
 use Symfony\Component\Mime\NamedAddress;
 -use Symfony\Component\Mime\RawMessage;
 class SmtpEnvelopeTest extends TestCase
+{
     public function testSenderFromHeaders()
+    {
         $headers = new Headers();
 -        $headers->addPathHeader('Return-Path', '[email protected]');
 +        $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());
         $headers = new Headers();
 -        $headers->addMailboxHeader('Sender', '[email protected]');
 +        $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());
         $headers = new Headers();
 -        $headers->addMailboxListHeader('From', ['[email protected]', '[email protected]']);
 +        $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());
         $headers = new Headers();
         $headers->addMailboxListHeader('To', ['[email protected]']);
         $e = SmtpEnvelope::create($message = new Message($headers));
 -        $message->getHeaders()->addMailboxListHeader('From', ['[email protected]']);
 +        $message->getHeaders()->addMailboxListHeader('From', [new NamedAddress('[email protected]', 'from')]);
         $this->assertEquals('[email protected]', $e->getSender()->getAddress());
+    }
     public function testRecipientsFromHeaders()
+    {
         $headers = new Headers();
         $headers->addPathHeader('Return-Path', '[email protected]');
 -        $headers->addMailboxListHeader('To', ['[email protected]']);
 -        $headers->addMailboxListHeader('Cc', ['[email protected]']);
 -        $headers->addMailboxListHeader('Bcc', ['[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());
+    }