Replace mailer from Swift to Symfony, fix SMTP mail sending (#341)

yiisoft · Aug 26, 2021 · 8801574 · 8801574
1 parent 01d5cac
commit 8801574
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -52,8 +52,8 @@
         "yiisoft/injector": "^1.0",
         "yiisoft/log": "^1.0",
         "yiisoft/log-target-file": "^1.0",
-        "yiisoft/mailer": "^2.0",
-        "yiisoft/mailer-swiftmailer": "^2.0",
+        "yiisoft/mailer": "^3.0",
+        "yiisoft/mailer-symfony": "dev-master",
         "yiisoft/rbac": "^3.0@dev",
         "yiisoft/rbac-php": "^3.0@dev",
         "yiisoft/router": "^3.0@dev",

diff --git a/config/params.php b/config/params.php
@@ -5,6 +5,7 @@
 return [
     'mailer' => [
         'adminEmail' => 'admin@example.com',
+        'senderEmail' => 'sender@example.com',
     ],
 
     'yiisoft/aliases' => [

diff --git a/config/web/contact-mailer.php b/config/web/contact-mailer.php
@@ -10,6 +10,7 @@
     ContactMailer::class => [
         'class' => ContactMailer::class,
         '__construct()' => [
+            'sender' => $params['mailer']['senderEmail'],
             'to' => $params['mailer']['adminEmail'],
         ],
     ],

diff --git a/src/Contact/ContactMailer.php b/src/Contact/ContactMailer.php
@@ -21,17 +21,20 @@ class ContactMailer
     private FlashInterface $flash;
     private LoggerInterface $logger;
     private MailerInterface $mailer;
+    private string $sender;
     private string $to;
 
     public function __construct(
         FlashInterface $flash,
         LoggerInterface $logger,
         MailerInterface $mailer,
+        string $sender,
         string $to
     ) {
         $this->flash = $flash;
         $this->logger = $logger;
         $this->mailer = $mailer->withTemplate(new MessageBodyTemplate(__DIR__ . '/mail/'));
+        $this->sender = $sender;
         $this->to = $to;
     }
 
@@ -45,6 +48,7 @@ public function send(FormModelInterface $form, ServerRequestInterface $request)
         )
             ->withSubject($form->getAttributeValue('subject'))
             ->withFrom([$form->getAttributeValue('email') => $form->getAttributeValue('name')])
+            ->withSender($this->sender)
             ->withTo($this->to);
 
         $attachFiles = $request->getUploadedFiles();