Merge pull request #6 from alfedorenko/master

Add replyTo to message and mandrill mailer
justcoded · Jul 31, 2018 · ca433df · ca433df
2 parents a520728 + 6a3ae20
commit ca433df
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 2 deletions.
diff --git a/src/DataObjects/MailMessage.php b/src/DataObjects/MailMessage.php
@@ -27,6 +27,13 @@ class MailMessage extends DataObject
 	 */
 	protected $to;
 
+	/**
+	 * Property with Reply-To email
+	 *
+	 * @var EmailAddress
+	 */
+	protected $replyTo;
+
 	/**
 	 * Property with Cc email
 	 *
@@ -102,6 +109,9 @@ public function __construct(array $config)
 		if ($this->from) {
 			$this->from = new EmailAddress($this->from);
 		}
+		if ($this->replyTo) {
+			$this->replyTo = new EmailAddress($this->replyTo);
+		}
 
 		// convert recipients to Data objects.
 		foreach (array('to', 'cc', 'bcc') as $key) {
@@ -135,6 +145,16 @@ public function getTo()
 		return $this->to;
 	}
 
+	/**
+	 * Getting email Reply To
+	 *
+	 * @return EmailAddress
+	 */
+	public function getReplyTo()
+	{
+		return $this->replyTo;
+	}
+
 	/**
 	 * Getting email CC
 	 *

diff --git a/src/Mailer/MandrillMailer.php b/src/Mailer/MandrillMailer.php
@@ -61,6 +61,11 @@ public function send(MailMessage $message)
 				'from_email' => $message->getFrom()->getEmail(),
 				'from_name' => $message->getFrom()->getName(),
 			);
+
+			$replyTo=$message->getReplyTo();
+			if(!empty($replyTo)) {
+				$mandrillMessage['headers']=['Reply-To' => $replyTo->getEmail()];
+			}
 
 			// Recipients.
 			$recipients = [
@@ -71,7 +76,9 @@ public function send(MailMessage $message)
 
 			$to = [];
 			foreach ($recipients as $type => $emails) {
-				if (empty($emails)) continue;
+				if (empty($emails)) {
+					continue;
+				}
 				foreach ($emails as $email) {
 					$to[] = [
 						'email' => $email->getEmail(),
@@ -85,7 +92,7 @@ public function send(MailMessage $message)
 
 			// Attachments.
 			if (0 < $message->getAttachmentsSize() && $message->getAttachmentsSize() < $this->attachmentsSizeLimit
-				&& $attachments = $message->getAttachments()
+			    && $attachments = $message->getAttachments()
 			) {
 				$attachmentsArray = [];
 				foreach ($attachments as $attachment) {

diff --git a/src/Mailer/PHPMailer.php b/src/Mailer/PHPMailer.php
@@ -95,6 +95,11 @@ public function send(MailMessage $message)
 				$mail->setFrom($address->getEmail(), $address->getName());
 			}
 
+			// Set Reply To.
+			if ($replyTo = $message->getReplyTo()) {
+				$mail->addReplyTo($replyTo->getEmail(), $replyTo->getName());
+			}
+
 			// Recipients.
 			if ($to = $message->getTo()) {
 				foreach ($to as $address) {