Adds option to force mailer from mailable

src/Mail/Mailable.php

@@ -20,6 +20,11 @@ class Mailable extends MailableBase
      */
     public $siteContext;
 
+    /**
+     * @var string forceMailer forces the mailer to use.
+     */
+    public $forceMailer;
+
     /**
      * Build the message.
      *
@@ -110,4 +115,29 @@ public function withLocale($locale, $callback)
             return parent::withLocale($locale, $callback);
         });
     }
+
+    /**
+     * forceMailer forces sending using a different mail driver, useful if lazy loading
+     * the mail driver configuration for multisite.
+     * @param  string  $mailer
+     * @return $this
+     */
+    public function forceMailer($mailer)
+    {
+        $this->forceMailer = $mailer;
+
+        return $this;
+    }
+
+    /**
+     * mailer sets the name of the mailer that should send the message.
+     * @param  string  $mailer
+     * @return $this
+     */
+    public function mailer($mailer)
+    {
+        $this->mailer = $this->forceMailer ?: $mailer;
+
+        return $this;
+    }
 }

src/Mail/Mailer.php

@@ -89,27 +89,27 @@ public function send($view, array $data = [], $callback = null)
             $this->setGlobalToAndRemoveCcAndBcc($message);
         }
 
-         /**
-          * @event mailer.prepareSend
-          * Fires before the mailer processes the sending action
-          *
-          * Parameters:
-          * - $view: View code as a string
-          * - $message: Illuminate\Mail\Message object, check Swift_Mime_SimpleMessage for useful functions.
-          *
-          * Example usage (stops the sending process):
-          *
-          *     Event::listen('mailer.prepareSend', function ((\October\Rain\Mail\Mailer) $mailerInstance, (string) $view, (\Illuminate\Mail\Message) $message) {
-          *         return false;
-          *     });
-          *
-          * Or
-          *
-          *     $mailerInstance->bindEvent('mailer.prepareSend', function ((string) $view, (\Illuminate\Mail\Message) $message) {
-          *         return false;
-          *     });
-          *
-          */
+        /**
+         * @event mailer.prepareSend
+         * Fires before the mailer processes the sending action
+         *
+         * Parameters:
+         * - $view: View code as a string
+         * - $message: Illuminate\Mail\Message object, check Swift_Mime_SimpleMessage for useful functions.
+         *
+         * Example usage (stops the sending process):
+         *
+         *     Event::listen('mailer.prepareSend', function ((\October\Rain\Mail\Mailer) $mailerInstance, (string) $view, (\Illuminate\Mail\Message) $message) {
+         *         return false;
+         *     });
+         *
+         * Or
+         *
+         *     $mailerInstance->bindEvent('mailer.prepareSend', function ((string) $view, (\Illuminate\Mail\Message) $message) {
+         *         return false;
+         *     });
+         *
+         */
         if (
             ($this->fireEvent('mailer.prepareSend', [$view, $message], true) === false) ||
             (Event::fire('mailer.prepareSend', [$this, $view, $message], true) === false)
@@ -300,6 +300,20 @@ protected function buildQueueMailable($view, $data, $callback, $queue)
             call_user_func($callback, $mailable);
         }
 
+        /**
+         * @event mailer.buildQueueMailable
+         * Process the mailable object used when adding mail to the queue
+         *
+         * Example usage:
+         *
+         *     Event::listen('mailer.buildQueueMailable', function ((\October\Rain\Mail\Mailer) $mailerInstance, (\October\Rain\Mail\Mailable) $mailable) {
+         *         $mailable->mailer('smtp');
+         *     });
+         *
+         */
+        $this->fireEvent('mailer.buildQueueMailable', [$mailable]);
+        Event::fire('mailer.buildQueueMailable', [$this, $mailable]);
+
         return $mailable;
     }