Skip to content

Commit de16868

Browse files
committed
[6.x] Changed Contract to Class
- I have changed `\Illuminate\Contracts\Mail\Mailable` to `\Illuminate\Mail\Mailable`, since contract does not contains `cc` / `to` / `bcc` / `locale` methods, and in case if you call method only with contract, then we will get fatall error, since method is not present in the contract
1 parent 419253f commit de16868

File tree

2 files changed

+18
-20
lines changed

2 files changed

+18
-20
lines changed

src/Illuminate/Mail/PendingMail.php

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
namespace Illuminate\Mail;
44

5-
use Illuminate\Contracts\Mail\Mailable as MailableContract;
6-
use Illuminate\Contracts\Mail\Mailer as MailerContract;
75
use Illuminate\Contracts\Queue\ShouldQueue;
86
use Illuminate\Contracts\Translation\HasLocalePreference;
97

@@ -12,7 +10,7 @@ class PendingMail
1210
/**
1311
* The mailer instance.
1412
*
15-
* @var \Illuminate\Contracts\Mail\Mailer
13+
* @var \Illuminate\Mail\Mailer
1614
*/
1715
protected $mailer;
1816

@@ -47,10 +45,10 @@ class PendingMail
4745
/**
4846
* Create a new mailable mailer instance.
4947
*
50-
* @param \Illuminate\Contracts\Mail\Mailer $mailer
48+
* @param \Illuminate\Mail\Mailer $mailer
5149
* @return void
5250
*/
53-
public function __construct(MailerContract $mailer)
51+
public function __construct(Mailer $mailer)
5452
{
5553
$this->mailer = $mailer;
5654
}
@@ -114,11 +112,11 @@ public function bcc($users)
114112
/**
115113
* Send a new mailable message instance.
116114
*
117-
* @param \Illuminate\Contracts\Mail\Mailable $mailable
115+
* @param \Illuminate\Mail\Mailable $mailable
118116
*
119117
* @return mixed
120118
*/
121-
public function send(MailableContract $mailable)
119+
public function send(Mailable $mailable)
122120
{
123121
if ($mailable instanceof ShouldQueue) {
124122
return $this->queue($mailable);
@@ -130,21 +128,21 @@ public function send(MailableContract $mailable)
130128
/**
131129
* Send a mailable message immediately.
132130
*
133-
* @param \Illuminate\Contracts\Mail\Mailable $mailable;
131+
* @param \Illuminate\Mail\Mailable $mailable
134132
* @return mixed
135133
*/
136-
public function sendNow(MailableContract $mailable)
134+
public function sendNow(Mailable $mailable)
137135
{
138136
return $this->mailer->send($this->fill($mailable));
139137
}
140138

141139
/**
142140
* Push the given mailable onto the queue.
143141
*
144-
* @param \Illuminate\Contracts\Mail\Mailable $mailable;
142+
* @param \Illuminate\Mail\Mailable $mailable
145143
* @return mixed
146144
*/
147-
public function queue(MailableContract $mailable)
145+
public function queue(Mailable $mailable)
148146
{
149147
$mailable = $this->fill($mailable);
150148

@@ -159,25 +157,25 @@ public function queue(MailableContract $mailable)
159157
* Deliver the queued message after the given delay.
160158
*
161159
* @param \DateTimeInterface|\DateInterval|int $delay
162-
* @param \Illuminate\Contracts\Mail\Mailable $mailable;
160+
* @param \Illuminate\Mail\Mailable $mailable
163161
* @return mixed
164162
*/
165-
public function later($delay, MailableContract $mailable)
163+
public function later($delay, Mailable $mailable)
166164
{
167165
return $this->mailer->later($delay, $this->fill($mailable));
168166
}
169167

170168
/**
171169
* Populate the mailable with the addresses.
172170
*
173-
* @param \Illuminate\Contracts\Mail\Mailable $mailable;
171+
* @param \Illuminate\Mail\Mailable $mailable
174172
* @return \Illuminate\Mail\Mailable
175173
*/
176-
protected function fill(MailableContract $mailable)
174+
protected function fill(Mailable $mailable)
177175
{
178176
return tap($mailable->to($this->to)
179177
->cc($this->cc)
180-
->bcc($this->bcc), function ($mailable) {
178+
->bcc($this->bcc), function (Mailable $mailable) {
181179
if ($this->locale) {
182180
$mailable->locale($this->locale);
183181
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace Illuminate\Support\Testing\Fakes;
44

5-
use Illuminate\Contracts\Mail\Mailable;
5+
use Illuminate\Mail\Mailable;
66
use Illuminate\Mail\PendingMail;
77

88
class PendingMailFake extends PendingMail
@@ -21,7 +21,7 @@ public function __construct($mailer)
2121
/**
2222
* Send a new mailable message instance.
2323
*
24-
* @param \Illuminate\Contracts\Mail\Mailable $mailable;
24+
* @param \Illuminate\Mail\Mailable $mailable
2525
* @return mixed
2626
*/
2727
public function send(Mailable $mailable)
@@ -32,7 +32,7 @@ public function send(Mailable $mailable)
3232
/**
3333
* Send a mailable message immediately.
3434
*
35-
* @param \Illuminate\Contracts\Mail\Mailable $mailable;
35+
* @param \Illuminate\Mail\Mailable $mailable
3636
* @return mixed
3737
*/
3838
public function sendNow(Mailable $mailable)
@@ -43,7 +43,7 @@ public function sendNow(Mailable $mailable)
4343
/**
4444
* Push the given mailable onto the queue.
4545
*
46-
* @param \Illuminate\Contracts\Mail\Mailable $mailable;
46+
* @param \Illuminate\Mail\Mailable $mailable
4747
* @return mixed
4848
*/
4949
public function queue(Mailable $mailable)

0 commit comments

Comments
 (0)