Merge pull request #29132 from troccoli/add-template-theme-to-mail-no…

…tifications

[5.8] Add template theme to mail notifications

src/Illuminate/Notifications/Channels/MailChannel.php

@@ -93,6 +93,10 @@ protected function buildView($message)
             return $message->view;
         }
 
+        if (property_exists($message, 'theme') && ! is_null($message->theme)) {
+            $this->markdown->theme($message->theme);
+        }
+
         return [
             'html' => $this->markdown->render($message->markdown, $message->data()),
             'text' => $this->markdown->renderText($message->markdown, $message->data()),

src/Illuminate/Notifications/Messages/MailMessage.php

@@ -31,6 +31,13 @@ class MailMessage extends SimpleMessage implements Renderable
      */
     public $markdown = 'notifications::email';
 
+    /**
+     * The current theme being used when generating emails.
+     *
+     * @var string|null
+     */
+    public $theme = 'default';
+
     /**
      * The "from" information for the message.
      *
@@ -134,6 +141,19 @@ public function template($template)
         return $this;
     }
 
+    /**
+     * Set the theme to use with the markdown template.
+     *
+     * @param  string  $theme
+     * @return $this
+     */
+    public function theme($theme)
+    {
+        $this->theme = $theme;
+
+        return $this;
+    }
+
     /**
      * Set the from address for the mail message.
      *

tests/Integration/Notifications/SendingMailNotificationsTest.php

@@ -74,6 +74,7 @@ public function test_mail_is_sent()
             'email' => '[email protected]',
         ]);
 
+        $this->markdown->shouldReceive('theme')->once()->andReturnSelf();
         $this->markdown->shouldReceive('render')->once()->andReturn('htmlContent');
         $this->markdown->shouldReceive('renderText')->once()->andReturn('textContent');
 
@@ -118,6 +119,7 @@ public function test_mail_is_sent_to_named_address()
             'name' => 'Taylor Otwell',
         ]);
 
+        $this->markdown->shouldReceive('theme')->once()->andReturnSelf();
         $this->markdown->shouldReceive('render')->once()->andReturn('htmlContent');
         $this->markdown->shouldReceive('renderText')->once()->andReturn('textContent');
 
@@ -161,6 +163,7 @@ public function test_mail_is_sent_with_subject()
             'email' => '[email protected]',
         ]);
 
+        $this->markdown->shouldReceive('theme')->once()->andReturnSelf();
         $this->markdown->shouldReceive('render')->once()->andReturn('htmlContent');
         $this->markdown->shouldReceive('renderText')->once()->andReturn('textContent');
 
@@ -194,6 +197,7 @@ public function test_mail_is_sent_to_multiple_adresses()
             'email' => '[email protected]',
         ]);
 
+        $this->markdown->shouldReceive('theme')->once()->andReturnSelf();
         $this->markdown->shouldReceive('render')->once()->andReturn('htmlContent');
         $this->markdown->shouldReceive('renderText')->once()->andReturn('textContent');