From d0124fe8539ff068ef2ad51e22c39fcab10d93c9 Mon Sep 17 00:00:00 2001 From: Florian Moser Date: Sun, 1 Dec 2024 17:05:25 +0100 Subject: [PATCH] fix: Fix email send --- config/services.yaml | 14 ++------------ src/Service/EmailService.php | 12 +++--------- templates/email/view.html.twig | 16 ++++++++-------- 3 files changed, 13 insertions(+), 29 deletions(-) diff --git a/config/services.yaml b/config/services.yaml index 7aae6b32..f22bbd8a 100644 --- a/config/services.yaml +++ b/config/services.yaml @@ -9,6 +9,8 @@ services: autowire: true # Automatically injects dependencies in your services. autoconfigure: true # Automatically registers your services as commands, event subscribers, etc. public: false # Allows optimizing the container by removing unused services; this also means + bind: + $contactEmail: '%env(CONTACT_EMAIL)%' # fetching services directly from the container via $container->get() won't work. # The best practice is to be explicit about your dependencies anyway. @@ -24,18 +26,6 @@ services: resource: '../src/Controller' tags: ['controller.service_arguments'] - App\Service\ExchangeService: - arguments: ["@translator", "@session.flash_bag", "@validator", "@doctrine"] - - App\Service\EventPastEvaluationService: - arguments: ["@doctrine"] - - App\Service\EventGenerationService: - arguments: ["@doctrine","@translator","@session"] - - App\Service\EmailService: - arguments: ["@mailer", "@doctrine", "@logger","@twig","%env(CONTACT_EMAIL)%"] - App\Normalizer\EntityNormalizer: public: false autowire: true diff --git a/src/Service/EmailService.php b/src/Service/EmailService.php index 343d6dd7..d37938cb 100644 --- a/src/Service/EmailService.php +++ b/src/Service/EmailService.php @@ -37,19 +37,13 @@ class EmailService implements EmailServiceInterface */ private $doctrine; - /** - * @var Environment - */ - private $twig; - /** * EmailService constructor. */ - public function __construct(MailerInterface $mailer, ManagerRegistry $registry, Environment $twig, string $contactEmail) + public function __construct(MailerInterface $mailer, ManagerRegistry $registry, string $contactEmail) { $this->mailer = $mailer; $this->doctrine = $registry; - $this->twig = $twig; $this->contactEmail = $contactEmail; } @@ -64,7 +58,7 @@ private function processEmail(Email $email) $message = (new TemplatedEmail()) ->subject($email->getSubject()) - ->replyTo($this->contactEmail) + ->from($this->contactEmail) ->to($email->getReceiver()); $body = $email->getBody(); @@ -75,7 +69,7 @@ private function processEmail(Email $email) if (EmailType::PLAIN_EMAIL !== $email->getEmailType()) { $message->htmlTemplate('email/view.html.twig') - ->context(['email' => $email]); + ->context(['content' => $email]); } foreach ($email->getCarbonCopyArray() as $item) { diff --git a/templates/email/view.html.twig b/templates/email/view.html.twig index d1dff2d6..0c10a287 100644 --- a/templates/email/view.html.twig +++ b/templates/email/view.html.twig @@ -4,7 +4,7 @@ - {{ email.subject }} + {{ content.subject }}