Merge pull request Sylius#8441 from loic425/feature/mailer/add-reply-to

[Mailer] add reply-to on contact request email

UPGRADE.md

@@ -60,6 +60,7 @@
 ### Mailer / MailerBundle
 
 * `Email` has been made final, use decoration instead of extending it.
+* `SenderInterface::send` method has changed to add `replyTo` argument
 
 ### Order / OrderBundle
 

src/Sylius/Bundle/MailerBundle/Sender/Adapter/SwiftMailerAdapter.php

@@ -50,12 +50,14 @@ public function send(
         RenderedEmail $renderedEmail,
         EmailInterface $email,
         array $data,
-        array $attachments = []
+        array $attachments = [],
+        array $replyTo = []
     ): void {
         $message = (new \Swift_Message())
             ->setSubject($renderedEmail->getSubject())
             ->setFrom([$senderAddress => $senderName])
             ->setTo($recipients)
+            ->setReplyTo($replyTo);
         ;
 
         $message->setBody($renderedEmail->getBody(), 'text/html');
@@ -66,7 +68,7 @@ public function send(
             $message->attach($file);
         }
 
-        $emailSendEvent = new EmailSendEvent($message, $email, $data, $recipients);
+        $emailSendEvent = new EmailSendEvent($message, $email, $data, $recipients, $replyTo);
 
         $this->dispatcher->dispatch(SyliusMailerEvents::EMAIL_PRE_SEND, $emailSendEvent);
 

src/Sylius/Bundle/ShopBundle/EmailManager/ContactEmailManager.php

@@ -39,6 +39,6 @@ public function __construct(SenderInterface $emailSender)
      */
     public function sendContactRequest(array $data, array $recipients): void
     {
-        $this->emailSender->send(Emails::CONTACT_REQUEST, $recipients, ['data' => $data]);
+        $this->emailSender->send(Emails::CONTACT_REQUEST, $recipients, ['data' => $data], [], [$data['email']]);
     }
 }

src/Sylius/Bundle/ShopBundle/spec/EmailManager/ContactEmailManagerSpec.php

@@ -43,7 +43,9 @@ function it_sends_a_contact_request_email(SenderInterface $sender): void
                         'email' => 'customer@example.com',
                         'message' => 'Hello!',
                     ],
-                ]
+                ],
+                [],
+                ['customer@example.com']
             )
             ->shouldBeCalled()
         ;

src/Sylius/Component/Mailer/Event/EmailSendEvent.php

@@ -41,18 +41,24 @@ final class EmailSendEvent extends Event
      */
     protected $data;
 
+    /**
+     * @var string[]
+     */
+    protected $replyTo;
+
     /**
      * @param mixed $message
      * @param array $recipients
      * @param EmailInterface $email
      * @param array $data
      */
-    public function __construct($message, EmailInterface $email, array $data, array $recipients = [])
+    public function __construct($message, EmailInterface $email, array $data, array $recipients = [], array $replyTo = [])
     {
         $this->message = $message;
         $this->email = $email;
         $this->data = $data;
         $this->recipients = $recipients;
+        $this->replyTo = $replyTo;
     }
 
     /**
@@ -86,4 +92,12 @@ public function getData(): array
     {
         return $this->data;
     }
+
+    /**
+     * @return string[]
+     */
+    public function getReplyTo(): array
+    {
+        return $this->replyTo;
+    }
 }

src/Sylius/Component/Mailer/Sender/Adapter/AdapterInterface.php

@@ -31,6 +31,7 @@ interface AdapterInterface
      * @param EmailInterface $email
      * @param array $data
      * @param array $attachments
+     * @param array $replyTo
      */
     public function send(
         array $recipients,
@@ -39,6 +40,7 @@ public function send(
         RenderedEmail $renderedEmail,
         EmailInterface $email,
         array $data,
-        array $attachments = []
+        array $attachments = [],
+        array $replyTo = []
     ): void;
 }

src/Sylius/Component/Mailer/Sender/Sender.php

@@ -66,7 +66,7 @@ public function __construct(
     /**
      * {@inheritdoc}
      */
-    public function send(string $code, array $recipients, array $data = [], array $attachments = []): void
+    public function send(string $code, array $recipients, array $data = [], array $attachments = [], array $replyTo = []): void
     {
         $email = $this->provider->getEmail($code);
 
@@ -86,7 +86,8 @@ public function send(string $code, array $recipients, array $data = [], array $a
             $renderedEmail,
             $email,
             $data,
-            $attachments
+            $attachments,
+            $replyTo
         );
     }
 }

src/Sylius/Component/Mailer/Sender/SenderInterface.php

@@ -24,5 +24,5 @@ interface SenderInterface
      * @param array $data
      * @param array $attachments
      */
-    public function send(string $code, array $recipients, array $data = [], array $attachments = []): void;
+    public function send(string $code, array $recipients, array $data = [], array $attachments = [], array $replyTo = []): void;
 }

src/Sylius/Component/Mailer/spec/Sender/SenderSpec.php

@@ -50,7 +50,7 @@ function it_sends_an_email_through_the_adapter(
         $data = ['foo' => 2];
 
         $rendererAdapter->render($email, ['foo' => 2])->willReturn($renderedEmail);
-        $senderAdapter->send(['john@example.com'], 'sender@example.com', 'Sender', $renderedEmail, $email, $data, [])->shouldBeCalled();
+        $senderAdapter->send(['john@example.com'], 'sender@example.com', 'Sender', $renderedEmail, $email, $data, [], [])->shouldBeCalled();
 
         $this->send('bar', ['john@example.com'], $data, []);
     }
@@ -65,7 +65,7 @@ function it_does_not_send_disabled_emails(
         $email->isEnabled()->willReturn(false);
 
         $rendererAdapter->render($email, ['foo' => 2])->shouldNotBeCalled();
-        $senderAdapter->send(['john@example.com'], 'mail@sylius.org', 'Sylius Mailer', null, $email, [], [])->shouldNotBeCalled();
+        $senderAdapter->send(['john@example.com'], 'mail@sylius.org', 'Sylius Mailer', null, $email, [], [], [])->shouldNotBeCalled();
 
         $this->send('bar', ['john@example.com'], ['foo' => 2], []);
     }