From f505f3bf078542eb2565a219232944949bb8c3e2 Mon Sep 17 00:00:00 2001 From: Sebastien Curt <sebastien.curt@tetras-libre.fr> Date: Tue, 1 Feb 2022 09:20:00 +0100 Subject: [PATCH] Remove use of useless environment variable MEMBER_URL_EXTERNAL within memorekall-member docker service --- src/Controller/CapsuleEditorController.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/Controller/CapsuleEditorController.php b/src/Controller/CapsuleEditorController.php index 370fb90..b51eb92 100644 --- a/src/Controller/CapsuleEditorController.php +++ b/src/Controller/CapsuleEditorController.php @@ -16,8 +16,10 @@ use Symfony\Bridge\Twig\Mime\TemplatedEmail; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; +use Symfony\Component\Mailer\Exception\TransportExceptionInterface; use Symfony\Component\Mailer\MailerInterface; use Symfony\Component\Routing\Annotation\Route; +use Symfony\Component\Routing\Generator\UrlGeneratorInterface; use Symfony\Contracts\Translation\TranslatorInterface; class CapsuleEditorController extends AbstractController @@ -26,17 +28,20 @@ class CapsuleEditorController extends AbstractController private MailerInterface $mailer; private CapsulePendingEditorRepository $capsule_pending_editor_repository; private EntityManagerInterface $entity_manager; + private UrlGeneratorInterface $urlGenerator; public function __construct( MailerInterface $mailer, TranslatorInterface $translator, CapsulePendingEditorRepository $capsule_pending_editor_repository, - EntityManagerInterface $entity_manager + EntityManagerInterface $entity_manager, + UrlGeneratorInterface $urlGenerator ) { $this->mailer = $mailer; $this->translator = $translator; $this->capsule_pending_editor_repository = $capsule_pending_editor_repository; $this->entity_manager = $entity_manager; + $this->urlGenerator = $urlGenerator; } /** @@ -157,6 +162,7 @@ class CapsuleEditorController extends AbstractController /** * @param array<User> $current_capsule_editors_users + * @throws TransportExceptionInterface */ private function addEditor( string $editor_email, @@ -189,7 +195,7 @@ class CapsuleEditorController extends AbstractController ->context([ 'user' => $current_user, 'capsule' => $capsule, - 'member_url_external' => $_ENV['MEMBER_URL_EXTERNAL'] + 'member_url_external' => $this->urlGenerator->generate('home', [], UrlGeneratorInterface::ABSOLUTE_URL) ]); $this->mailer->send($email); -- GitLab