From 3b901b6de3164abadf686f4664a9dc1b90c39828 Mon Sep 17 00:00:00 2001 From: Mohamed Said Date: Thu, 2 Jan 2020 13:20:59 +0200 Subject: [PATCH 1/3] deprecate sendNow and remove unneded check --- src/Illuminate/Mail/PendingMail.php | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/Illuminate/Mail/PendingMail.php b/src/Illuminate/Mail/PendingMail.php index 0ea3e5867818..216d69ac14fd 100644 --- a/src/Illuminate/Mail/PendingMail.php +++ b/src/Illuminate/Mail/PendingMail.php @@ -132,6 +132,7 @@ public function send(MailableContract $mailable) * * @param \Illuminate\Contracts\Mail\Mailable $mailable * @return mixed + * @deprecated Use send() instead. */ public function sendNow(MailableContract $mailable) { @@ -146,13 +147,7 @@ public function sendNow(MailableContract $mailable) */ public function queue(MailableContract $mailable) { - $mailable = $this->fill($mailable); - - if (isset($mailable->delay)) { - return $this->mailer->later($mailable->delay, $mailable); - } - - return $this->mailer->queue($mailable); + return $this->mailer->queue($this->fill($mailable)); } /** From df96cc85db76584b934f658f3ca0ce7b22becae1 Mon Sep 17 00:00:00 2001 From: Mohamed Said Date: Thu, 2 Jan 2020 13:26:07 +0200 Subject: [PATCH 2/3] remove ShouldQueue check from PendingMail --- src/Illuminate/Mail/PendingMail.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Illuminate/Mail/PendingMail.php b/src/Illuminate/Mail/PendingMail.php index 216d69ac14fd..22a4c258cb18 100644 --- a/src/Illuminate/Mail/PendingMail.php +++ b/src/Illuminate/Mail/PendingMail.php @@ -120,10 +120,6 @@ public function bcc($users) */ public function send(MailableContract $mailable) { - if ($mailable instanceof ShouldQueue) { - return $this->queue($mailable); - } - return $this->mailer->send($this->fill($mailable)); } From 6b86ec53560848b1729261ba18dd76b441944027 Mon Sep 17 00:00:00 2001 From: Mohamed Said Date: Thu, 2 Jan 2020 13:26:31 +0200 Subject: [PATCH 3/3] fix style --- src/Illuminate/Mail/PendingMail.php | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Illuminate/Mail/PendingMail.php b/src/Illuminate/Mail/PendingMail.php index 22a4c258cb18..0b19fed2a520 100644 --- a/src/Illuminate/Mail/PendingMail.php +++ b/src/Illuminate/Mail/PendingMail.php @@ -4,7 +4,6 @@ use Illuminate\Contracts\Mail\Mailable as MailableContract; use Illuminate\Contracts\Mail\Mailer as MailerContract; -use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Contracts\Translation\HasLocalePreference; class PendingMail