mailjet#26 Does not initializes the name property if not provided

ghusse · Feb 25, 2019 · d4db161 · d4db161
1 parent bd1c115
commit d4db161
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 4 deletions.
diff --git a/SwiftMailer/MessageFormat/MessagePayloadV31.php b/SwiftMailer/MessageFormat/MessagePayloadV31.php
@@ -182,10 +182,19 @@ private static function getMailjetHeaders() {
      * @return array|null
      */
     private function getReplyTo(Swift_Mime_Message $message) {
-        if (is_array($message->getReplyTo())) {
-            return array('Email' => key($message->getReplyTo()), 'Name' => current($message->getReplyTo()));
-        } elseif (is_string($message->getReplyTo())) {
-            return array('Email' => $message->getReplyTo());
+        $replyTo = $message->getReplyTo();
+
+        if (is_array($replyTo)) {
+            $email = key($replyTo);
+            $name = current($replyTo);
+
+            if (empty($name)){
+                return array('Email' => $email);
+            }
+
+            return array('Email' => $email, 'Name' => $name);
+        } elseif (is_string($replyTo)) {
+            return array('Email' => $replyTo);
         } else {
             return null;
         }

diff --git a/Tests/SwiftMailer/MailjetTransportv31Test.php b/Tests/SwiftMailer/MailjetTransportv31Test.php
@@ -255,6 +255,32 @@ public function testBulkSendMessages() {
         }
     }
 
+    public function testReplyToWithoutName(){
+        $message = new \Swift_Message('Test Subject', '<p>Foo bar</p>', 'text/html');
+        $message->setReplyTo('[email protected]');
+        $message->setFrom('[email protected]');
+        $message->setTo('[email protected]');
+        $message->setBody("Hello world!", 'text/plain');
+
+        $transport = $this->createTransport();
+        $mailjetMessage = $transport->messageFormat->getMailjetMessage($message)['Messages'][0];
+
+        $this->assertEquals(["Email" => '[email protected]'], $mailjetMessage['ReplyTo']);
+    }
+
+    public function testReplyTo(){
+        $message = new \Swift_Message('Test Subject', '<p>Foo bar</p>', 'text/html');
+        $message->setReplyTo('[email protected]', 'Alice');
+        $message->setFrom('[email protected]');
+        $message->setTo('[email protected]');
+        $message->setBody("Hello world!", 'text/plain');
+
+        $transport = $this->createTransport();
+        $mailjetMessage = $transport->messageFormat->getMailjetMessage($message)['Messages'][0];
+
+        $this->assertEquals(["Email" => '[email protected]', "Name" => "Alice"], $mailjetMessage['ReplyTo']);
+    }
+
     /**
      * @param string $email
      * @param string $name