diff --git a/UPGRADE-4.4.md b/UPGRADE-4.4.md index 2189f6b23112..fac0f35c7a1a 100644 --- a/UPGRADE-4.4.md +++ b/UPGRADE-4.4.md @@ -157,6 +157,11 @@ Messenger * Deprecated passing a `ContainerInterface` instance as first argument of the `ConsumeMessagesCommand` constructor, pass a `RoutableMessageBus` instance instead. +Mime +---- + + * Removed `NamedAddress`, use `Address` instead (which supports a name now) + MonologBridge -------------- diff --git a/src/Symfony/Bridge/Twig/Mime/WrappedTemplatedEmail.php b/src/Symfony/Bridge/Twig/Mime/WrappedTemplatedEmail.php index ff88ecaeb508..7b299e6347d6 100644 --- a/src/Symfony/Bridge/Twig/Mime/WrappedTemplatedEmail.php +++ b/src/Symfony/Bridge/Twig/Mime/WrappedTemplatedEmail.php @@ -12,7 +12,6 @@ namespace Symfony\Bridge\Twig\Mime; use Symfony\Component\Mime\Address; -use Symfony\Component\Mime\NamedAddress; use Twig\Environment; /** @@ -33,9 +32,7 @@ public function __construct(Environment $twig, TemplatedEmail $message) public function toName(): string { - $to = $this->message->getTo()[0]; - - return $to instanceof NamedAddress ? $to->getName() : ''; + return $this->message->getTo()[0]->getName(); } public function image(string $image, string $contentType = null): string @@ -93,15 +90,15 @@ public function getReturnPath(): string /** * @return $this */ - public function addFrom(string $address, string $name = null): self + public function addFrom(string $address, string $name = ''): self { - $this->message->addFrom($name ? new NamedAddress($address, $name) : new Address($address)); + $this->message->addFrom(new Address($address, $name)); return $this; } /** - * @return (Address|NamedAddress)[] + * @return Address[] */ public function getFrom(): array { @@ -129,15 +126,15 @@ public function getReplyTo(): array /** * @return $this */ - public function addTo(string $address, string $name = null): self + public function addTo(string $address, string $name = ''): self { - $this->message->addTo($name ? new NamedAddress($address, $name) : new Address($address)); + $this->message->addTo(new Address($address, $name)); return $this; } /** - * @return (Address|NamedAddress)[] + * @return Address[] */ public function getTo(): array { @@ -147,15 +144,15 @@ public function getTo(): array /** * @return $this */ - public function addCc(string $address, string $name = null): self + public function addCc(string $address, string $name = ''): self { - $this->message->addCc($name ? new NamedAddress($address, $name) : new Address($address)); + $this->message->addCc(new Address($address, $name)); return $this; } /** - * @return (Address|NamedAddress)[] + * @return Address[] */ public function getCc(): array { @@ -165,15 +162,15 @@ public function getCc(): array /** * @return $this */ - public function addBcc(string $address, string $name = null): self + public function addBcc(string $address, string $name = ''): self { - $this->message->addBcc($name ? new NamedAddress($address, $name) : new Address($address)); + $this->message->addBcc(new Address($address, $name)); return $this; } /** - * @return (Address|NamedAddress)[] + * @return Address[] */ public function getBcc(): array { diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Controller/EmailController.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Controller/EmailController.php index 42f01186ecca..1a871f79be90 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Controller/EmailController.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Controller/EmailController.php @@ -13,8 +13,8 @@ use Symfony\Component\HttpFoundation\Response; use Symfony\Component\Mailer\MailerInterface; +use Symfony\Component\Mime\Address; use Symfony\Component\Mime\Email; -use Symfony\Component\Mime\NamedAddress; class EmailController { @@ -29,7 +29,7 @@ public function indexAction(MailerInterface $mailer) ); $mailer->send((new Email())->to('fabien@symfony.com', 'thomas@symfony.com')->from('fabien@symfony.com')->subject('Foo') - ->addReplyTo(new NamedAddress('me@symfony.com', 'Fabien Potencier')) + ->addReplyTo(new Address('me@symfony.com', 'Fabien Potencier')) ->addCc('cc@symfony.com') ->text('Bar!') ->html('

Foo

') diff --git a/src/Symfony/Component/Mailer/Tests/SmtpEnvelopeTest.php b/src/Symfony/Component/Mailer/Tests/SmtpEnvelopeTest.php index 7b32ed4d7370..6905b2cebd03 100644 --- a/src/Symfony/Component/Mailer/Tests/SmtpEnvelopeTest.php +++ b/src/Symfony/Component/Mailer/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,7 +75,7 @@ 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()); } @@ -84,9 +83,9 @@ 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/src/Symfony/Component/Mime/Address.php b/src/Symfony/Component/Mime/Address.php index 2897971bb924..55fa8082e535 100644 --- a/src/Symfony/Component/Mime/Address.php +++ b/src/Symfony/Component/Mime/Address.php @@ -21,14 +21,15 @@ /** * @author Fabien Potencier */ -class Address +final class Address { private static $validator; private static $encoder; private $address; + private $name; - public function __construct(string $address) + public function __construct(string $address, string $name = '') { if (!class_exists(EmailValidator::class)) { throw new LogicException(sprintf('The "%s" class cannot be used as it needs "%s"; try running "composer require egulias/email-validator".', __CLASS__, EmailValidator::class)); @@ -43,6 +44,7 @@ public function __construct(string $address) } $this->address = $address; + $this->name = $name; } public function getAddress(): string @@ -50,6 +52,11 @@ public function getAddress(): string return $this->address; } + public function getName(): string + { + return $this->name; + } + public function getEncodedAddress(): string { if (null === self::$encoder) { @@ -61,7 +68,7 @@ public function getEncodedAddress(): string public function toString(): string { - return $this->getEncodedAddress(); + return ($n = $this->getName()) ? $n.' <'.$this->getEncodedAddress().'>' : $this->getEncodedAddress(); } /** diff --git a/src/Symfony/Component/Mime/CHANGELOG.md b/src/Symfony/Component/Mime/CHANGELOG.md index dd412eb0cea5..9f22a4048718 100644 --- a/src/Symfony/Component/Mime/CHANGELOG.md +++ b/src/Symfony/Component/Mime/CHANGELOG.md @@ -4,6 +4,7 @@ CHANGELOG 4.4.0 ----- + * [BC BREAK] Removed `NamedAddress` (`Address` now supports a name) * Added PHPUnit constraints * Added `AbstractPart::asDebugString()` diff --git a/src/Symfony/Component/Mime/Email.php b/src/Symfony/Component/Mime/Email.php index dace1cfc35eb..9c1a1c9efff4 100644 --- a/src/Symfony/Component/Mime/Email.php +++ b/src/Symfony/Component/Mime/Email.php @@ -101,7 +101,7 @@ public function getSender(): ?Address } /** - * @param Address|NamedAddress|string ...$addresses + * @param Address|string ...$addresses * * @return $this */ @@ -111,7 +111,7 @@ public function addFrom(...$addresses) } /** - * @param Address|NamedAddress|string ...$addresses + * @param Address|string ...$addresses * * @return $this */ @@ -121,7 +121,7 @@ public function from(...$addresses) } /** - * @return (Address|NamedAddress)[] + * @return Address[] */ public function getFrom(): array { @@ -157,7 +157,7 @@ public function getReplyTo(): array } /** - * @param Address|NamedAddress|string ...$addresses + * @param Address|string ...$addresses * * @return $this */ @@ -167,7 +167,7 @@ public function addTo(...$addresses) } /** - * @param Address|NamedAddress|string ...$addresses + * @param Address|string ...$addresses * * @return $this */ @@ -177,7 +177,7 @@ public function to(...$addresses) } /** - * @return (Address|NamedAddress)[] + * @return Address[] */ public function getTo(): array { @@ -185,7 +185,7 @@ public function getTo(): array } /** - * @param Address|NamedAddress|string ...$addresses + * @param Address|string ...$addresses * * @return $this */ @@ -205,7 +205,7 @@ public function cc(...$addresses) } /** - * @return (Address|NamedAddress)[] + * @return Address[] */ public function getCc(): array { @@ -213,7 +213,7 @@ public function getCc(): array } /** - * @param Address|NamedAddress|string ...$addresses + * @param Address|string ...$addresses * * @return $this */ @@ -233,7 +233,7 @@ public function bcc(...$addresses) } /** - * @return (Address|NamedAddress)[] + * @return Address[] */ public function getBcc(): array { @@ -524,10 +524,10 @@ private function setHeaderBody(string $type, string $name, $body) private function addListAddressHeaderBody(string $name, array $addresses) { - if (!$to = $this->getHeaders()->get($name)) { + if (!$header = $this->getHeaders()->get($name)) { return $this->setListAddressHeaderBody($name, $addresses); } - $to->addAddresses(Address::createArray($addresses)); + $header->addAddresses(Address::createArray($addresses)); return $this; } @@ -536,8 +536,8 @@ private function setListAddressHeaderBody(string $name, array $addresses) { $addresses = Address::createArray($addresses); $headers = $this->getHeaders(); - if ($to = $headers->get($name)) { - $to->setAddresses($addresses); + if ($header = $headers->get($name)) { + $header->setAddresses($addresses); } else { $headers->addMailboxListHeader($name, $addresses); } diff --git a/src/Symfony/Component/Mime/Header/Headers.php b/src/Symfony/Component/Mime/Header/Headers.php index 1c054e2813c8..9de506e36e8f 100644 --- a/src/Symfony/Component/Mime/Header/Headers.php +++ b/src/Symfony/Component/Mime/Header/Headers.php @@ -13,7 +13,6 @@ use Symfony\Component\Mime\Address; use Symfony\Component\Mime\Exception\LogicException; -use Symfony\Component\Mime\NamedAddress; /** * A collection of headers. @@ -60,7 +59,7 @@ public function getMaxLineLength(): int } /** - * @param (NamedAddress|Address|string)[] $addresses + * @param (Address|string)[] $addresses * * @return $this */ @@ -70,7 +69,7 @@ public function addMailboxListHeader(string $name, array $addresses): self } /** - * @param NamedAddress|Address|string $address + * @param Address|string $address * * @return $this */ diff --git a/src/Symfony/Component/Mime/Header/MailboxHeader.php b/src/Symfony/Component/Mime/Header/MailboxHeader.php index 40e0b54d6571..25dea2b16977 100644 --- a/src/Symfony/Component/Mime/Header/MailboxHeader.php +++ b/src/Symfony/Component/Mime/Header/MailboxHeader.php @@ -13,7 +13,6 @@ use Symfony\Component\Mime\Address; use Symfony\Component\Mime\Exception\RfcComplianceException; -use Symfony\Component\Mime\NamedAddress; /** * A Mailbox MIME Header for something like Sender (one named address). @@ -67,7 +66,7 @@ public function getAddress(): Address public function getBodyAsString(): string { $str = $this->address->getEncodedAddress(); - if ($this->address instanceof NamedAddress && $name = $this->address->getName()) { + if ($name = $this->address->getName()) { $str = $this->createPhrase($this, $name, $this->getCharset(), true).' <'.$str.'>'; } diff --git a/src/Symfony/Component/Mime/Header/MailboxListHeader.php b/src/Symfony/Component/Mime/Header/MailboxListHeader.php index e6c8babf1b19..e58d9d4f0b4a 100644 --- a/src/Symfony/Component/Mime/Header/MailboxListHeader.php +++ b/src/Symfony/Component/Mime/Header/MailboxListHeader.php @@ -13,7 +13,6 @@ use Symfony\Component\Mime\Address; use Symfony\Component\Mime\Exception\RfcComplianceException; -use Symfony\Component\Mime\NamedAddress; /** * A Mailbox list MIME Header for something like From, To, Cc, and Bcc (one or more named addresses). @@ -25,7 +24,7 @@ final class MailboxListHeader extends AbstractHeader private $addresses = []; /** - * @param (NamedAddress|Address)[] $addresses + * @param Address[] $addresses */ public function __construct(string $name, array $addresses) { @@ -35,7 +34,7 @@ public function __construct(string $name, array $addresses) } /** - * @param (NamedAddress|Address)[] $body + * @param Address[] $body * * @throws RfcComplianceException */ @@ -47,7 +46,7 @@ public function setBody($body) /** * @throws RfcComplianceException * - * @return (NamedAddress|Address)[] + * @return Address[] */ public function getBody() { @@ -57,7 +56,7 @@ public function getBody() /** * Sets a list of addresses to be shown in this Header. * - * @param (NamedAddress|Address)[] $addresses + * @param Address[] $addresses * * @throws RfcComplianceException */ @@ -70,7 +69,7 @@ public function setAddresses(array $addresses) /** * Sets a list of addresses to be shown in this Header. * - * @param (NamedAddress|Address)[] $addresses + * @param Address[] $addresses * * @throws RfcComplianceException */ @@ -90,7 +89,7 @@ public function addAddress(Address $address) } /** - * @return (NamedAddress|Address)[] + * @return Address[] */ public function getAddresses(): array { @@ -109,8 +108,8 @@ public function getAddressStrings(): array $strings = []; foreach ($this->addresses as $address) { $str = $address->getEncodedAddress(); - if ($address instanceof NamedAddress && $name = $address->getName()) { - $str = $this->createPhrase($this, $name, $this->getCharset(), empty($strings)).' <'.$str.'>'; + if ($name = $address->getName()) { + $str = $this->createPhrase($this, $name, $this->getCharset(), !$strings).' <'.$str.'>'; } $strings[] = $str; } diff --git a/src/Symfony/Component/Mime/NamedAddress.php b/src/Symfony/Component/Mime/NamedAddress.php deleted file mode 100644 index c6d674f4e5d9..000000000000 --- a/src/Symfony/Component/Mime/NamedAddress.php +++ /dev/null @@ -1,42 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Symfony\Component\Mime; - -/** - * @author Fabien Potencier - */ -final class NamedAddress extends Address -{ - private $name; - - public function __construct(string $address, string $name) - { - parent::__construct($address); - - $this->name = $name; - } - - public function getName(): string - { - return $this->name; - } - - public function getEncodedNamedAddress(): string - { - return ($n = $this->getName()) ? $n.' <'.$this->getEncodedAddress().'>' : $this->getEncodedAddress(); - } - - public function toString(): string - { - return $this->getEncodedNamedAddress(); - } -} diff --git a/src/Symfony/Component/Mime/Tests/AddressTest.php b/src/Symfony/Component/Mime/Tests/AddressTest.php index dd7d3cebf67c..0a4911b9bf6c 100644 --- a/src/Symfony/Component/Mime/Tests/AddressTest.php +++ b/src/Symfony/Component/Mime/Tests/AddressTest.php @@ -13,7 +13,6 @@ use PHPUnit\Framework\TestCase; use Symfony\Component\Mime\Address; -use Symfony\Component\Mime\NamedAddress; class AddressTest extends TestCase { @@ -23,6 +22,12 @@ public function testConstructor() $this->assertEquals('fabien@symfonï.com', $a->getAddress()); $this->assertEquals('fabien@xn--symfon-nwa.com', $a->toString()); $this->assertEquals('fabien@xn--symfon-nwa.com', $a->getEncodedAddress()); + + $a = new Address('fabien@symfonï.com', 'Fabien'); + $this->assertEquals('Fabien', $a->getName()); + $this->assertEquals('fabien@symfonï.com', $a->getAddress()); + $this->assertEquals('Fabien ', $a->toString()); + $this->assertEquals('fabien@xn--symfon-nwa.com', $a->getEncodedAddress()); } public function testConstructorWithInvalidAddress() @@ -34,7 +39,7 @@ public function testConstructorWithInvalidAddress() public function testCreate() { $this->assertSame($a = new Address('fabien@symfony.com'), Address::create($a)); - $this->assertSame($b = new NamedAddress('helene@symfony.com', 'Helene'), Address::create($b)); + $this->assertSame($b = new Address('helene@symfony.com', 'Helene'), Address::create($b)); $this->assertEquals($a, Address::create('fabien@symfony.com')); } @@ -47,7 +52,7 @@ public function testCreateWrongArg() public function testCreateArray() { $fabien = new Address('fabien@symfony.com'); - $helene = new NamedAddress('helene@symfony.com', 'Helene'); + $helene = new Address('helene@symfony.com', 'Helene'); $this->assertSame([$fabien, $helene], Address::createArray([$fabien, $helene])); $this->assertEquals([$fabien], Address::createArray(['fabien@symfony.com'])); diff --git a/src/Symfony/Component/Mime/Tests/EmailTest.php b/src/Symfony/Component/Mime/Tests/EmailTest.php index 764f66b07948..59c7e8948f4a 100644 --- a/src/Symfony/Component/Mime/Tests/EmailTest.php +++ b/src/Symfony/Component/Mime/Tests/EmailTest.php @@ -14,7 +14,6 @@ use PHPUnit\Framework\TestCase; use Symfony\Component\Mime\Address; use Symfony\Component\Mime\Email; -use Symfony\Component\Mime\NamedAddress; use Symfony\Component\Mime\Part\DataPart; use Symfony\Component\Mime\Part\Multipart\AlternativePart; use Symfony\Component\Mime\Part\Multipart\MixedPart; @@ -58,7 +57,7 @@ public function testFrom() { $e = new Email(); $helene = new Address('helene@symfony.com'); - $thomas = new NamedAddress('thomas@symfony.com', 'Thomas'); + $thomas = new Address('thomas@symfony.com', 'Thomas'); $caramel = new Address('caramel@symfony.com'); $this->assertSame($e, $e->from('fabien@symfony.com', $helene, $thomas)); @@ -91,7 +90,7 @@ public function testReplyTo() { $e = new Email(); $helene = new Address('helene@symfony.com'); - $thomas = new NamedAddress('thomas@symfony.com', 'Thomas'); + $thomas = new Address('thomas@symfony.com', 'Thomas'); $caramel = new Address('caramel@symfony.com'); $this->assertSame($e, $e->replyTo('fabien@symfony.com', $helene, $thomas)); @@ -124,7 +123,7 @@ public function testTo() { $e = new Email(); $helene = new Address('helene@symfony.com'); - $thomas = new NamedAddress('thomas@symfony.com', 'Thomas'); + $thomas = new Address('thomas@symfony.com', 'Thomas'); $caramel = new Address('caramel@symfony.com'); $this->assertSame($e, $e->to('fabien@symfony.com', $helene, $thomas)); @@ -157,7 +156,7 @@ public function testCc() { $e = new Email(); $helene = new Address('helene@symfony.com'); - $thomas = new NamedAddress('thomas@symfony.com', 'Thomas'); + $thomas = new Address('thomas@symfony.com', 'Thomas'); $caramel = new Address('caramel@symfony.com'); $this->assertSame($e, $e->cc('fabien@symfony.com', $helene, $thomas)); @@ -190,7 +189,7 @@ public function testBcc() { $e = new Email(); $helene = new Address('helene@symfony.com'); - $thomas = new NamedAddress('thomas@symfony.com', 'Thomas'); + $thomas = new Address('thomas@symfony.com', 'Thomas'); $caramel = new Address('caramel@symfony.com'); $this->assertSame($e, $e->bcc('fabien@symfony.com', $helene, $thomas)); diff --git a/src/Symfony/Component/Mime/Tests/Header/MailboxHeaderTest.php b/src/Symfony/Component/Mime/Tests/Header/MailboxHeaderTest.php index 72f22ff98026..cca27db40883 100644 --- a/src/Symfony/Component/Mime/Tests/Header/MailboxHeaderTest.php +++ b/src/Symfony/Component/Mime/Tests/Header/MailboxHeaderTest.php @@ -14,7 +14,6 @@ use PHPUnit\Framework\TestCase; use Symfony\Component\Mime\Address; use Symfony\Component\Mime\Header\MailboxHeader; -use Symfony\Component\Mime\NamedAddress; class MailboxHeaderTest extends TestCase { @@ -44,17 +43,17 @@ public function testgetBodyAsString() $header->setAddress(new Address('fabien@sïmfony.com')); $this->assertEquals('fabien@xn--smfony-iwa.com', $header->getBodyAsString()); - $header = new MailboxHeader('Sender', new NamedAddress('fabien@symfony.com', 'Fabien Potencier')); + $header = new MailboxHeader('Sender', new Address('fabien@symfony.com', 'Fabien Potencier')); $this->assertEquals('Fabien Potencier ', $header->getBodyAsString()); - $header = new MailboxHeader('Sender', new NamedAddress('fabien@symfony.com', 'Fabien Potencier, "from Symfony"')); + $header = new MailboxHeader('Sender', new Address('fabien@symfony.com', 'Fabien Potencier, "from Symfony"')); $this->assertEquals('"Fabien Potencier, \"from Symfony\"" ', $header->getBodyAsString()); - $header = new MailboxHeader('From', new NamedAddress('fabien@symfony.com', 'Fabien Potencier, \\escaped\\')); + $header = new MailboxHeader('From', new Address('fabien@symfony.com', 'Fabien Potencier, \\escaped\\')); $this->assertEquals('"Fabien Potencier, \\\\escaped\\\\" ', $header->getBodyAsString()); $name = 'P'.pack('C', 0x8F).'tencier'; - $header = new MailboxHeader('Sender', new NamedAddress('fabien@symfony.com', 'Fabien '.$name)); + $header = new MailboxHeader('Sender', new Address('fabien@symfony.com', 'Fabien '.$name)); $header->setCharset('iso-8859-1'); $this->assertEquals('Fabien =?'.$header->getCharset().'?Q?P=8Ftencier?= ', $header->getBodyAsString()); } @@ -71,7 +70,7 @@ public function testToString() $header = new MailboxHeader('Sender', new Address('fabien@symfony.com')); $this->assertEquals('Sender: fabien@symfony.com', $header->toString()); - $header = new MailboxHeader('Sender', new NamedAddress('fabien@symfony.com', 'Fabien Potencier')); + $header = new MailboxHeader('Sender', new Address('fabien@symfony.com', 'Fabien Potencier')); $this->assertEquals('Sender: Fabien Potencier ', $header->toString()); } } diff --git a/src/Symfony/Component/Mime/Tests/Header/MailboxListHeaderTest.php b/src/Symfony/Component/Mime/Tests/Header/MailboxListHeaderTest.php index 2eee1cfa8663..4cace9698ba4 100644 --- a/src/Symfony/Component/Mime/Tests/Header/MailboxListHeaderTest.php +++ b/src/Symfony/Component/Mime/Tests/Header/MailboxListHeaderTest.php @@ -14,7 +14,6 @@ use PHPUnit\Framework\TestCase; use Symfony\Component\Mime\Address; use Symfony\Component\Mime\Header\MailboxListHeader; -use Symfony\Component\Mime\NamedAddress; class MailboxListHeaderTest extends TestCase { @@ -28,7 +27,7 @@ public function testMailboxIsSetForAddress() public function testMailboxIsRenderedForNameAddress() { - $header = new MailboxListHeader('From', [new NamedAddress('chris@swiftmailer.org', 'Chris Corbyn')]); + $header = new MailboxListHeader('From', [new Address('chris@swiftmailer.org', 'Chris Corbyn')]); $this->assertEquals(['Chris Corbyn '], $header->getAddressStrings()); } @@ -40,32 +39,32 @@ public function testAddressCanBeReturnedForAddress() public function testQuotesInNameAreQuoted() { - $header = new MailboxListHeader('From', [new NamedAddress('chris@swiftmailer.org', 'Chris Corbyn, "DHE"')]); + $header = new MailboxListHeader('From', [new Address('chris@swiftmailer.org', 'Chris Corbyn, "DHE"')]); $this->assertEquals(['"Chris Corbyn, \"DHE\"" '], $header->getAddressStrings()); } public function testEscapeCharsInNameAreQuoted() { - $header = new MailboxListHeader('From', [new NamedAddress('chris@swiftmailer.org', 'Chris Corbyn, \\escaped\\')]); + $header = new MailboxListHeader('From', [new Address('chris@swiftmailer.org', 'Chris Corbyn, \\escaped\\')]); $this->assertEquals(['"Chris Corbyn, \\\\escaped\\\\" '], $header->getAddressStrings()); } public function testUtf8CharsInDomainAreIdnEncoded() { - $header = new MailboxListHeader('From', [new NamedAddress('chris@swïftmailer.org', 'Chris Corbyn')]); + $header = new MailboxListHeader('From', [new Address('chris@swïftmailer.org', 'Chris Corbyn')]); $this->assertEquals(['Chris Corbyn '], $header->getAddressStrings()); } public function testUtf8CharsInLocalPartThrows() { $this->expectException('Symfony\Component\Mime\Exception\AddressEncoderException'); - $header = new MailboxListHeader('From', [new NamedAddress('chrïs@swiftmailer.org', 'Chris Corbyn')]); + $header = new MailboxListHeader('From', [new Address('chrïs@swiftmailer.org', 'Chris Corbyn')]); $header->getAddressStrings(); } public function testGetMailboxesReturnsNameValuePairs() { - $header = new MailboxListHeader('From', $addresses = [new NamedAddress('chris@swiftmailer.org', 'Chris Corbyn, DHE')]); + $header = new MailboxListHeader('From', $addresses = [new Address('chris@swiftmailer.org', 'Chris Corbyn, DHE')]); $this->assertEquals($addresses, $header->getAddresses()); } @@ -78,7 +77,7 @@ public function testMultipleAddressesAsMailboxStrings() public function testNameIsEncodedIfNonAscii() { $name = 'C'.pack('C', 0x8F).'rbyn'; - $header = new MailboxListHeader('From', [new NamedAddress('chris@swiftmailer.org', 'Chris '.$name)]); + $header = new MailboxListHeader('From', [new Address('chris@swiftmailer.org', 'Chris '.$name)]); $header->setCharset('iso-8859-1'); $addresses = $header->getAddressStrings(); $this->assertEquals('Chris =?'.$header->getCharset().'?Q?C=8Frbyn?= ', array_shift($addresses)); @@ -92,7 +91,7 @@ public function testEncodingLineLengthCalculations() */ $name = 'C'.pack('C', 0x8F).'rbyn'; - $header = new MailboxListHeader('From', [new NamedAddress('chris@swiftmailer.org', 'Chris '.$name)]); + $header = new MailboxListHeader('From', [new Address('chris@swiftmailer.org', 'Chris '.$name)]); $header->setCharset('iso-8859-1'); $addresses = $header->getAddressStrings(); $this->assertEquals('Chris =?'.$header->getCharset().'?Q?C=8Frbyn?= ', array_shift($addresses)); @@ -100,13 +99,13 @@ public function testEncodingLineLengthCalculations() public function testGetValueReturnsMailboxStringValue() { - $header = new MailboxListHeader('From', [new NamedAddress('chris@swiftmailer.org', 'Chris Corbyn')]); + $header = new MailboxListHeader('From', [new Address('chris@swiftmailer.org', 'Chris Corbyn')]); $this->assertEquals('Chris Corbyn ', $header->getBodyAsString()); } public function testGetValueReturnsMailboxStringValueForMultipleMailboxes() { - $header = new MailboxListHeader('From', [new NamedAddress('chris@swiftmailer.org', 'Chris Corbyn'), new NamedAddress('mark@swiftmailer.org', 'Mark Corbyn')]); + $header = new MailboxListHeader('From', [new Address('chris@swiftmailer.org', 'Chris Corbyn'), new Address('mark@swiftmailer.org', 'Mark Corbyn')]); $this->assertEquals('Chris Corbyn , Mark Corbyn ', $header->getBodyAsString()); } @@ -125,7 +124,7 @@ public function testGetBody() public function testToString() { - $header = new MailboxListHeader('From', [new NamedAddress('chris@example.org', 'Chris Corbyn'), new NamedAddress('mark@example.org', 'Mark Corbyn')]); + $header = new MailboxListHeader('From', [new Address('chris@example.org', 'Chris Corbyn'), new Address('mark@example.org', 'Mark Corbyn')]); $this->assertEquals('From: Chris Corbyn , Mark Corbyn ', $header->toString()); } } diff --git a/src/Symfony/Component/Mime/Tests/MessageTest.php b/src/Symfony/Component/Mime/Tests/MessageTest.php index cc806b919e3f..bd5d7ca8903d 100644 --- a/src/Symfony/Component/Mime/Tests/MessageTest.php +++ b/src/Symfony/Component/Mime/Tests/MessageTest.php @@ -17,7 +17,6 @@ use Symfony\Component\Mime\Header\MailboxListHeader; use Symfony\Component\Mime\Header\UnstructuredHeader; use Symfony\Component\Mime\Message; -use Symfony\Component\Mime\NamedAddress; use Symfony\Component\Mime\Part\TextPart; class MessageTest extends TestCase @@ -94,9 +93,9 @@ public function testGetPreparedHeadersWithNoFrom() public function testGetPreparedHeadersWithNamedFrom() { $message = new Message(); - $message->getHeaders()->addMailboxListHeader('From', [new NamedAddress('fabien@symfony.com', 'Fabien')]); + $message->getHeaders()->addMailboxListHeader('From', [new Address('fabien@symfony.com', 'Fabien')]); $h = $message->getPreparedHeaders(); - $this->assertEquals(new MailboxListHeader('From', [new NamedAddress('fabien@symfony.com', 'Fabien')]), $h->get('From')); + $this->assertEquals(new MailboxListHeader('From', [new Address('fabien@symfony.com', 'Fabien')]), $h->get('From')); $this->assertTrue($h->has('Message-Id')); } diff --git a/src/Symfony/Component/Mime/Tests/NamedAddressTest.php b/src/Symfony/Component/Mime/Tests/NamedAddressTest.php deleted file mode 100644 index 72840191d5af..000000000000 --- a/src/Symfony/Component/Mime/Tests/NamedAddressTest.php +++ /dev/null @@ -1,27 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Symfony\Component\Mime\Tests; - -use PHPUnit\Framework\TestCase; -use Symfony\Component\Mime\NamedAddress; - -class NamedAddressTest extends TestCase -{ - public function testConstructor() - { - $a = new NamedAddress('fabien@symfonï.com', 'Fabien'); - $this->assertEquals('Fabien', $a->getName()); - $this->assertEquals('fabien@symfonï.com', $a->getAddress()); - $this->assertEquals('Fabien ', $a->toString()); - $this->assertEquals('fabien@xn--symfon-nwa.com', $a->getEncodedAddress()); - } -}