feature #33562 [Mailer] rename SmtpEnvelope to Envelope (xabbuh)

fabpot · fabpot · commit 575a59b9558a · 2019-09-13T15:15:15.000+01:00
This PR was merged into the 4.4 branch.

Discussion
----------

[Mailer] rename SmtpEnvelope to Envelope

| Q             | A
| ------------- | ---
| Branch?       | 4.4
| Bug fix?      | no
| New feature?  | no
| Deprecations? | no
| Tickets       |
| License       | MIT
| Doc PR        |

Drop the Smtp prefix so that arbitrary transports do not have to depend
on SMTP specific concepts.

Commits
-------

5e2c6da349 rename SmtpEnvelope to Envelope
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,8 @@ CHANGELOG
 4.4.0
 -----
 
+ * [BC BREAK] renamed `SmtpEnvelope` to `Envelope`, renamed `DelayedSmtpEnvelope` to
+   `DelayedEnvelope`
  * [BC BREAK] changed the syntax for failover and roundrobin DSNs
 
    Before:
diff --git a/DelayedEnvelope.php b/DelayedEnvelope.php
@@ -21,7 +21,7 @@
  *
  * @internal
  */
-final class DelayedSmtpEnvelope extends SmtpEnvelope
+final class DelayedEnvelope extends Envelope
 {
     private $senderSet = false;
     private $recipientsSet = false;
diff --git a/Envelope.php b/Envelope.php
@@ -19,7 +19,7 @@
 /**
  * @author Fabien Potencier <fabien@symfony.com>
  */
-class SmtpEnvelope
+class Envelope
 {
     private $sender;
     private $recipients = [];
@@ -39,7 +39,7 @@ public static function create(RawMessage $message): self
             throw new LogicException('Cannot send a RawMessage instance without an explicit Envelope.');
         }
 
-        return new DelayedSmtpEnvelope($message);
+        return new DelayedEnvelope($message);
     }
 
     public function setSender(Address $sender): void
diff --git a/Event/MessageEvent.php b/Event/MessageEvent.php
@@ -12,7 +12,7 @@
 namespace Symfony\Component\Mailer\Event;
 
 use Symfony\Component\EventDispatcher\Event;
-use Symfony\Component\Mailer\SmtpEnvelope;
+use Symfony\Component\Mailer\Envelope;
 use Symfony\Component\Mime\RawMessage;
 
 /**
@@ -27,7 +27,7 @@ final class MessageEvent extends Event
     private $transport;
     private $queued;
 
-    public function __construct(RawMessage $message, SmtpEnvelope $envelope, string $transport, bool $queued = false)
+    public function __construct(RawMessage $message, Envelope $envelope, string $transport, bool $queued = false)
     {
         $this->message = $message;
         $this->envelope = $envelope;
diff --git a/Mailer.php b/Mailer.php
@@ -34,7 +34,7 @@ public function __construct(TransportInterface $transport, MessageBusInterface $
         $this->dispatcher = $dispatcher;
     }
 
-    public function send(RawMessage $message, SmtpEnvelope $envelope = null): void
+    public function send(RawMessage $message, Envelope $envelope = null): void
     {
         if (null === $this->bus) {
             $this->transport->send($message, $envelope);
@@ -44,7 +44,7 @@ public function send(RawMessage $message, SmtpEnvelope $envelope = null): void
 
         if (null !== $this->dispatcher) {
             $message = clone $message;
-            $envelope = null !== $envelope ? clone $envelope : SmtpEnvelope::create($message);
+            $envelope = null !== $envelope ? clone $envelope : Envelope::create($message);
             $event = new MessageEvent($message, $envelope, (string) $this->transport, true);
             $this->dispatcher->dispatch($event);
         }
diff --git a/MailerInterface.php b/MailerInterface.php
@@ -26,5 +26,5 @@ interface MailerInterface
     /**
      * @throws TransportExceptionInterface
      */
-    public function send(RawMessage $message, SmtpEnvelope $envelope = null): void;
+    public function send(RawMessage $message, Envelope $envelope = null): void;
 }
diff --git a/Messenger/SendEmailMessage.php b/Messenger/SendEmailMessage.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\Mailer\Messenger;
 
