pryley / castor-framework

src/Services/Email.php

Spacing +9 added lines, -9 removed lines

@@ -56,7 +56,7 @@ 
 		$this->to          = $email['to'];
 
 		add_action( 'phpmailer_init', function( PHPMailer $phpmailer ) {
-			if( $phpmailer->ContentType === 'text/plain' || !empty( $phpmailer->AltBody ))return;
+			if( $phpmailer->ContentType === 'text/plain' || !empty( $phpmailer->AltBody ) )return;
 			$phpmailer->AltBody = $this->buildPlainTextMessage( $phpmailer->Body );
 		});
 
@@ -107,11 +107,11 @@ 
 			'reply-to',
 		];
 
-		$headers = array_intersect_key( $email, array_flip( $allowed ));
+		$headers = array_intersect_key( $email, array_flip( $allowed ) );
 		$headers = array_filter( $headers );
 
 		foreach( $headers as $key => $value ) {
-			unset( $headers[ $key ] );
+			unset( $headers[$key] );
 			$headers[] = sprintf( '%s: %s', $key, $value );
 		}
 
@@ -130,7 +130,7 @@ 
 			? $this->renderTemplate( $email['template'], $email['template-tags'] )
 			: $email['message'];
 
-		$message = $this->filterHtml( $email['before'] . $message . $email['after'] );
+		$message = $this->filterHtml( $email['before'].$message.$email['after'] );
 		$message = str_replace( '{message}', $message, $body );
 
 		return apply_filters( 'castor/email/message', $message, 'html', $this );
@@ -177,7 +177,7 @@ 
 	 */
 	protected function normalize( $email )
 	{
-		$defaults = array_fill_keys([
+		$defaults = array_fill_keys( [
 			'after', 'attachments', 'bcc', 'before', 'cc', 'from', 'message', 'reply-to', 'subject',
 			'template', 'template-tags', 'to',
 		], '' );
@@ -188,7 +188,7 @@ 
 		foreach( ['attachments', 'template-tags'] as $key ) {
 			$email[$key] = array_filter( (array) $email[$key] );
 		}
-		if( empty( $email['reply-to'] )) {
+		if( empty( $email['reply-to'] ) ) {
 			$email['reply-to'] = $email['from'];
 		}
 
@@ -206,10 +206,10 @@ 
 	{
 		$file = $this->template->get( 'castor/email/'.$templatePath );
 
-		if( !file_exists( $file )) {
-			$file = sprintf( '%s/templates/email/%s.php', dirname( dirname( __DIR__ )), $templatePath );
+		if( !file_exists( $file ) ) {
+			$file = sprintf( '%s/templates/email/%s.php', dirname( dirname( __DIR__ ) ), $templatePath );
 		}
-		if( !file_exists( $file ))return;
+		if( !file_exists( $file ) )return;
 
 		ob_start();
 		include $file;

Braces +10 added lines, -5 removed lines

@@ -5,8 +5,7 @@ 
 use GeminiLabs\Castor\Helpers\Template;
 use PHPMailer;
 
-class Email
-{
+class Email {
 	/**
 	 * @var Template
 	 */
@@ -56,7 +55,9 @@ 
 		$this->to          = $email['to'];
 
 		add_action( 'phpmailer_init', function( PHPMailer $phpmailer ) {
-			if( $phpmailer->ContentType === 'text/plain' || !empty( $phpmailer->AltBody ))return;
+			if( $phpmailer->ContentType === 'text/plain' || !empty( $phpmailer->AltBody )) {
+				return;
+			}
 			$phpmailer->AltBody = $this->buildPlainTextMessage( $phpmailer->Body );
 		});
 
@@ -80,7 +81,9 @@ 
 	 */
 	public function send()
 	{
-		if( !$this->message || !$this->subject || !$this->to )return;
+		if( !$this->message || !$this->subject || !$this->to ) {
+			return;
+		}
 
 		$sent = wp_mail(
 			$this->to,
@@ -209,7 +212,9 @@ 
 		if( !file_exists( $file )) {
 			$file = sprintf( '%s/templates/email/%s.php', dirname( dirname( __DIR__ )), $templatePath );
 		}
-		if( !file_exists( $file ))return;
+		if( !file_exists( $file )) {
+			return;
+		}
 
 		ob_start();
 		include $file;