fix: mail could have multiple tags

laravel · taylorotwell · Feb 15, 2022 · Feb 15, 2022 · Feb 15, 2022 · Feb 15, 2022
commit e760553e300c975bc6b68919830a578f0fa0d3e3
diff --git a/src/Illuminate/Mail/Mailable.php b/src/Illuminate/Mail/Mailable.php
@@ -172,11 +172,11 @@ class Mailable implements MailableContract, Renderable
     protected $metadata = [];
 
     /**
-     * The tag for the message.
+     * The tags for the message.
      *
-     * @var string
+     * @var array
      */
-    protected $tag;
+    protected $tags = [];
 
     /**
      * The callback that should be invoked while building the view data.
@@ -204,7 +204,7 @@ public function send($mailer)
                 $this->buildFrom($message)
                      ->buildRecipients($message)
                      ->buildSubject($message)
-                     ->buildTag($message)
+                     ->buildTags($message)
                      ->buildMetadata($message)
                      ->runCallbacks($message)
                      ->buildAttachments($message);
@@ -422,15 +422,17 @@ protected function buildSubject($message)
     }
 
     /**
-     * Set the tag for the message.
+     * Set the tags for the message.
      *
      * @param  \Illuminate\Mail\Message  $message
      * @return $this
      */
-    protected function buildTag($message)
+    protected function buildTags($message)
     {
-        if ($this->tag) {
-            $message->getHeaders()->add(new TagHeader($this->tag));
+        if ($this->tags) {
+            foreach ($this->tags as $tag) {
+                $message->getHeaders()->add(new TagHeader($tag));
+            }
         }
 
         return $this;
@@ -932,7 +934,7 @@ public function attachData($data, $name, array $options = [])
      */
     public function tag($value)
     {
-        $this->tag = $value;
+        array_push($this->tags, $value);
         return $this;
     }
 

diff --git a/src/Illuminate/Notifications/Channels/MailChannel.php b/src/Illuminate/Notifications/Channels/MailChannel.php
@@ -146,8 +146,10 @@ protected function buildMessage($mailMessage, $notifiable, $notification, $messa
            $mailMessage->setPriority($message->priority);
         }
 
-        if ($message->tag) {
-            $mailMessage->getHeaders()->add(new TagHeader($this->tag));
+        if ($message->tags) {
+            foreach ($message->tags as $tag) {
+                $mailMessage->getHeaders()->add(new TagHeader($tag));
+            }
         }
 
         if ($message->metadata) {

diff --git a/src/Illuminate/Notifications/Messages/MailMessage.php b/src/Illuminate/Notifications/Messages/MailMessage.php
@@ -104,11 +104,11 @@ class MailMessage extends SimpleMessage implements Renderable
     public $metadata = [];
 
     /**
-     * The tag for the message.
+     * The tags for the message.
      *
-     * @var string
+     * @var array
      */
-    public $tag;
+    public $tags = [];
 
     /**
      * Set the view for the mail message.
@@ -275,7 +275,7 @@ public function attachData($data, $name, array $options = [])
      */
     public function tag($value)
     {
-        $this->tag = $value;
+        array_push($this->tags, $value);
         return $this;
     }
 

diff --git a/tests/Mail/MailMailableTest.php b/tests/Mail/MailMailableTest.php
@@ -479,11 +479,13 @@ public function testMailableTagGetsSent()
         $mailable->html('test content');
 
         $mailable->tag('test');
+        $mailable->tag('foo');
 
         $sentMessage = $mailer->send($mailable);
 
         $this->assertSame('hello@laravel.com', $sentMessage->getEnvelope()->getRecipients()[0]->getAddress());
         $this->assertStringContainsString('X-Tag: test', $sentMessage->toString());
+        $this->assertStringContainsString('X-Tag: foo', $sentMessage->toString());
     }
 }
 

diff --git a/tests/Notifications/NotificationMailMessageTest.php b/tests/Notifications/NotificationMailMessageTest.php
@@ -138,7 +138,7 @@ public function testTagIsSetCorrectly()
         $message = new MailMessage;
         $message->tag('test');
 
-        $this->assertSame('test', $message->tag);
+        $this->assertContains('test', $message->tags);
     }
 
     public function testCallbackIsSetCorrectly()