Revert "Inject Url Generator and Translator Interface into notification mailer (#2169)"

This was actually already present and functional, so adding additional code for it
is unnecessary.

This reverts commit e627616750c35e1ed70bcd7fa35d3ab147efe866.
This commit is contained in:
Alexander Skvortsov 2020-07-24 12:40:57 -04:00
parent 3b39c212e0
commit 4ee6d6fd88

View File

@ -9,11 +9,9 @@
namespace Flarum\Notification;
use Flarum\Http\UrlGenerator;
use Flarum\User\User;
use Illuminate\Contracts\Mail\Mailer;
use Illuminate\Mail\Message;
use Symfony\Component\Translation\TranslatorInterface;
class NotificationMailer
{
@ -22,26 +20,12 @@ class NotificationMailer
*/
protected $mailer;
/**
* @var TranslatorInterface
*/
protected $translator;
/**
* @var UrlGenerator
*/
protected $url;
/**
* @param Mailer $mailer
* @param TranslatorInterface $translator
* @param UrlGenerator $url
*/
public function __construct(Mailer $mailer, TranslatorInterface $translator, UrlGenerator $url)
public function __construct(Mailer $mailer)
{
$this->mailer = $mailer;
$this->translator = $translator;
$this->url = $url;
}
/**
@ -50,11 +34,9 @@ class NotificationMailer
*/
public function send(MailableInterface $blueprint, User $user)
{
$translator = $this->translator;
$url = $this->url;
$this->mailer->send(
$blueprint->getEmailView(),
compact('blueprint', 'user', 'translator', 'url'),
compact('blueprint', 'user'),
function (Message $message) use ($blueprint, $user) {
$message->to($user->email, $user->username)
->subject($blueprint->getEmailSubject());