[7.x] Add plain mail to notifications

src/Illuminate/Notifications/Channels/MailChannel.php

@@ -90,7 +90,10 @@ protected function messageBuilder($notifiable, $notification, $message)
     protected function buildView($message)
     {
         if ($message->view) {
-            return $message->view;
+            return [
+                'html' => $message->view,
+                'text' => $message->textView,
+            ];
         }
 
         if (property_exists($message, 'theme') && ! is_null($message->theme)) {
@@ -115,7 +118,8 @@ protected function additionalMessageData($notification)
             '__laravel_notification_id' => $notification->id,
             '__laravel_notification' => get_class($notification),
             '__laravel_notification_queued' => in_array(
-                ShouldQueue::class, class_implements($notification)
+                ShouldQueue::class,
+                class_implements($notification)
             ),
         ];
     }

src/Illuminate/Notifications/Messages/MailMessage.php

@@ -17,6 +17,13 @@ class MailMessage extends SimpleMessage implements Renderable
      */
     public $view;
 
+    /**
+     * The plain text view to use for the message.
+     *
+     * @var string
+     */
+    public $textView;
+
     /**
      * The view data for the message.
      *
@@ -104,13 +111,28 @@ class MailMessage extends SimpleMessage implements Renderable
     public function view($view, array $data = [])
     {
         $this->view = $view;
-        $this->viewData = $data;
+        $this->viewData = array_merge($this->viewData, $data);
 
         $this->markdown = null;
 
         return $this;
     }
 
+    /**
+     * Set the plain text view for the message.
+     *
+     * @param  string  $textView
+     * @param  array  $data
+     * @return $this
+     */
+    public function text($textView, array $data = [])
+    {
+        $this->textView = $textView;
+        $this->viewData = array_merge($this->viewData, $data);
+
+        return $this;
+    }
+
     /**
      * Set the Markdown template for the notification.
      *
@@ -311,7 +333,8 @@ public function render()
     {
         if (isset($this->view)) {
             return Container::getInstance()->make('mailer')->render(
-                $this->view, $this->data()
+                [$this->view, $this->textView],
+                $this->data()
             );
         }
 

tests/Integration/Notifications/Fixtures/html.blade.php

@@ -0,0 +1 @@
+htmlContent

tests/Integration/Notifications/Fixtures/plain.blade.php

@@ -0,0 +1 @@
+plainContent

tests/Integration/Notifications/SendingMailNotificationsTest.php

@@ -14,6 +14,7 @@
 use Illuminate\Notifications\Notifiable;
 use Illuminate\Notifications\Notification;
 use Illuminate\Support\Facades\Schema;
+use Illuminate\Support\Facades\View;
 use Illuminate\Support\Str;
 use Mockery as m;
 use Orchestra\Testbench\TestCase;
@@ -61,6 +62,8 @@ protected function getEnvironmentSetUp($app)
         $app->extend(MailFactory::class, function () {
             return $this->mailFactory;
         });
+
+        View::addLocation(__DIR__.'/Fixtures');
     }
 
     protected function setUp(): void
@@ -245,6 +248,38 @@ public function testMailIsSentUsingMailable()
 
         $user->notify($notification);
     }
+
+    public function testMailIsSentUsingMailMessageWithPlain()
+    {
+        $notification = new TestMailNotificationWithPlain;
+        $notification->id = Str::uuid()->toString();
+
+        $user = NotifiableUser::forceCreate([
+            'email' => '[email protected]',
+        ]);
+
+        $this->mailer->shouldReceive('send')->once()->with(
+            ['html' => 'html', 'text' => 'plain'],
+            array_merge($notification->toMail($user)->toArray(), [
+                '__laravel_notification_id' => $notification->id,
+                '__laravel_notification' => get_class($notification),
+                '__laravel_notification_queued' => false,
+            ]),
+            m::on(function ($closure) {
+                $message = m::mock(Message::class);
+
+                $message->shouldReceive('to')->once()->with(['[email protected]']);
+
+                $message->shouldReceive('subject')->once()->with('Test Mail Notification With Plain');
+
+                $closure($message);
+
+                return true;
+            })
+        );
+
+        $user->notify($notification);
+    }
 }
 
 class NotifiableUser extends Model
@@ -328,3 +363,18 @@ public function toMail($notifiable)
         return $mailable;
     }
 }
+
+class TestMailNotificationWithPlain extends Notification
+{
+    public function via($notifiable)
+    {
+        return [MailChannel::class];
+    }
+
+    public function toMail($notifiable)
+    {
+        return (new MailMessage)
+            ->view('html')
+            ->text('plain');
+    }
+}

tests/Notifications/NotificationMailMessageTest.php

@@ -17,6 +17,36 @@ public function testTemplate()
 
         $this->assertSame('notifications::foo', $message->markdown);
     }
+    public function testHtmlView()
+    {
+        $message = new MailMessage;
+
+        $this->assertSame(null, $message->view);
+        $this->assertSame([], $message->viewData);
+
+        $message->view('notifications::foo', [
+            'foo' => 'bar',
+        ]);
+
+        $this->assertSame('notifications::foo', $message->view);
+        $this->assertSame(['foo' => 'bar'], $message->viewData);
+    }
+
+    public function testPlainView()
+    {
+        $message = new MailMessage;
+
+        $this->assertSame(null, $message->textView);
+        $this->assertSame([], $message->viewData);
+
+        $message->text('notifications::foo', [
+            'foo' => 'bar',
+        ]);
+
+        $this->assertSame('notifications::foo', $message->textView);
+        $this->assertSame(['foo' => 'bar'], $message->viewData);
+    }
+
 
     public function testCcIsSetCorrectly()
     {