[5.3] Ability to set from address in mail notifications

src/Illuminate/Notifications/Channels/MailChannel.php

@@ -50,6 +50,10 @@ public function send($notifiable, Notification $notification)
                 $m->to($recipients);
             }
 
+            if (! empty($message->from)) {
+                $m->from($message->from[0], isset($message->from[1]) ? $message->from[1] : null);
+            }
+
             $m->subject($message->subject ?: Str::title(
                 Str::snake(class_basename($notification), ' ')
             ));

src/Illuminate/Notifications/Messages/MailMessage.php

@@ -11,6 +11,13 @@ class MailMessage extends SimpleMessage
      */
     public $view = 'notifications::email';
 
+    /**
+     * The from address for the message.
+     *
+     * @var array
+     */
+    public $from = [];
+
     /**
      * The view data for the message.
      *
@@ -47,6 +54,19 @@ public function view($view, array $data = [])
         return $this;
     }
 
+    /**
+     * Set the from address for the mail message.
+     *
+     * @param  string  $address
+     * @return $this
+     */
+    public function from($address, $name = null)
+    {
+        $this->from = [$address, $name];
+
+        return $this;
+    }
+
     /**
      * Attach a file to the message.
      *

tests/Notifications/NotificationMailChannelTest.php

@@ -26,6 +26,149 @@ public function testMailIsSentByChannel()
 
         $channel->send($notifiable, $notification);
     }
+
+    public function testMessageWithSubject()
+    {
+        $notification = new NotificationMailChannelTestNotification;
+        $notifiable = new NotificationMailChannelTestNotifiable;
+
+        $message = $notification->toMail($notifiable);
+        $data = $message->toArray();
+
+        $channel = new Illuminate\Notifications\Channels\MailChannel(
+            $mailer = Mockery::mock(Illuminate\Contracts\Mail\Mailer::class)
+        );
+
+        $mailer->shouldReceive('send')->with('notifications::email', $data, Mockery::on(function ($closure) {
+            $mock = Mockery::mock('Illuminate\Mailer\Message');
+
+            $mock->shouldReceive('subject')->once()->with('test subject');
+
+            $mock->shouldReceive('to')->once()->with('[email protected]');
+
+            $mock->shouldReceive('from')->never();
+
+            $closure($mock);
+
+            return true;
+        }));
+
+        $channel->send($notifiable, $notification);
+    }
+
+    public function testMessageWithoutSubjectAutogeneratesSubjectFromClassName()
+    {
+        $notification = new NotificationMailChannelTestNotificationNoSubject;
+        $notifiable = new NotificationMailChannelTestNotifiable;
+
+        $message = $notification->toMail($notifiable);
+        $data = $message->toArray();
+
+        $channel = new Illuminate\Notifications\Channels\MailChannel(
+            $mailer = Mockery::mock(Illuminate\Contracts\Mail\Mailer::class)
+        );
+
+        $mailer->shouldReceive('send')->with('notifications::email', $data, Mockery::on(function ($closure) {
+            $mock = Mockery::mock('Illuminate\Mailer\Message');
+
+            $mock->shouldReceive('subject')->once()->with('Notification Mail Channel Test Notification No Subject');
+
+            $mock->shouldReceive('to')->once()->with('[email protected]');
+
+            $closure($mock);
+
+            return true;
+        }));
+
+        $channel->send($notifiable, $notification);
+    }
+
+    public function testMessageWithMultipleSenders()
+    {
+        $notification = new NotificationMailChannelTestNotification;
+        $notifiable = new NotificationMailChannelTestNotifiableMultipleEmails;
+
+        $message = $notification->toMail($notifiable);
+        $data = $message->toArray();
+
+        $channel = new Illuminate\Notifications\Channels\MailChannel(
+            $mailer = Mockery::mock(Illuminate\Contracts\Mail\Mailer::class)
+        );
+
+        $mailer->shouldReceive('send')->with('notifications::email', $data, Mockery::on(function ($closure) {
+            $mock = Mockery::mock('Illuminate\Mailer\Message');
+
+            $mock->shouldReceive('subject')->once();
+
+            $mock->shouldReceive('to')->never();
+
+            $mock->shouldReceive('bcc')->with(['[email protected]', '[email protected]']);
+
+            $closure($mock);
+
+            return true;
+        }));
+
+        $channel->send($notifiable, $notification);
+    }
+
+    public function testMessageWithFromAddress()
+    {
+        $notification = new NotificationMailChannelTestNotificationWithFromAddress;
+        $notifiable = new NotificationMailChannelTestNotifiable;
+
+        $message = $notification->toMail($notifiable);
+        $data = $message->toArray();
+
+        $channel = new Illuminate\Notifications\Channels\MailChannel(
+            $mailer = Mockery::mock(Illuminate\Contracts\Mail\Mailer::class)
+        );
+
+        $mailer->shouldReceive('send')->with('notifications::email', $data, Mockery::on(function ($closure) {
+            $mock = Mockery::mock('Illuminate\Mailer\Message');
+
+            $mock->shouldReceive('subject')->once();
+
+            $mock->shouldReceive('to')->once();
+
+            $mock->shouldReceive('from')->with('[email protected]', 'Test Man');
+
+            $closure($mock);
+
+            return true;
+        }));
+
+        $channel->send($notifiable, $notification);
+    }
+
+    public function testMessageWithFromAddressAndNoName()
+    {
+        $notification = new NotificationMailChannelTestNotificationWithFromAddressNoName;
+        $notifiable = new NotificationMailChannelTestNotifiable;
+
+        $message = $notification->toMail($notifiable);
+        $data = $message->toArray();
+
+        $channel = new Illuminate\Notifications\Channels\MailChannel(
+            $mailer = Mockery::mock(Illuminate\Contracts\Mail\Mailer::class)
+        );
+
+        $mailer->shouldReceive('send')->with('notifications::email', $data, Mockery::on(function ($closure) {
+            $mock = Mockery::mock('Illuminate\Mailer\Message');
+
+            $mock->shouldReceive('subject')->once();
+
+            $mock->shouldReceive('to')->once();
+
+            $mock->shouldReceive('from')->with('[email protected]', null);
+
+            $closure($mock);
+
+            return true;
+        }));
+
+        $channel->send($notifiable, $notification);
+    }
 }
 
 class NotificationMailChannelTestNotifiable
@@ -35,10 +178,47 @@ class NotificationMailChannelTestNotifiable
     public $email = '[email protected]';
 }
 
+class NotificationMailChannelTestNotifiableMultipleEmails
+{
+    use Illuminate\Notifications\Notifiable;
+
+    public function routeNotificationForMail()
+    {
+        return ['[email protected]', '[email protected]'];
+    }
+}
+
 class NotificationMailChannelTestNotification extends Notification
+{
+    public function toMail($notifiable)
+    {
+        return (new MailMessage)
+            ->subject('test subject');
+    }
+}
+
+class NotificationMailChannelTestNotificationNoSubject extends Notification
 {
     public function toMail($notifiable)
     {
         return new MailMessage;
     }
 }
+
+class NotificationMailChannelTestNotificationWithFromAddress extends Notification
+{
+    public function toMail($notifiable)
+    {
+        return (new MailMessage)
+            ->from('[email protected]', 'Test Man');
+    }
+}
+
+class NotificationMailChannelTestNotificationWithFromAddressNoName extends Notification
+{
+    public function toMail($notifiable)
+    {
+        return (new MailMessage)
+            ->from('[email protected]');
+    }
+}