Merge ea5c170 into 27abd2e

sonata-project · Feb 22, 2019 · f3c19ae · f3c19ae
2 parents 27abd2e + ea5c170
commit f3c19ae
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/src/Consumer/SwiftMailerConsumer.php b/src/Consumer/SwiftMailerConsumer.php
@@ -67,6 +67,9 @@ private function sendEmail(MessageInterface $message)
         if ($replyTo = $message->getValue('replyTo')) {
             $mail->setReplyTo($replyTo);
         }
+        if ($returnPath = $message->getValue('returnPath')) {
+            $mail->setReturnPath($returnPath);
+        }
 
         if ($cc = $message->getValue('cc')) {
             $mail->setCc($cc);

diff --git a/tests/Consumer/SwiftMailerConsumerTest.php b/tests/Consumer/SwiftMailerConsumerTest.php
@@ -61,6 +61,9 @@ public function testSendEmail()
                 'replyTo1@mail.fr',
                 'replyTo2@mail.fr' => 'nameReplyTo2',
             ],
+            'returnPath' => [
+                'email' => 'returnPath@mail.fr',
+            ],
             'cc' => [
                 'cc1@mail.fr',
                 'cc2@mail.fr' => 'nameCc2',
@@ -84,6 +87,7 @@ public function testSendEmail()
         $mail->expects($this->once())->method('setFrom')->with($this->equalTo(['from@mail.fr' => 'nameFrom']))->willReturnSelf();
         $mail->expects($this->once())->method('setTo')->with($this->equalTo(['to1@mail.fr', 'to2@mail.fr' => 'nameTo2']))->willReturnSelf();
         $mail->expects($this->once())->method('setReplyTo')->with($this->equalTo(['replyTo1@mail.fr', 'replyTo2@mail.fr' => 'nameReplyTo2']))->willReturnSelf();
+        $mail->expects($this->once())->method('setReturnPath')->with($this->equalTo(['email' => 'returnPath@mail.fr']))->willReturnSelf();
         $mail->expects($this->once())
             ->method('setCc')
             ->with($this->equalTo(['cc1@mail.fr', 'cc2@mail.fr' => 'nameCc2']))