diff --git a/src/Illuminate/Mail/PendingMail.php b/src/Illuminate/Mail/PendingMail.php index 2f8e4bb839d7..abf05be348e6 100644 --- a/src/Illuminate/Mail/PendingMail.php +++ b/src/Illuminate/Mail/PendingMail.php @@ -2,8 +2,6 @@ namespace Illuminate\Mail; -use Illuminate\Contracts\Mail\Mailable as MailableContract; -use Illuminate\Contracts\Mail\Mailer as MailerContract; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Contracts\Translation\HasLocalePreference; @@ -12,7 +10,7 @@ class PendingMail /** * The mailer instance. * - * @var \Illuminate\Contracts\Mail\Mailer + * @var \Illuminate\Mail\Mailer */ protected $mailer; @@ -47,10 +45,10 @@ class PendingMail /** * Create a new mailable mailer instance. * - * @param \Illuminate\Contracts\Mail\Mailer $mailer + * @param \Illuminate\Mail\Mailer $mailer * @return void */ - public function __construct(MailerContract $mailer) + public function __construct(Mailer $mailer) { $this->mailer = $mailer; } @@ -114,11 +112,11 @@ public function bcc($users) /** * Send a new mailable message instance. * - * @param \Illuminate\Contracts\Mail\Mailable $mailable + * @param \Illuminate\Mail\Mailable $mailable * * @return mixed */ - public function send(MailableContract $mailable) + public function send(Mailable $mailable) { if ($mailable instanceof ShouldQueue) { return $this->queue($mailable); @@ -130,10 +128,10 @@ public function send(MailableContract $mailable) /** * Send a mailable message immediately. * - * @param \Illuminate\Contracts\Mail\Mailable $mailable; + * @param \Illuminate\Mail\Mailable $mailable * @return mixed */ - public function sendNow(MailableContract $mailable) + public function sendNow(Mailable $mailable) { return $this->mailer->send($this->fill($mailable)); } @@ -141,10 +139,10 @@ public function sendNow(MailableContract $mailable) /** * Push the given mailable onto the queue. * - * @param \Illuminate\Contracts\Mail\Mailable $mailable; + * @param \Illuminate\Mail\Mailable $mailable * @return mixed */ - public function queue(MailableContract $mailable) + public function queue(Mailable $mailable) { $mailable = $this->fill($mailable); @@ -159,10 +157,10 @@ public function queue(MailableContract $mailable) * Deliver the queued message after the given delay. * * @param \DateTimeInterface|\DateInterval|int $delay - * @param \Illuminate\Contracts\Mail\Mailable $mailable; + * @param \Illuminate\Mail\Mailable $mailable * @return mixed */ - public function later($delay, MailableContract $mailable) + public function later($delay, Mailable $mailable) { return $this->mailer->later($delay, $this->fill($mailable)); } @@ -170,14 +168,14 @@ public function later($delay, MailableContract $mailable) /** * Populate the mailable with the addresses. * - * @param \Illuminate\Contracts\Mail\Mailable $mailable; + * @param \Illuminate\Mail\Mailable $mailable * @return \Illuminate\Mail\Mailable */ - protected function fill(MailableContract $mailable) + protected function fill(Mailable $mailable) { return tap($mailable->to($this->to) ->cc($this->cc) - ->bcc($this->bcc), function ($mailable) { + ->bcc($this->bcc), function (Mailable $mailable) { if ($this->locale) { $mailable->locale($this->locale); } diff --git a/src/Illuminate/Support/Testing/Fakes/PendingMailFake.php b/src/Illuminate/Support/Testing/Fakes/PendingMailFake.php index c30277c2ad7a..e344fcfb2dbc 100644 --- a/src/Illuminate/Support/Testing/Fakes/PendingMailFake.php +++ b/src/Illuminate/Support/Testing/Fakes/PendingMailFake.php @@ -2,7 +2,7 @@ namespace Illuminate\Support\Testing\Fakes; -use Illuminate\Contracts\Mail\Mailable; +use Illuminate\Mail\Mailable; use Illuminate\Mail\PendingMail; class PendingMailFake extends PendingMail @@ -21,7 +21,7 @@ public function __construct($mailer) /** * Send a new mailable message instance. * - * @param \Illuminate\Contracts\Mail\Mailable $mailable; + * @param \Illuminate\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\Contracts\Mail\Mailable $mailable; + * @param \Illuminate\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\Contracts\Mail\Mailable $mailable; + * @param \Illuminate\Mail\Mailable $mailable * @return mixed */ public function queue(Mailable $mailable)