-use Symfony\Component\Mailer\SmtpEnvelope;
+use Symfony\Component\Mailer\Envelope;
 use Symfony\Component\Mime\RawMessage;
 
 /**
@@ -25,7 +25,7 @@ class SendEmailMessage
     /**
      * @internal
      */
-    public function __construct(RawMessage $message, SmtpEnvelope $envelope = null)
+    public function __construct(RawMessage $message, Envelope $envelope = null)
     {
         $this->message = $message;
         $this->envelope = $envelope;
@@ -36,7 +36,7 @@ public function getMessage(): RawMessage
         return $this->message;
     }
 
-    public function getEnvelope(): ?SmtpEnvelope
+    public function getEnvelope(): ?Envelope
     {
         return $this->envelope;
     }
diff --git a/SentMessage.php b/SentMessage.php
@@ -27,7 +27,7 @@ class SentMessage
     /**
      * @internal
      */
-    public function __construct(RawMessage $message, SmtpEnvelope $envelope)
+    public function __construct(RawMessage $message, Envelope $envelope)
     {
         $message->ensureValidity();
 
@@ -46,7 +46,7 @@ public function getOriginalMessage(): RawMessage
         return $this->original;
     }
 
-    public function getEnvelope(): SmtpEnvelope
+    public function getEnvelope(): Envelope
     {
         return $this->envelope;
     }
diff --git a/Tests/EnvelopeTest.php b/Tests/EnvelopeTest.php
@@ -12,71 +12,71 @@
 namespace Symfony\Component\Mailer\Tests;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Mailer\Envelope;
 use Symfony\Component\Mailer\Exception\LogicException;
-use Symfony\Component\Mailer\SmtpEnvelope;
 use Symfony\Component\Mime\Address;
 use Symfony\Component\Mime\Header\Headers;
 use Symfony\Component\Mime\Message;
 use Symfony\Component\Mime\RawMessage;
 
-class SmtpEnvelopeTest extends TestCase
+class EnvelopeTest extends TestCase
 {
     public function testConstructorWithAddressSender()
     {
-        $e = new SmtpEnvelope(new Address('fabien@symfony.com'), [new Address('thomas@symfony.com')]);
+        $e = new Envelope(new Address('fabien@symfony.com'), [new Address('thomas@symfony.com')]);
         $this->assertEquals(new Address('fabien@symfony.com'), $e->getSender());
     }
 
     public function testConstructorWithNamedAddressSender()
     {
-        $e = new SmtpEnvelope(new Address('fabien@symfony.com', 'Fabien'), [new Address('thomas@symfony.com')]);
+        $e = new Envelope(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 Address('lucas@symfony.com', 'Lucas')]);
+        $e = new Envelope(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());
     }
 
     public function testConstructorWithNoRecipients()
     {
         $this->expectException(\InvalidArgumentException::class);
-        $e = new SmtpEnvelope(new Address('fabien@symfony.com'), []);
+        $e = new Envelope(new Address('fabien@symfony.com'), []);
     }
 
     public function testConstructorWithWrongRecipients()
     {
         $this->expectException(\InvalidArgumentException::class);
-        $e = new SmtpEnvelope(new Address('fabien@symfony.com'), ['lucas@symfony.com']);
+        $e = new Envelope(new Address('fabien@symfony.com'), ['lucas@symfony.com']);
     }
 
     public function testSenderFromHeaders()
     {
         $headers = new Headers();
         $headers->addPathHeader('Return-Path', new Address('return@symfony.com', 'return'));
         $headers->addMailboxListHeader('To', ['from@symfony.com']);
-        $e = SmtpEnvelope::create(new Message($headers));
+        $e = Envelope::create(new Message($headers));
         $this->assertEquals(new Address('return@symfony.com', 'return'), $e->getSender());
 
         $headers = new Headers();
         $headers->addMailboxHeader('Sender', new Address('sender@symfony.com', 'sender'));
         $headers->addMailboxListHeader('To', ['from@symfony.com']);
-        $e = SmtpEnvelope::create(new Message($headers));
+        $e = Envelope::create(new Message($headers));
         $this->assertEquals(new Address('sender@symfony.com', 'sender'), $e->getSender());
 
         $headers = new Headers();
         $headers->addMailboxListHeader('From', [new Address('from@symfony.com', 'from'), 'some@symfony.com']);
         $headers->addMailboxListHeader('To', ['from@symfony.com']);
-        $e = SmtpEnvelope::create(new Message($headers));
+        $e = Envelope::create(new Message($headers));
         $this->assertEquals(new Address('from@symfony.com', 'from'), $e->getSender());
     }
 
     public function testSenderFromHeadersWithoutFrom()
     {
         $headers = new Headers();
         $headers->addMailboxListHeader('To', ['from@symfony.com']);
-        $e = SmtpEnvelope::create($message = new Message($headers));
+        $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());
     }
