diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Mailer] made code more robust

Browse Source
This commit is contained in:
Fabien Potencier 2019-06-12 06:53:11 +02:00
parent ac1a660130
commit 8bdc6596ef
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Symfony/Component/Mailer/SmtpEnvelope.php
View File

@ -13,7 +13,6 @@ namespace Symfony\Component\Mailer;
use Symfony\Component\Mailer\Exception\InvalidArgumentException; use Symfony\Component\Mailer\Exception\InvalidArgumentException;
use Symfony\Component\Mime\Address; use Symfony\Component\Mime\Address;
use Symfony\Component\Mime\NamedAddress;
use Symfony\Component\Mime\RawMessage; use Symfony\Component\Mime\RawMessage;
/** /**
@ -42,7 +41,7 @@ class SmtpEnvelope
public function setSender(Address $sender): void public function setSender(Address $sender): void
{ {
$this->sender = $sender instanceof NamedAddress ? new Address($sender->getAddress()) : $sender; $this->sender = new Address($sender->getAddress());
} }
public function getSender(): Address public function getSender(): Address
@ -50,6 +49,9 @@ class SmtpEnvelope
return $this->sender; return $this->sender;
} }
/**
* @param Address[] $recipients
*/
public function setRecipients(array $recipients): void public function setRecipients(array $recipients): void
{ {
if (!$recipients) { if (!$recipients) {
@ -58,12 +60,10 @@ class SmtpEnvelope
$this->recipients = []; $this->recipients = [];
foreach ($recipients as $recipient) { foreach ($recipients as $recipient) {
if ($recipient instanceof NamedAddress) { if (!$recipient instanceof Address) {
$recipient = new Address($recipient->getAddress());
} elseif (!$recipient instanceof Address) {
throw new InvalidArgumentException(sprintf('A recipient must be an instance of "%s" (got "%s").', Address::class, \is_object($recipient) ? \get_class($recipient) : \gettype($recipient))); throw new InvalidArgumentException(sprintf('A recipient must be an instance of "%s" (got "%s").', Address::class, \is_object($recipient) ? \get_class($recipient) : \gettype($recipient)));
} }
$this->recipients[] = $recipient; $this->recipients[] = new Address($recipient->getAddress());
} }
} }