[5.8] Use Mailable contract instead of class

src/Illuminate/Mail/PendingMail.php

@@ -3,14 +3,16 @@
 namespace Illuminate\Mail;
 
 use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Contracts\Mail\Mailer as MailerContract;
 use Illuminate\Contracts\Translation\HasLocalePreference;
+use Illuminate\Contracts\Mail\Mailable as MailableContract;
 
 class PendingMail
 {
     /**
      * The mailer instance.
      *
-     * @var \Illuminate\Mail\Mailer
+     * @var\Illuminate\Contracts\Mail\Mailer  $mailer
      */
     protected $mailer;
 
@@ -45,10 +47,10 @@ class PendingMail
     /**
      * Create a new mailable mailer instance.
      *
-     * @param  \Illuminate\Mail\Mailer  $mailer
+     * @param  \Illuminate\Contracts\Mail\Mailer  $mailer
      * @return void
      */
-    public function __construct(Mailer $mailer)
+    public function __construct(MailerContract $mailer)
     {
         $this->mailer = $mailer;
     }
@@ -112,10 +114,11 @@ public function bcc($users)
     /**
      * Send a new mailable message instance.
      *
-     * @param  \Illuminate\Mail\Mailable  $mailable
+     * @param  \Illuminate\Contracts\Mail\Mailable  $mailable
+     *
      * @return mixed
      */
-    public function send(Mailable $mailable)
+    public function send(MailableContract $mailable)
     {
         if ($mailable instanceof ShouldQueue) {
             return $this->queue($mailable);
@@ -127,21 +130,21 @@ public function send(Mailable $mailable)
     /**
      * Send a mailable message immediately.
      *
-     * @param  \Illuminate\Mail\Mailable  $mailable
+     * @param  \Illuminate\Contracts\Mail\Mailable $mailable;
      * @return mixed
      */
-    public function sendNow(Mailable $mailable)
+    public function sendNow(MailableContract $mailable)
     {
         return $this->mailer->send($this->fill($mailable));
     }
 
     /**
      * Push the given mailable onto the queue.
      *
-     * @param  \Illuminate\Mail\Mailable  $mailable
+     * @param  \Illuminate\Contracts\Mail\Mailable $mailable;
      * @return mixed
      */
-    public function queue(Mailable $mailable)
+    public function queue(MailableContract $mailable)
     {
         $mailable = $this->fill($mailable);
 
@@ -156,21 +159,21 @@ public function queue(Mailable $mailable)
      * Deliver the queued message after the given delay.
      *
      * @param  \DateTimeInterface|\DateInterval|int  $delay
-     * @param  \Illuminate\Mail\Mailable  $mailable
+     * @param  \Illuminate\Contracts\Mail\Mailable $mailable;
      * @return mixed
      */
-    public function later($delay, Mailable $mailable)
+    public function later($delay, MailableContract $mailable)
     {
         return $this->mailer->later($delay, $this->fill($mailable));
     }
 
     /**
      * Populate the mailable with the addresses.
      *
-     * @param  \Illuminate\Mail\Mailable  $mailable
+     * @param  \Illuminate\Contracts\Mail\Mailable $mailable;
      * @return \Illuminate\Mail\Mailable
      */
-    protected function fill(Mailable $mailable)
+    protected function fill(MailableContract $mailable)
     {
         return $mailable->to($this->to)
                         ->cc($this->cc)

src/Illuminate/Mail/SendQueuedMailable.php

@@ -10,7 +10,7 @@ class SendQueuedMailable
     /**
      * The mailable message instance.
      *
-     * @var \Illuminate\Mail\Mailable
+     * @var \Illuminate\Contracts\Mail\Mailable
      */
     public $mailable;
 

src/Illuminate/Support/Testing/Fakes/PendingMailFake.php

@@ -2,8 +2,8 @@
 
 namespace Illuminate\Support\Testing\Fakes;
 
-use Illuminate\Mail\Mailable;
 use Illuminate\Mail\PendingMail;
+use Illuminate\Contracts\Mail\Mailable;
 
 class PendingMailFake extends PendingMail
 {
@@ -21,7 +21,7 @@ public function __construct($mailer)
     /**
      * Send a new mailable message instance.
      *
-     * @param  \Illuminate\Mail\Mailable $mailable
+     * @param  \Illuminate\Contracts\Mail\Mailable $mailable;
      * @return mixed
      */
     public function send(Mailable $mailable)
@@ -32,7 +32,7 @@ public function send(Mailable $mailable)
     /**
      * Send a mailable message immediately.
      *
-     * @param  \Illuminate\Mail\Mailable $mailable
+     * @param  \Illuminate\Contracts\Mail\Mailable $mailable;
      * @return mixed
      */
     public function sendNow(Mailable $mailable)
@@ -43,7 +43,7 @@ public function sendNow(Mailable $mailable)
     /**
      * Push the given mailable onto the queue.
      *
-     * @param  \Illuminate\Mail\Mailable $mailable
+     * @param  \Illuminate\Contracts\Mail\Mailable $mailable;
      * @return mixed
      */
     public function queue(Mailable $mailable)

tests/Support/SupportTestingMailFakeTest.php

@@ -9,6 +9,7 @@
 use PHPUnit\Framework\ExpectationFailedException;
 use PHPUnit\Framework\Constraint\ExceptionMessage;
 use Illuminate\Contracts\Translation\HasLocalePreference;
+use Illuminate\Contracts\Mail\Mailable as MailableContract;
 
 class SupportTestingMailFakeTest extends TestCase
 {
@@ -141,7 +142,7 @@ public function testAssertNothingSent()
     }
 }
 
-class MailableStub extends Mailable
+class MailableStub extends Mailable implements MailableContract
 {
     public $framework = 'Laravel';