@@ -88,7 +88,7 @@ public function testRecipientsFromHeaders()
         $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));
+        $e = Envelope::create(new Message($headers));
         $this->assertEquals([new Address('to@symfony.com'), new Address('cc@symfony.com'), new Address('bcc@symfony.com')], $e->getRecipients());
     }
 
@@ -99,14 +99,14 @@ public function testRecipientsFromHeadersWithNames()
         $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));
+        $e = Envelope::create(new Message($headers));
         $this->assertEquals([new Address('to@symfony.com', 'to'), new Address('cc@symfony.com', 'cc'), new Address('bcc@symfony.com', 'bcc')], $e->getRecipients());
     }
 
     public function testFromRawMessages()
     {
         $this->expectException(LogicException::class);
 
-        SmtpEnvelope::create(new RawMessage('Some raw email message'));
+        Envelope::create(new RawMessage('Some raw email message'));
     }
 }
diff --git a/Tests/SentMessageTest.php b/Tests/SentMessageTest.php
@@ -12,8 +12,8 @@
 namespace Symfony\Component\Mailer\Tests;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Mailer\Envelope;
 use Symfony\Component\Mailer\SentMessage;
-use Symfony\Component\Mailer\SmtpEnvelope;
 use Symfony\Component\Mime\Address;
 use Symfony\Component\Mime\Email;
 use Symfony\Component\Mime\RawMessage;
