[Mailer] made code more robust

fabpot · fabpot · commit b12dcb22fa44 · 2019-06-12T06:53:11.000+02:00
diff --git a/src/Symfony/Component/Mailer/SmtpEnvelope.php b/src/Symfony/Component/Mailer/SmtpEnvelope.php
@@ -42,14 +42,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 +61,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
`@@ -42,14 +42,17 @@ public static function create(RawMessage $message): self`
`42`	`42`
`43`	`43`	`public function setSender(Address $sender): void`
`44`	`44`	`{`
`45`		`- $this->sender = $sender instanceof NamedAddress ? new Address($sender->getAddress()) : $sender;`
	`45`	`+ $this->sender = new Address($sender->getAddress());`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`public function getSender(): Address`
`49`	`49`	`{`
`50`	`50`	`return $this->sender;`
`51`	`51`	`}`
`52`	`52`
	`53`	`+ /**`
	`54`	`+ * @param Address[] $recipients`
	`55`	`+ */`
`53`	`56`	`public function setRecipients(array $recipients): void`
`54`	`57`	`{`
`55`	`58`	`if (!$recipients) {`
`@@ -58,12 +61,10 @@ public function setRecipients(array $recipients): void`
`58`	`61`
`59`	`62`	`$this->recipients = [];`
`60`	`63`	`foreach ($recipients as $recipient) {`
`61`		`- if ($recipient instanceof NamedAddress) {`
`62`		`- $recipient = new Address($recipient->getAddress());`
`63`		`- } elseif (!$recipient instanceof Address) {`
	`64`	`+ if (!$recipient instanceof Address) {`
`64`	`65`	`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`	`66`	`}`
`66`		`- $this->recipients[] = $recipient;`
	`67`	`+ $this->recipients[] = new Address($recipient->getAddress());`
`67`	`68`	`}`
`68`	`69`	`}`
`69`	`70`