[Mime] Remove NamedAddress

fabpot · fabpot · commit e57ab10336f0 · 2019-08-21T09:13:01.000+02:00
diff --git a/SmtpEnvelopeTest.php b/SmtpEnvelopeTest.php
@@ -16,7 +16,6 @@
 use Symfony\Component\Mime\Address;
 use Symfony\Component\Mime\Header\Headers;
 use Symfony\Component\Mime\Message;
-use Symfony\Component\Mime\NamedAddress;
 
 class SmtpEnvelopeTest extends TestCase
 {
@@ -28,13 +27,13 @@ public function testConstructorWithAddressSender()
 
     public function testConstructorWithNamedAddressSender()
     {
-        $e = new SmtpEnvelope(new NamedAddress('fabien@symfony.com', 'Fabien'), [new Address('thomas@symfony.com')]);
+        $e = new SmtpEnvelope(new Address('fabien@symfony.com', 'Fabien'), [new Address('thomas@symfony.com')]);
         $this->assertEquals(new Address('fabien@symfony.com'), $e->getSender());
     }
 
     public function testConstructorWithAddressRecipients()
     {
-        $e = new SmtpEnvelope(new Address('fabien@symfony.com'), [new Address('thomas@symfony.com'), new NamedAddress('lucas@symfony.com', 'Lucas')]);
+        $e = new SmtpEnvelope(new Address('fabien@symfony.com'), [new Address('thomas@symfony.com'), new Address('lucas@symfony.com', 'Lucas')]);
         $this->assertEquals([new Address('thomas@symfony.com'), new Address('lucas@symfony.com')], $e->getRecipients());
     }
 
@@ -53,19 +52,19 @@ public function testConstructorWithWrongRecipients()
     public function testSenderFromHeaders()
     {
         $headers = new Headers();
-        $headers->addPathHeader('Return-Path', new NamedAddress('return@symfony.com', 'return'));
+        $headers->addPathHeader('Return-Path', new Address('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', new NamedAddress('sender@symfony.com', 'sender'));
+        $headers->addMailboxHeader('Sender', new Address('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', [new NamedAddress('from@symfony.com', 'from'), 'some@symfony.com']);
+        $headers->addMailboxListHeader('From', [new Address('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());
@@ -76,17 +75,17 @@ public function testSenderFromHeadersWithoutFrom()
         $headers = new Headers();
         $headers->addMailboxListHeader('To', ['from@symfony.com']);
         $e = SmtpEnvelope::create($message = new Message($headers));
-        $message->getHeaders()->addMailboxListHeader('From', [new NamedAddress('from@symfony.com', 'from')]);
+        $message->getHeaders()->addMailboxListHeader('From', [new Address('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', [new NamedAddress('to@symfony.com', 'to')]);
-        $headers->addMailboxListHeader('Cc', [new NamedAddress('cc@symfony.com', 'cc')]);
-        $headers->addMailboxListHeader('Bcc', [new NamedAddress('bcc@symfony.com', 'bcc')]);
+        $headers->addMailboxListHeader('To', [new Address('to@symfony.com', 'to')]);
+        $headers->addMailboxListHeader('Cc', [new Address('cc@symfony.com', 'cc')]);
+        $headers->addMailboxListHeader('Bcc', [new Address('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
@@ -16,7 +16,6 @@
 use Symfony\Component\Mime\Address;
 use Symfony\Component\Mime\Header\Headers;
 use Symfony\Component\Mime\Message;
-use Symfony\Component\Mime\NamedAddress;
 
 class SmtpEnvelopeTest extends TestCase
 {
@@ -28,13 +27,13 @@ public function testConstructorWithAddressSender()
 
     public function testConstructorWithNamedAddressSender()
     {
-        $e = new SmtpEnvelope(new NamedAddress('fabien@symfony.com', 'Fabien'), [new Address('thomas@symfony.com')]);
+        $e = new SmtpEnvelope(new Address('fabien@symfony.com', 'Fabien'), [new Address('thomas@symfony.com')]);
         $this->assertEquals(new Address('fabien@symfony.com'), $e->getSender());
     }
 
     public function testConstructorWithAddressRecipients()
     {
-        $e = new SmtpEnvelope(new Address('fabien@symfony.com'), [new Address('thomas@symfony.com'), new NamedAddress('lucas@symfony.com', 'Lucas')]);
+        $e = new SmtpEnvelope(new Address('fabien@symfony.com'), [new Address('thomas@symfony.com'), new Address('lucas@symfony.com', 'Lucas')]);
         $this->assertEquals([new Address('thomas@symfony.com'), new Address('lucas@symfony.com')], $e->getRecipients());
     }
 
@@ -53,19 +52,19 @@ public function testConstructorWithWrongRecipients()
     public function testSenderFromHeaders()
     {
         $headers = new Headers();
-        $headers->addPathHeader('Return-Path', new NamedAddress('return@symfony.com', 'return'));
+        $headers->addPathHeader('Return-Path', new Address('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', new NamedAddress('sender@symfony.com', 'sender'));
+        $headers->addMailboxHeader('Sender', new Address('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', [new NamedAddress('from@symfony.com', 'from'), 'some@symfony.com']);
+        $headers->addMailboxListHeader('From', [new Address('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());
@@ -76,17 +75,17 @@ public function testSenderFromHeadersWithoutFrom()
         $headers = new Headers();
         $headers->addMailboxListHeader('To', ['from@symfony.com']);
         $e = SmtpEnvelope::create($message = new Message($headers));
-        $message->getHeaders()->addMailboxListHeader('From', [new NamedAddress('from@symfony.com', 'from')]);
+        $message->getHeaders()->addMailboxListHeader('From', [new Address('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', [new NamedAddress('to@symfony.com', 'to')]);
-        $headers->addMailboxListHeader('Cc', [new NamedAddress('cc@symfony.com', 'cc')]);
-        $headers->addMailboxListHeader('Bcc', [new NamedAddress('bcc@symfony.com', 'bcc')]);
+        $headers->addMailboxListHeader('To', [new Address('to@symfony.com', 'to')]);
+        $headers->addMailboxListHeader('Cc', [new Address('cc@symfony.com', 'cc')]);
+        $headers->addMailboxListHeader('Bcc', [new Address('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 change
 use Symfony\Component\Mime\Address;
 use Symfony\Component\Mime\Header\Headers;
 use Symfony\Component\Mime\Message;
 -use Symfony\Component\Mime\NamedAddress;
 class SmtpEnvelopeTest extends TestCase
+{
     public function testConstructorWithNamedAddressSender()
+    {
 -        $e = new SmtpEnvelope(new NamedAddress('[email protected]', 'Fabien'), [new Address('[email protected]')]);
 +        $e = new SmtpEnvelope(new Address('[email protected]', 'Fabien'), [new Address('[email protected]')]);
         $this->assertEquals(new Address('[email protected]'), $e->getSender());
+    }
     public function testConstructorWithAddressRecipients()
+    {
 -        $e = new SmtpEnvelope(new Address('[email protected]'), [new Address('[email protected]'), new NamedAddress('[email protected]', 'Lucas')]);
 +        $e = new SmtpEnvelope(new Address('[email protected]'), [new Address('[email protected]'), new Address('[email protected]', 'Lucas')]);
         $this->assertEquals([new Address('[email protected]'), new Address('[email protected]')], $e->getRecipients());
+    }
     public function testSenderFromHeaders()
+    {
         $headers = new Headers();
 -        $headers->addPathHeader('Return-Path', new NamedAddress('[email protected]', 'return'));
 +        $headers->addPathHeader('Return-Path', new Address('[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', new NamedAddress('[email protected]', 'sender'));
 +        $headers->addMailboxHeader('Sender', new Address('[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', [new NamedAddress('[email protected]', 'from'), '[email protected]']);
 +        $headers->addMailboxListHeader('From', [new Address('[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', [new NamedAddress('[email protected]', 'from')]);
 +        $message->getHeaders()->addMailboxListHeader('From', [new Address('[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', [new NamedAddress('[email protected]', 'to')]);
 -        $headers->addMailboxListHeader('Cc', [new NamedAddress('[email protected]', 'cc')]);
 -        $headers->addMailboxListHeader('Bcc', [new NamedAddress('[email protected]', 'bcc')]);
 +        $headers->addMailboxListHeader('To', [new Address('[email protected]', 'to')]);
 +        $headers->addMailboxListHeader('Cc', [new Address('[email protected]', 'cc')]);
 +        $headers->addMailboxListHeader('Bcc', [new Address('[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());
+    }