Merge pull request #1 from stefliekens/reply-to

Added Reply-To address
phpro · Aug 29, 2016 · 4e0df78 · 4e0df78
2 parents 2073eba + 146c352
commit 4e0df78
Show file tree

Hide file tree

Showing 9 changed files with 53 additions and 3 deletions.
diff --git a/spec/Phpro/MailManager/Adapter/MandrillAdapterSpec.php b/spec/Phpro/MailManager/Adapter/MandrillAdapterSpec.php
@@ -36,6 +36,7 @@ public function it_should_send_a_mail_with_mandrill_template($transport)
                 && $message->getCc()->has('[email protected]')
                 && $message->getBcc()->has('[email protected]')
                 && $message->getFrom()->has('[email protected]')
+                && $message->getReplyTo()->has('[email protected]')
                 && $message->getSubject() == $mail->getSubject()
                 && $message->getOptions() == ['subaccount' => 'test']
                 && $message->getGlobalMetadata() == ['meta1' => 'meta1']
@@ -67,6 +68,7 @@ public function it_should_send_a_mail_with_zend_view_renderer($transport, $messa
                 && $message->getCc()->has('[email protected]')
                 && $message->getBcc()->has('[email protected]')
                 && $message->getFrom()->has('[email protected]')
+                && $message->getReplyTo()->has('[email protected]')
                 && $message->getSubject() == $mail->getSubject()
                 && $message->getOptions() == ['subaccount' => 'test']
                 && $message->getImages() == []

diff --git a/spec/Phpro/MailManager/Adapter/ZendMailAdapterSpec.php b/spec/Phpro/MailManager/Adapter/ZendMailAdapterSpec.php
@@ -38,6 +38,7 @@ public function it_should_send_a_mail($transport, $messageCreator, $mailMessage)
                 && $message->getCc()->has('[email protected]')
                 && $message->getBcc()->has('[email protected]')
                 && $message->getFrom()->has('[email protected]')
+                && $message->getReplyTo()->has('[email protected]')
                 && $message->getSubject() == $mail->getSubject();
         }))->shouldBeCalled();
 

diff --git a/spec/Phpro/MailManager/Mail/Base/MailSpec.php b/spec/Phpro/MailManager/Mail/Base/MailSpec.php
@@ -58,6 +58,17 @@ public function it_should_provide_a_from_addresses()
         $result->shouldHaveCount(1);
     }
 
+    public function it_should_provide_a_reply_to_address()
+    {
+        $this->setReplyTo('[email protected]', 'name');
+        $this->getReplyTo()['[email protected]']->shouldBe('name');
+
+        $this->setReplyTo('[email protected]');
+        $result = $this->getReplyTo();
+        $result[0]->shouldBe('[email protected]');
+        $result->shouldHaveCount(1);
+    }
+
     public function it_should_provide_a_subject()
     {
         $value = 'subject';
@@ -76,12 +87,12 @@ public function it_should_provide_attachments()
     }
 
     /**
-     * @param Zend\Mail\Header\HeaderInterface $header
+     * @param \Zend\Mail\Header\HeaderInterface $header
      */
     public function it_should_provide_headers($header)
     {
         $header->getFieldName()->willReturn('Reply-To');
-        $header->getFieldValue()->willReturn('[email protected]');
+        $header->getFieldValue(false)->willReturn('[email protected]');
 
         $this->addHeader($header);
         $this->addHeaders(['Content-Type' => 'text/html']);

diff --git a/src/Phpro/MailManager/Adapter/MandrillAdapter.php b/src/Phpro/MailManager/Adapter/MandrillAdapter.php
@@ -65,6 +65,7 @@ protected function createMessage(MandrillInterface $mail)
         $message->setTo($mail->getTo());
         $message->setCc($mail->getCc());
         $message->setBcc($mail->getBcc());
+        $message->setReplyTo($mail->getReplyTo());
 
         if ($mail->getFrom()) {
             $message->setFrom($mail->getFrom());

diff --git a/src/Phpro/MailManager/Adapter/ZendMailAdapter.php b/src/Phpro/MailManager/Adapter/ZendMailAdapter.php
@@ -66,6 +66,7 @@ protected function createMessage(ZendMailInterface $mail)
         $message->setCc($mail->getCc());
         $message->setBcc($mail->getBcc());
         $message->setFrom($mail->getFrom());
+        $message->setReplyTo($mail->getReplyTo());
         $message->setSubject($mail->getSubject());
         $message->setBody($this->messageCreator->createMessage($mail));
 

diff --git a/src/Phpro/MailManager/Mail/Base/Mail.php b/src/Phpro/MailManager/Mail/Base/Mail.php
@@ -35,6 +35,11 @@ class Mail
      */
     protected $from = [];
 
+    /**
+     * @var array
+     */
+    protected $replyTo = [];
+
     /**
      * @var string
      */
@@ -125,13 +130,35 @@ public function setFrom($email, $name = null)
     }
 
     /**
-     * @return string
+     * @return array
      */
     public function getFrom()
     {
         return $this->from;
     }
 
+    /**
+     * @param      $email
+     * @param null $name
+     */
+    public function setReplyTo($email, $name = null)
+    {
+        $this->replyTo = [];
+        if ($name) {
+            $this->replyTo[$email] = $name;
+            return;
+        }
+        $this->replyTo[] = $email;
+    }
+
+    /**
+     * @return array
+     */
+    public function getReplyTo()
+    {
+        return $this->replyTo;
+    }
+
     /**
      * @param array $params
      */

diff --git a/src/Phpro/MailManager/Mail/MailInterface.php b/src/Phpro/MailManager/Mail/MailInterface.php
@@ -46,4 +46,9 @@ public function getSubject();
      * @return array
      */
     public function getTo();
+
+    /**
+     * @return array
+     */
+    public function getReplyTo();
 }
diff --git a/stub/Phpro/MailManager/Mail/ProvidesMandrillStubSpec.php b/stub/Phpro/MailManager/Mail/ProvidesMandrillStubSpec.php
@@ -22,6 +22,7 @@ protected function createEmptyMailStub()
         $mail->getCc()->willReturn(['[email protected]' => 'me']);
         $mail->getBcc()->willReturn(['[email protected]' => 'me']);
         $mail->getFrom()->willReturn(['[email protected]' => 'me']);
+        $mail->getReplyTo()->willReturn(['[email protected]' => 'me']);
         $mail->getSubject()->willReturn('Subject');
 
         $mail->getHeaders()->willReturn($headers);

diff --git a/stub/Phpro/MailManager/Mail/ProvidesZendMailStubSpec.php b/stub/Phpro/MailManager/Mail/ProvidesZendMailStubSpec.php
@@ -22,6 +22,7 @@ protected function getMailStub()
         $mail->getCc()->willReturn(['[email protected]' => 'me']);
         $mail->getBcc()->willReturn(['[email protected]' => 'me']);
         $mail->getFrom()->willReturn(['[email protected]' => 'me']);
+        $mail->getReplyTo()->willReturn(['[email protected]' => 'me']);
         $mail->getSubject()->willReturn('Subject');
 
         $mail->getParams()->willReturn(['param1' => 'value1']);