Reformat code in mailers, update readme with replyTo

Author: aprokopenko

.gitignore

@@ -15,6 +15,7 @@ Desktop.ini
 
 # composer itself is not needed
 composer.phar
+composer.lock
 
 # phpunit itself is not needed
 phpunit.phar

README.md

@@ -170,6 +170,7 @@ Example:
 $messageConfig = [
     'from' => ['[email protected]' => 'My Domain Support'],
     'to' => ['[email protected]' => 'John Doe'],
+    'replyTo' => ['[email protected]' => 'REPLY NAME'],     // OPTIONAL
     'cc'      => ['[email protected]', '[email protected]'],    // OPTIONAL
     'bcc'     => ['[email protected]'],                        // OPTIONAL
     'subject' => 'Contact request from {name}',
@@ -231,6 +232,7 @@ $mailerConfig = [
 $messageConfig = [
 	'from' => ['[email protected]' => 'FROM NAME'],     // set correct FROM.
 	'to' => ['[email protected]' => 'TO NAME'],           // set correct TO.
+	'replyTo' => ['[email protected]' => 'REPLY NAME'],// set correct REPLY.
 	'subject' => 'Contact request from {name}',
 	'bodyTemplate' => __DIR__ . '/template-html.php',
 	'altBodyTemplate' => __DIR__ . '/template-plain.php',
@@ -384,6 +386,7 @@ After that you need to specify which files should be uploaded in `$messageConfig
 $messageConfig = [
 	'from' => ['[email protected]' => 'FROM NAME'],     // set correct FROM.
 	'to' => ['[email protected]' => 'TO NAME'],           // set correct TO.
+	'replyTo' => ['[email protected]' => 'REPLY NAME'],// set correct REPLY.
 	'subject' => 'Contact request from {name}',
 	'bodyTemplate' => __DIR__ . '/template-html.php',
 	'altBodyTemplate' => __DIR__ . '/template-plain.php',

composer.lock

@@ -56,22 +56,23 @@ public function send(MailMessage $message)
 			$mandrill = new Mandrill($this->apiKey);
 
 			$mandrillMessage = array(
-				'html' => $message->getBody(),
-				'subject' => $message->getSubject(),
+				'html'       => $message->getBody(),
+				'subject'    => $message->getSubject(),
 				'from_email' => $message->getFrom()->getEmail(),
-				'from_name' => $message->getFrom()->getName(),
+				'from_name'  => $message->getFrom()->getName(),
 			);
-			
-			$replyTo=$message->getReplyTo();
-			if(!empty($replyTo)) {
-				$mandrillMessage['headers']=['Reply-To' => $replyTo->getEmail()];
+
+			if ($replyTo = $message->getReplyTo()) {
+				$mandrillMessage['headers'] = [
+					'Reply-To' => $replyTo->getEmail(),
+				];
 			}
 
 			// Recipients.
 			$recipients = [
-				'to' => $message->getTo(),
-				'cc' => $message->getCc(),
-				'bcc' => $message->getBcc()
+				'to'  => $message->getTo(),
+				'cc'  => $message->getCc(),
+				'bcc' => $message->getBcc(),
 			];
 
 			$to = [];
@@ -82,8 +83,8 @@ public function send(MailMessage $message)
 				foreach ($emails as $email) {
 					$to[] = [
 						'email' => $email->getEmail(),
-						'name' => $email->getName(),
-						'type' => $type
+						'name'  => $email->getName(),
+						'type'  => $type,
 					];
 				}
 			}
@@ -92,14 +93,14 @@ 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) {
 					$attachmentsArray[] = [
-						'type' => $attachment->type,
-						'name' => $attachment->name,
-						'content' => $attachment->getBase64()
+						'type'    => $attachment->type,
+						'name'    => $attachment->name,
+						'content' => $attachment->getBase64(),
 					];
 				}
 
@@ -111,6 +112,7 @@ public function send(MailMessage $message)
 			return $result;
 		} catch (Mandrill_Error $e) {
 			$this->errors[] = 'A mandrill error occurred: ' . get_class($e) . ' - ' . $e->getMessage();
+
 			return false;
 		}
 	}

src/Mailer/MandrillMailer.php

@@ -75,17 +75,17 @@ public function send(MailMessage $message)
 		$mail = new PHPMailerLib(true);               // Passing `true` enables exceptions.
 		try {
 			// Enable SMTP if host is set.
-			if (!empty($this->host)) {
+			if (! empty($this->host)) {
 				$mail->SMTPDebug = 0;
 				$mail->isSMTP();
 				$mail->Host = $this->host;
 				$mail->Port = $this->port;
-				if (!empty($this->user)) {
+				if (! empty($this->user)) {
 					$mail->SMTPAuth = true;
 					$mail->Username = $this->user;
 					$mail->Password = $this->password;
 				}
-				if (!empty($this->protocol)) {
+				if (! empty($this->protocol)) {
 					$mail->SMTPSecure = $this->protocol;
 				}
 			}
@@ -138,13 +138,15 @@ public function send(MailMessage $message)
 				$mail->Body    = $message->getBody();
 				$mail->AltBody = $message->getAltBody();
 			} else {
-				$mail->Body    = $message->getAltBody();
+				$mail->Body = $message->getAltBody();
 			}
 
 			$this->errors = array();
+
 			return $mail->send();
 		} catch (PhpMailerException $e) {
 			$this->errors[] = 'Message could not be sent. Mailer Error: ' . $mail->ErrorInfo;
+
 			return false;
 		}
 	}