From 4ee6d6fd885bc98febd5f9a9ac23e93d60a4c987 Mon Sep 17 00:00:00 2001 From: Alexander Skvortsov Date: Fri, 24 Jul 2020 12:40:57 -0400 Subject: [PATCH] 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. --- src/Notification/NotificationMailer.php | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/src/Notification/NotificationMailer.php b/src/Notification/NotificationMailer.php index 36d3ef63c..c298a8c78 100644 --- a/src/Notification/NotificationMailer.php +++ b/src/Notification/NotificationMailer.php @@ -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());