Message and Notifiable should be able to handle Mailable.

Signed-off-by: crynobone <crynobone@gmail.com>
orchestral · Jul 28, 2016 · 09de6f3 · 09de6f3
1 parent 25013cd
commit 09de6f3
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/src/Message.php b/src/Message.php
@@ -4,6 +4,7 @@
 
 use Illuminate\Support\Arr;
 use Illuminate\Support\Fluent;
+use Illuminate\Contracts\Mail\Mailable as MailableContract;
 use Orchestra\Contracts\Notification\Message as MessageContract;
 
 class Message extends Fluent implements MessageContract
@@ -55,4 +56,16 @@ public function getView()
     {
         return Arr::get($this->attributes, 'view');
     }
+
+    /**
+     * Is message mailable.
+     *
+     * @return bool
+     */
+    public function mailable()
+    {
+        $view = $this->getView();
+
+        return ($view instanceof MailableContract);
+    }
 }
diff --git a/src/Notifiable.php b/src/Notifiable.php
@@ -40,14 +40,18 @@ protected function sendNotifications(Collection $users, $subject, $view = null,
      */
     protected function sendNotification(Recipient $user, $subject, $view = null, array $data = [])
     {
-        $entity = $user;
-
         if ($subject instanceof MessageContract) {
-            $data    = $subject->getData();
+            if ($subject->mailable()) {
+                return Notifier::send($user, $subject);
+            }
+
             $view    = $subject->getView();
+            $data    = $subject->getData();
             $subject = $subject->getSubject();
         }
 
+        $entity  = $user;
+
         if ($user instanceof Arrayable) {
             $entity = $user->toArray();
         }