minor #32002 [Mailer] made code more robust (fabpot)

fabpot · fabpot · commit 41ff9d31d42b · 2019-06-12T16:08:31.000+02:00
This PR was merged into the 4.3 branch. Discussion ---------- [Mailer] made code more robust | Q | A | ------------- | --- | Branch? | 4.3 | Bug fix? | yes | New feature? | no  | BC breaks? | no  | Deprecations? | no  | Tests pass? | yes  | Fixed tickets | n/a | License | MIT | Doc PR | n/a  Commits ------- 8bdc659 [Mailer] made code more robust
diff --git a/src/Symfony/Component/Mailer/SmtpEnvelope.php b/src/Symfony/Component/Mailer/SmtpEnvelope.php
@@ -13,7 +13,6 @@
 
 use Symfony\Component\Mailer\Exception\InvalidArgumentException;
 use Symfony\Component\Mime\Address;
-use Symfony\Component\Mime\NamedAddress;
 use Symfony\Component\Mime\RawMessage;
 
 /**
@@ -42,14 +41,17 @@ public static function create(RawMessage $message): self
 
     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
     {
         return $this->sender;
     }
 
+    /**
+     * @param Address[] $recipients
+     */
     public function setRecipients(array $recipients): void
     {
         if (!$recipients) {
@@ -58,12 +60,10 @@ public function setRecipients(array $recipients): void
 
         $this->recipients = [];
         foreach ($recipients as $recipient) {
-            if ($recipient instanceof NamedAddress) {
-                $recipient = new Address($recipient->getAddress());
-            } elseif (!$recipient instanceof Address) {
+            if (!$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)));
             }
-            $this->recipients[] = $recipient;
+            $this->recipients[] = new Address($recipient->getAddress());
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,6 @@`
`13`	`13`
`14`	`14`	`use Symfony\Component\Mailer\Exception\InvalidArgumentException;`
`15`	`15`	`use Symfony\Component\Mime\Address;`
`16`		`-use Symfony\Component\Mime\NamedAddress;`
`17`	`16`	`use Symfony\Component\Mime\RawMessage;`
`18`	`17`
`19`	`18`	`/**`
`@@ -42,14 +41,17 @@ public static function create(RawMessage $message): self`
`42`	`41`
`43`	`42`	`public function setSender(Address $sender): void`
`44`	`43`	`{`
`45`		`- $this->sender = $sender instanceof NamedAddress ? new Address($sender->getAddress()) : $sender;`
	`44`	`+ $this->sender = new Address($sender->getAddress());`
`46`	`45`	`}`
`47`	`46`
`48`	`47`	`public function getSender(): Address`
`49`	`48`	`{`
`50`	`49`	`return $this->sender;`
`51`	`50`	`}`
`52`	`51`
	`52`	`+ /**`
	`53`	`+ * @param Address[] $recipients`
	`54`	`+ */`
`53`	`55`	`public function setRecipients(array $recipients): void`
`54`	`56`	`{`
`55`	`57`	`if (!$recipients) {`
`@@ -58,12 +60,10 @@ public function setRecipients(array $recipients): void`
`58`	`60`
`59`	`61`	`$this->recipients = [];`
`60`	`62`	`foreach ($recipients as $recipient) {`
`61`		`- if ($recipient instanceof NamedAddress) {`
`62`		`- $recipient = new Address($recipient->getAddress());`
`63`		`- } elseif (!$recipient instanceof Address) {`
	`63`	`+ if (!$recipient instanceof Address) {`
`64`	`64`	`throw new InvalidArgumentException(sprintf('A recipient must be an instance of "%s" (got "%s").', Address::class, \is_object($recipient) ? \get_class($recipient) : \gettype($recipient)));`
`65`	`65`	`}`
`66`		`- $this->recipients[] = $recipient;`
	`66`	`+ $this->recipients[] = new Address($recipient->getAddress());`
`67`	`67`	`}`
`68`	`68`	`}`
`69`	`69`