Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[6.x] Deprecate sendNow and remove unneeded check #30999

Merged
merged 3 commits into from
Jan 2, 2020
Merged

[6.x] Deprecate sendNow and remove unneeded check #30999

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3b901b6
deprecate sendNow and remove unneded check
themsaid Jan 2, 2020
df96cc8
remove ShouldQueue check from PendingMail
themsaid Jan 2, 2020
6b86ec5
fix style
themsaid Jan 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 2 additions & 12 deletions src/Illuminate/Mail/PendingMail.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -120,10 +119,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));
}

Expand All @@ -132,6 +127,7 @@ public function send(MailableContract $mailable)
*
* @param \Illuminate\Contracts\Mail\Mailable $mailable
* @return mixed
* @deprecated Use send() instead.
*/
public function sendNow(MailableContract $mailable)
{
Expand All @@ -146,13 +142,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));
}

/**
Expand Down