@@ -22,7 +22,7 @@ class SentMessageTest extends TestCase
 {
     public function test()
     {
-        $m = new SentMessage($r = new RawMessage('Email'), $e = new SmtpEnvelope(new Address('fabien@example.com'), [new Address('helene@example.com')]));
+        $m = new SentMessage($r = new RawMessage('Email'), $e = new Envelope(new Address('fabien@example.com'), [new Address('helene@example.com')]));
         $this->assertSame($r, $m->getOriginalMessage());
         $this->assertSame($r, $m->getMessage());
         $this->assertSame($e, $m->getEnvelope());
diff --git a/Tests/Transport/AbstractTransportTest.php b/Tests/Transport/AbstractTransportTest.php
@@ -12,8 +12,8 @@
 namespace Symfony\Component\Mailer\Tests\Transport;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Mailer\Envelope;
 use Symfony\Component\Mailer\Exception\LogicException;
-use Symfony\Component\Mailer\SmtpEnvelope;
 use Symfony\Component\Mailer\Transport\NullTransport;
 use Symfony\Component\Mime\Address;
 use Symfony\Component\Mime\RawMessage;
@@ -28,7 +28,7 @@ public function testThrottling()
         $transport = new NullTransport();
         $transport->setMaxPerSecond(2 / 10);
         $message = new RawMessage('');
-        $envelope = new SmtpEnvelope(new Address('fabien@example.com'), [new Address('helene@example.com')]);
+        $envelope = new Envelope(new Address('fabien@example.com'), [new Address('helene@example.com')]);
 
         $start = time();
         $transport->send($message, $envelope);
diff --git a/Tests/TransportTest.php b/Tests/TransportTest.php
@@ -12,9 +12,9 @@
 namespace Symfony\Component\Mailer\Tests;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Mailer\Envelope;
 use Symfony\Component\Mailer\Exception\InvalidArgumentException;
 use Symfony\Component\Mailer\SentMessage;
-use Symfony\Component\Mailer\SmtpEnvelope;
 use Symfony\Component\Mailer\Transport;
 use Symfony\Component\Mailer\Transport\Dsn;
 use Symfony\Component\Mailer\Transport\FailoverTransport;
@@ -93,7 +93,7 @@ public function __construct(string $host)
         $this->host = $host;
     }
 
-    public function send(RawMessage $message, SmtpEnvelope $envelope = null): ?SentMessage
+    public function send(RawMessage $message, Envelope $envelope = null): ?SentMessage
     {
         throw new \BadMethodCallException('This method newer should be called.');
     }
diff --git a/Transport/AbstractApiTransport.php b/Transport/AbstractApiTransport.php
@@ -11,9 +11,9 @@
 
 namespace Symfony\Component\Mailer\Transport;
 
+use Symfony\Component\Mailer\Envelope;
 use Symfony\Component\Mailer\Exception\RuntimeException;
 use Symfony\Component\Mailer\SentMessage;
-use Symfony\Component\Mailer\SmtpEnvelope;
 use Symfony\Component\Mime\Address;
 use Symfony\Component\Mime\Email;
 use Symfony\Component\Mime\MessageConverter;
@@ -24,7 +24,7 @@
  */
 abstract class AbstractApiTransport extends AbstractHttpTransport
 {
-    abstract protected function doSendApi(Email $email, SmtpEnvelope $envelope): ResponseInterface;
+    abstract protected function doSendApi(Email $email, Envelope $envelope): ResponseInterface;
 
     protected function doSendHttp(SentMessage $message): ResponseInterface
     {
@@ -37,7 +37,7 @@ protected function doSendHttp(SentMessage $message): ResponseInterface
         return $this->doSendApi($email, $message->getEnvelope());
     }
 
-    protected function getRecipients(Email $email, SmtpEnvelope $envelope): array
+    protected function getRecipients(Email $email, Envelope $envelope): array
     {
         return array_filter($envelope->getRecipients(), function (Address $address) use ($email) {
             return false === \in_array($address, array_merge($email->getCc(), $email->getBcc()), true);
diff --git a/Transport/AbstractTransport.php b/Transport/AbstractTransport.php
@@ -13,9 +13,9 @@
 
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
+use Symfony\Component\Mailer\Envelope;
 use Symfony\Component\Mailer\Event\MessageEvent;
 use Symfony\Component\Mailer\SentMessage;
-use Symfony\Component\Mailer\SmtpEnvelope;
 use Symfony\Component\Mime\Address;
 use Symfony\Component\Mime\RawMessage;
 use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
@@ -51,10 +51,10 @@ public function setMaxPerSecond(float $rate): self
         return $this;
     }
 
-    public function send(RawMessage $message, SmtpEnvelope $envelope = null): ?SentMessage
+    public function send(RawMessage $message, Envelope $envelope = null): ?SentMessage
     {
         $message = clone $message;
-        $envelope = null !== $envelope ? clone $envelope : SmtpEnvelope::create($message);
+        $envelope = null !== $envelope ? clone $envelope : Envelope::create($message);
 
         if (null !== $this->dispatcher) {
             $event = new MessageEvent($message, $envelope, (string) $this);
diff --git a/Transport/RoundRobinTransport.php b/Transport/RoundRobinTransport.php
@@ -11,10 +11,10 @@
 
 namespace Symfony\Component\Mailer\Transport;
 
+use Symfony\Component\Mailer\Envelope;
 use Symfony\Component\Mailer\Exception\TransportException;
 use Symfony\Component\Mailer\Exception\TransportExceptionInterface;
 use Symfony\Component\Mailer\SentMessage;
-use Symfony\Component\Mailer\SmtpEnvelope;
 use Symfony\Component\Mime\RawMessage;
 
 /**
@@ -43,7 +43,7 @@ public function __construct(array $transports, int $retryPeriod = 60)
         $this->retryPeriod = $retryPeriod;
     }
 
-    public function send(RawMessage $message, SmtpEnvelope $envelope = null): ?SentMessage
+    public function send(RawMessage $message, Envelope $envelope = null): ?SentMessage
     {
         while ($transport = $this->getNextTransport()) {
             try {
diff --git a/Transport/SendmailTransport.php b/Transport/SendmailTransport.php
@@ -12,8 +12,8 @@
 namespace Symfony\Component\Mailer\Transport;
 
 use Psr\Log\LoggerInterface;
+use Symfony\Component\Mailer\Envelope;
 use Symfony\Component\Mailer\SentMessage;
-use Symfony\Component\Mailer\SmtpEnvelope;
 use Symfony\Component\Mailer\Transport\Smtp\SmtpTransport;
 use Symfony\Component\Mailer\Transport\Smtp\Stream\AbstractStream;
 use Symfony\Component\Mailer\Transport\Smtp\Stream\ProcessStream;
@@ -64,7 +64,7 @@ public function __construct(string $command = null, EventDispatcherInterface $di
         }
     }
 
-    public function send(RawMessage $message, SmtpEnvelope $envelope = null): ?SentMessage
+    public function send(RawMessage $message, Envelope $envelope = null): ?SentMessage
     {
         if ($this->transport) {
             return $this->transport->send($message, $envelope);
diff --git a/Transport/Smtp/SmtpTransport.php b/Transport/Smtp/SmtpTransport.php
diff --git a/Transport/TransportInterface.php b/Transport/TransportInterface.php
diff --git a/Transport/Transports.php b/Transport/Transports.php

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`*`
`22`	`22`	`* @internal`
`23`	`23`	`*/`
`24`		`-final class DelayedSmtpEnvelope extends SmtpEnvelope`
	`24`	`+final class DelayedEnvelope extends Envelope`
`25`	`25`	`{`
`26`	`26`	`private $senderSet = false;`
`27`	`27`	`private $recipientsSet = false;`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`/**`
`20`	`20`	`* @author Fabien Potencier <fabien@symfony.com>`
`21`	`21`	`*/`
`22`		`-class SmtpEnvelope`
	`22`	`+class Envelope`
`23`	`23`	`{`
`24`	`24`	`private $sender;`
`25`	`25`	`private $recipients = [];`
`@@ -39,7 +39,7 @@ public static function create(RawMessage $message): self`
`39`	`39`	`throw new LogicException('Cannot send a RawMessage instance without an explicit Envelope.');`
`40`	`40`	`}`
`41`	`41`
`42`		`- return new DelayedSmtpEnvelope($message);`
	`42`	`+ return new DelayedEnvelope($message);`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`public function setSender(Address $sender): void`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public function __construct(TransportInterface $transport, MessageBusInterface $`
`34`	`34`	`$this->dispatcher = $dispatcher;`
`35`	`35`	`}`
`36`	`36`
`37`		`- public function send(RawMessage $message, SmtpEnvelope $envelope = null): void`
	`37`	`+ public function send(RawMessage $message, Envelope $envelope = null): void`
`38`	`38`	`{`
`39`	`39`	`if (null === $this->bus) {`
`40`	`40`	`$this->transport->send($message, $envelope);`
`@@ -44,7 +44,7 @@ public function send(RawMessage $message, SmtpEnvelope $envelope = null): void`
`44`	`44`
`45`	`45`	`if (null !== $this->dispatcher) {`
`46`	`46`	`$message = clone $message;`
`47`		`- $envelope = null !== $envelope ? clone $envelope : SmtpEnvelope::create($message);`
	`47`	`+ $envelope = null !== $envelope ? clone $envelope : Envelope::create($message);`
`48`	`48`	`$event = new MessageEvent($message, $envelope, (string) $this->transport, true);`
`49`	`49`	`$this->dispatcher->dispatch($event);`
`50`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,5 +26,5 @@ interface MailerInterface`
`26`	`26`	`/**`
`27`	`27`	`* @throws TransportExceptionInterface`
`28`	`28`	`*/`
`29`		`- public function send(RawMessage $message, SmtpEnvelope $envelope = null): void;`
	`29`	`+ public function send(RawMessage $message, Envelope $envelope = null): void;`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\Mailer\Messenger;`
`13`	`13`
`14`		`-use Symfony\Component\Mailer\SmtpEnvelope;`
	`14`	`+use Symfony\Component\Mailer\Envelope;`
`15`	`15`	`use Symfony\Component\Mime\RawMessage;`
`16`	`16`
`17`	`17`	`/**`
`@@ -25,7 +25,7 @@ class SendEmailMessage`
`25`	`25`	`/**`
`26`	`26`	`* @internal`
`27`	`27`	`*/`
`28`		`- public function __construct(RawMessage $message, SmtpEnvelope $envelope = null)`
	`28`	`+ public function __construct(RawMessage $message, Envelope $envelope = null)`
`29`	`29`	`{`
`30`	`30`	`$this->message = $message;`
`31`	`31`	`$this->envelope = $envelope;`
`@@ -36,7 +36,7 @@ public function getMessage(): RawMessage`
`36`	`36`	`return $this->message;`
`37`	`37`	`}`
`38`	`38`
`39`		`- public function getEnvelope(): ?SmtpEnvelope`
	`39`	`+ public function getEnvelope(): ?Envelope`
`40`	`40`	`{`
`41`	`41`	`return $this->envelope;`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ class SentMessage`
`27`	`27`	`/**`
`28`	`28`	`* @internal`
`29`	`29`	`*/`
`30`		`- public function __construct(RawMessage $message, SmtpEnvelope $envelope)`
	`30`	`+ public function __construct(RawMessage $message, Envelope $envelope)`
`31`	`31`	`{`
`32`	`32`	`$message->ensureValidity();`
`33`	`33`
`@@ -46,7 +46,7 @@ public function getOriginalMessage(): RawMessage`
`46`	`46`	`return $this->original;`
`47`	`47`	`}`
`48`	`48`
`49`		`- public function getEnvelope(): SmtpEnvelope`
	`49`	`+ public function getEnvelope(): Envelope`
`50`	`50`	`{`
`51`	`51`	`return $this->envelope;`
`52`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,71 +12,71 @@`
`12`	`12`	`namespace Symfony\Component\Mailer\Tests;`
`13`	`13`
`14`	`14`	`use PHPUnit\Framework\TestCase;`
	`15`	`+use Symfony\Component\Mailer\Envelope;`
`15`	`16`	`use Symfony\Component\Mailer\Exception\LogicException;`
`16`		`-use Symfony\Component\Mailer\SmtpEnvelope;`
`17`	`17`	`use Symfony\Component\Mime\Address;`
`18`	`18`	`use Symfony\Component\Mime\Header\Headers;`
`19`	`19`	`use Symfony\Component\Mime\Message;`
`20`	`20`	`use Symfony\Component\Mime\RawMessage;`
`21`	`21`
`22`		`-class SmtpEnvelopeTest extends TestCase`
	`22`	`+class EnvelopeTest extends TestCase`
`23`	`23`	`{`
`24`	`24`	`public function testConstructorWithAddressSender()`
`25`	`25`	`{`
`26`		`- $e = new SmtpEnvelope(new Address('fabien@symfony.com'), [new Address('thomas@symfony.com')]);`
	`26`	`+ $e = new Envelope(new Address('fabien@symfony.com'), [new Address('thomas@symfony.com')]);`
`27`	`27`	`$this->assertEquals(new Address('fabien@symfony.com'), $e->getSender());`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`public function testConstructorWithNamedAddressSender()`
`31`	`31`	`{`
`32`		`- $e = new SmtpEnvelope(new Address('fabien@symfony.com', 'Fabien'), [new Address('thomas@symfony.com')]);`
	`32`	`+ $e = new Envelope(new Address('fabien@symfony.com', 'Fabien'), [new Address('thomas@symfony.com')]);`
`33`	`33`	`$this->assertEquals(new Address('fabien@symfony.com'), $e->getSender());`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`public function testConstructorWithAddressRecipients()`
`37`	`37`	`{`
`38`		`- $e = new SmtpEnvelope(new Address('fabien@symfony.com'), [new Address('thomas@symfony.com'), new Address('lucas@symfony.com', 'Lucas')]);`
	`38`	`+ $e = new Envelope(new Address('fabien@symfony.com'), [new Address('thomas@symfony.com'), new Address('lucas@symfony.com', 'Lucas')]);`
`39`	`39`	`$this->assertEquals([new Address('thomas@symfony.com'), new Address('lucas@symfony.com')], $e->getRecipients());`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`public function testConstructorWithNoRecipients()`
`43`	`43`	`{`
`44`	`44`	`$this->expectException(\InvalidArgumentException::class);`
`45`		`- $e = new SmtpEnvelope(new Address('fabien@symfony.com'), []);`
	`45`	`+ $e = new Envelope(new Address('fabien@symfony.com'), []);`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`public function testConstructorWithWrongRecipients()`
`49`	`49`	`{`
`50`	`50`	`$this->expectException(\InvalidArgumentException::class);`
`51`		`- $e = new SmtpEnvelope(new Address('fabien@symfony.com'), ['lucas@symfony.com']);`
	`51`	`+ $e = new Envelope(new Address('fabien@symfony.com'), ['lucas@symfony.com']);`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`public function testSenderFromHeaders()`
`55`	`55`	`{`
`56`	`56`	`$headers = new Headers();`
`57`	`57`	`$headers->addPathHeader('Return-Path', new Address('return@symfony.com', 'return'));`
`58`	`58`	`$headers->addMailboxListHeader('To', ['from@symfony.com']);`
`59`		`- $e = SmtpEnvelope::create(new Message($headers));`
	`59`	`+ $e = Envelope::create(new Message($headers));`
`60`	`60`	`$this->assertEquals(new Address('return@symfony.com', 'return'), $e->getSender());`
`61`	`61`
`62`	`62`	`$headers = new Headers();`
`63`	`63`	`$headers->addMailboxHeader('Sender', new Address('sender@symfony.com', 'sender'));`
`64`	`64`	`$headers->addMailboxListHeader('To', ['from@symfony.com']);`
`65`		`- $e = SmtpEnvelope::create(new Message($headers));`
	`65`	`+ $e = Envelope::create(new Message($headers));`
`66`	`66`	`$this->assertEquals(new Address('sender@symfony.com', 'sender'), $e->getSender());`
`67`	`67`
`68`	`68`	`$headers = new Headers();`
`69`	`69`	`$headers->addMailboxListHeader('From', [new Address('from@symfony.com', 'from'), 'some@symfony.com']);`
`70`	`70`	`$headers->addMailboxListHeader('To', ['from@symfony.com']);`
`71`		`- $e = SmtpEnvelope::create(new Message($headers));`
	`71`	`+ $e = Envelope::create(new Message($headers));`
`72`	`72`	`$this->assertEquals(new Address('from@symfony.com', 'from'), $e->getSender());`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`public function testSenderFromHeadersWithoutFrom()`
`76`	`76`	`{`
`77`	`77`	`$headers = new Headers();`
`78`	`78`	`$headers->addMailboxListHeader('To', ['from@symfony.com']);`
`79`		`- $e = SmtpEnvelope::create($message = new Message($headers));`
	`79`	`+ $e = Envelope::create($message = new Message($headers));`
`80`	`80`	`$message->getHeaders()->addMailboxListHeader('From', [new Address('from@symfony.com', 'from')]);`
`81`	`81`	`$this->assertEquals(new Address('from@symfony.com', 'from'), $e->getSender());`
`82`	`82`	`}`
`@@ -88,7 +88,7 @@ public function testRecipientsFromHeaders()`
`88`	`88`	`$headers->addMailboxListHeader('To', [new Address('to@symfony.com')]);`
`89`	`89`	`$headers->addMailboxListHeader('Cc', [new Address('cc@symfony.com')]);`
`90`	`90`	`$headers->addMailboxListHeader('Bcc', [new Address('bcc@symfony.com')]);`
`91`		`- $e = SmtpEnvelope::create(new Message($headers));`
	`91`	`+ $e = Envelope::create(new Message($headers));`
`92`	`92`	`$this->assertEquals([new Address('to@symfony.com'), new Address('cc@symfony.com'), new Address('bcc@symfony.com')], $e->getRecipients());`
`93`	`93`	`}`
`94`	`94`
`@@ -99,14 +99,14 @@ public function testRecipientsFromHeadersWithNames()`
`99`	`99`	`$headers->addMailboxListHeader('To', [new Address('to@symfony.com', 'to')]);`
`100`	`100`	`$headers->addMailboxListHeader('Cc', [new Address('cc@symfony.com', 'cc')]);`
`101`	`101`	`$headers->addMailboxListHeader('Bcc', [new Address('bcc@symfony.com', 'bcc')]);`
`102`		`- $e = SmtpEnvelope::create(new Message($headers));`
	`102`	`+ $e = Envelope::create(new Message($headers));`
`103`	`103`	`$this->assertEquals([new Address('to@symfony.com', 'to'), new Address('cc@symfony.com', 'cc'), new Address('bcc@symfony.com', 'bcc')], $e->getRecipients());`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`public function testFromRawMessages()`
`107`	`107`	`{`
`108`	`108`	`$this->expectException(LogicException::class);`
`109`	`109`
`110`		`- SmtpEnvelope::create(new RawMessage('Some raw email message'));`
	`110`	`+ Envelope::create(new RawMessage('Some raw email message'));`
`111`	`111`	`}`
`112`	`112`	`}`