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.

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

[5.3] Add support for setting mail notification priority #15651

Merged
merged 1 commit into from
Sep 28, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions src/Illuminate/Notifications/Channels/MailChannel.php
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,10 @@ public function send($notifiable, Notification $notification)
foreach ($message->rawAttachments as $attachment) {
$m->attachData($attachment['data'], $attachment['name'], $attachment['options']);
}

if($message->priority !== null) {
$m->setPriority($message->priority);
}
});
}
}
22 changes: 22 additions & 0 deletions src/Illuminate/Notifications/Messages/MailMessage.php
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,13 @@ class MailMessage extends SimpleMessage
*/
public $rawAttachments = [];

/**
* Priority level of the message.
*
* @var int
*/
public $priority = null;

/**
* Set the view for the mail message.
*
Expand Down Expand Up @@ -129,4 +136,19 @@ public function data()
{
return array_merge($this->toArray(), $this->viewData);
}

/**
* Set the priority of this message.
*
* The value is an integer where 1 is the highest priority and 5 is the lowest.
*
* @param int $level
* @return $this
*/
public function priority($level)
{
$this->priority = $level;

return $this;
}
}
40 changes: 40 additions & 0 deletions tests/Notifications/NotificationMailChannelTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,37 @@ public function testMessageWithToAddress()
$channel->send($notifiable, $notification);
}

public function testMessageWithPriority()
{
$notification = new NotificationMailChannelTestNotificationWithPriority;
$notifiable = new NotificationMailChannelTestNotifiable;

$message = $notification->toMail($notifiable);
$data = $message->toArray();

$channel = new Illuminate\Notifications\Channels\MailChannel(
$mailer = Mockery::mock(Illuminate\Contracts\Mail\Mailer::class)
);

$views = ['notifications::email', 'notifications::email-plain'];

$mailer->shouldReceive('send')->with($views, $data, Mockery::on(function ($closure) {
$mock = Mockery::mock('Illuminate\Mailer\Message');

$mock->shouldReceive('subject')->once();

$mock->shouldReceive('to')->once()->with('[email protected]');

$mock->shouldReceive('setPriority')->once()->with(1);

$closure($mock);

return true;
}));

$channel->send($notifiable, $notification);
}

public function testMessageWithMailableContract()
{
$notification = new NotificationMailChannelTestNotificationWithMailableContract;
Expand Down Expand Up @@ -287,6 +318,15 @@ public function toMail($notifiable)
}
}

class NotificationMailChannelTestNotificationWithPriority extends Notification
{
public function toMail($notifiable)
{
return (new MailMessage)
->priority(1);
}
}

class NotificationMailChannelTestNotificationWithMailableContract extends Notification
{
public function toMail($notifiable)
Expand Down