pryley / castor-framework

src/Email.php

Doc Comments +1 added lines

@@ -254,6 +254,7 @@
 	 * - replace certain table elements with a space
 	 * - add a placeholder for plain-text bullets to list elements
 	 * - strip all remaining HTML tags
+	 * @param string $string
 	 * @return string
 	 */
 	protected function stripHtmlTags( $string )

Spacing +60 added lines, -60 removed lines

@@ -42,7 +42,7 @@ 
 	 */
 	protected $to;
 
-	public function __construct( Template $template, Utility $utility )
+	public function __construct(Template $template, Utility $utility)
 	{
 		$this->template = $template;
 		$this->utility  = $utility;
@@ -51,19 +51,19 @@ 
 	/**
 	 * @return Email
 	 */
-	public function compose( array $email )
+	public function compose(array $email)
 	{
-		$email = $this->normalize( $email );
+		$email = $this->normalize($email);
 
 		$this->attachments = $email['attachments'];
-		$this->headers     = $this->buildHeaders( $email );
-		$this->message     = $this->buildHtmlMessage( $email );
+		$this->headers     = $this->buildHeaders($email);
+		$this->message     = $this->buildHtmlMessage($email);
 		$this->subject     = $email['subject'];
 		$this->to          = $email['to'];
 
-		add_action( 'phpmailer_init', function( PHPMailer $phpmailer ) {
-			if( $phpmailer->ContentType === 'text/plain' || !empty( $phpmailer->AltBody ))return;
-			$phpmailer->AltBody = $this->buildPlainTextMessage( $phpmailer->Body );
+		add_action('phpmailer_init', function(PHPMailer $phpmailer) {
+			if ($phpmailer->ContentType === 'text/plain' || !empty($phpmailer->AltBody))return;
+			$phpmailer->AltBody = $this->buildPlainTextMessage($phpmailer->Body);
 		});
 
 		return $this;
@@ -74,10 +74,10 @@ 
 	 *
 	 * @return string|null
 	 */
-	public function read( $plaintext = false )
+	public function read($plaintext = false)
 	{
 		return $plaintext
-			? $this->buildPlainTextMessage( $this->message )
+			? $this->buildPlainTextMessage($this->message)
 			: $this->message;
 	}
 
@@ -86,7 +86,7 @@ 
 	 */
 	public function send()
 	{
-		if( !$this->message || !$this->subject || !$this->to )return;
+		if (!$this->message || !$this->subject || !$this->to)return;
 
 		$sent = wp_mail(
 			$this->to,
@@ -104,7 +104,7 @@ 
 	/**
 	 * @return array
 	 */
-	protected function buildHeaders( array $email )
+	protected function buildHeaders(array $email)
 	{
 		$allowed = [
 			'bcc',
@@ -113,34 +113,34 @@ 
 			'reply-to',
 		];
 
-		$headers = array_intersect_key( $email, array_flip( $allowed ));
-		$headers = array_filter( $headers );
+		$headers = array_intersect_key($email, array_flip($allowed));
+		$headers = array_filter($headers);
 
-		foreach( $headers as $key => $value ) {
-			unset( $headers[ $key ] );
-			$headers[] = sprintf( '%s: %s', $key, $value );
+		foreach ($headers as $key => $value) {
+			unset($headers[$key]);
+			$headers[] = sprintf('%s: %s', $key, $value);
 		}
 
 		$headers[] = 'Content-Type: text/html';
 
-		return apply_filters( 'castor/email/headers', $headers, $this );
+		return apply_filters('castor/email/headers', $headers, $this);
 	}
 
 	/**
 	 * @return string
 	 */
-	protected function buildHtmlMessage( array $email )
+	protected function buildHtmlMessage(array $email)
 	{
-		$body = $this->renderTemplate( 'email' );
+		$body = $this->renderTemplate('email');
 
-		$message = !empty( $email['template'] )
-			? $this->renderTemplate( $email['template'], $email['template-tags'] )
+		$message = !empty($email['template'])
+			? $this->renderTemplate($email['template'], $email['template-tags'])
 			: $email['message'];
 
-		$message = $this->filterHtml( $email['before'] . $message . $email['after'] );
-		$message = str_replace( '{message}', $message, $body );
+		$message = $this->filterHtml($email['before'] . $message . $email['after']);
+		$message = str_replace('{message}', $message, $body);
 
-		return apply_filters( 'castor/email/message', $message, 'html', $this );
+		return apply_filters('castor/email/message', $message, 'html', $this);
 	}
 
 	/**
@@ -148,9 +148,9 @@ 
 	 *
 	 * @return string
 	 */
-	protected function buildPlainTextMessage( $message )
+	protected function buildPlainTextMessage($message)
 	{
-		return apply_filters( 'castor/email/message', $this->stripHtmlTags( $message ), 'text', $this );
+		return apply_filters('castor/email/message', $this->stripHtmlTags($message), 'text', $this);
 	}
 
 	/**
@@ -158,24 +158,24 @@ 
 	 *
 	 * @return string
 	 */
-	protected function filterHtml( $message )
+	protected function filterHtml($message)
 	{
-		$message = strip_shortcodes( $message );
-		$message = wptexturize( $message );
-		$message = wpautop( $message );
-		$message = str_replace( ['<> ', ']]>'], ['', ']]>'], $message );
-		$message = stripslashes( $message );
+		$message = strip_shortcodes($message);
+		$message = wptexturize($message);
+		$message = wpautop($message);
+		$message = str_replace(['<> ', ']]>'], ['', ']]>'], $message);
+		$message = stripslashes($message);
 		return $message;
 	}
 
 	/**
 	 * @return array
 	 */
-	protected function normalize( $email )
+	protected function normalize($email)
 	{
-		$from = sprintf( '%s <%s>',
-			wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES ),
-			get_option( 'admin_email' )
+		$from = sprintf('%s <%s>',
+			wp_specialchars_decode(get_option('blogname'), ENT_QUOTES),
+			get_option('admin_email')
 		);
 
 		$defaults = [
@@ -193,13 +193,13 @@ 
 			'to'            => '',
 		];
 
-		$email = shortcode_atts( $defaults, $email );
+		$email = shortcode_atts($defaults, $email);
 
-		if( empty( $email['reply-to'] )) {
+		if (empty($email['reply-to'])) {
 			$email['reply-to'] = $email['from'];
 		}
 
-		return apply_filters( 'castor/email/compose', $email, $this );
+		return apply_filters('castor/email/compose', $email, $this);
 	}
 
 	/**
@@ -219,20 +219,20 @@ 
 	 *
 	 * @return void|string
 	 */
-	protected function renderTemplate( $templatePath, array $args = [] )
+	protected function renderTemplate($templatePath, array $args = [])
 	{
-		$file = $this->template->get( sprintf( 'castor/%s', $templatePath ));
+		$file = $this->template->get(sprintf('castor/%s', $templatePath));
 
-		if( !file_exists( $file )) {
-			$file = sprintf( '%s/templates/%s.php', dirname( __DIR__ ), $templatePath );
+		if (!file_exists($file)) {
+			$file = sprintf('%s/templates/%s.php', dirname(__DIR__), $templatePath);
 		}
-		if( !file_exists( $file ))return;
+		if (!file_exists($file))return;
 
 		ob_start();
 		include $file;
 		$template = ob_get_clean();
 
-		return $this->renderTemplateString( $template, $args, $print );
+		return $this->renderTemplateString($template, $args, $print);
 	}
 
 	/**
@@ -240,12 +240,12 @@ 
 	 *
 	 * @return string
 	 */
-	protected function renderTemplateString( $template, array $args = [] )
+	protected function renderTemplateString($template, array $args = [])
 	{
-		foreach( $args as $key => $value ) {
-			$template = str_replace( sprintf( '{%s}', $key ), $value, $template );
+		foreach ($args as $key => $value) {
+			$template = str_replace(sprintf('{%s}', $key), $value, $template);
 		}
-		return trim( $template );
+		return trim($template);
 	}
 
 	/**
@@ -256,16 +256,16 @@ 
 	 * - strip all remaining HTML tags
 	 * @return string
 	 */
-	protected function stripHtmlTags( $string )
+	protected function stripHtmlTags($string)
 	{
-		$string = preg_replace( '@<(embed|head|noembed|noscript|object|script|style)[^>]*?>.*?</\\1>@siu', '', $string );
-		$string = preg_replace( '@</(div|h[1-9]|p|pre|tr)@iu', "\r\n\$0", $string );
-		$string = preg_replace( '@</(td|th)@iu', " \$0", $string );
-		$string = preg_replace( '@<(li)[^>]*?>@siu', "\$0-o-^-o-", $string );
-		$string = wp_strip_all_tags( $string );
-		$string = wp_specialchars_decode( $string, ENT_QUOTES );
-		$string = preg_replace( '/\v(?:[\v\h]+){2,}/', "\r\n\r\n", $string );
-		$string = str_replace( '-o-^-o-', ' - ', $string );
-		return html_entity_decode( $string, ENT_QUOTES, 'UTF-8' );
+		$string = preg_replace('@<(embed|head|noembed|noscript|object|script|style)[^>]*?>.*?</\\1>@siu', '', $string);
+		$string = preg_replace('@</(div|h[1-9]|p|pre|tr)@iu', "\r\n\$0", $string);
+		$string = preg_replace('@</(td|th)@iu', " \$0", $string);
+		$string = preg_replace('@<(li)[^>]*?>@siu', "\$0-o-^-o-", $string);
+		$string = wp_strip_all_tags($string);
+		$string = wp_specialchars_decode($string, ENT_QUOTES);
+		$string = preg_replace('/\v(?:[\v\h]+){2,}/', "\r\n\r\n", $string);
+		$string = str_replace('-o-^-o-', ' - ', $string);
+		return html_entity_decode($string, ENT_QUOTES, 'UTF-8');
 	}
 }

Braces +9 added lines, -3 removed lines

@@ -62,7 +62,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 );
 		});
 
@@ -86,7 +88,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,
@@ -226,7 +230,9 @@ 
 		if( !file_exists( $file )) {
 			$file = sprintf( '%s/templates/%s.php', dirname( __DIR__ ), $templatePath );
 		}
-		if( !file_exists( $file ))return;
+		if( !file_exists( $file )) {
+			return;
+		}
 
 		ob_start();
 		include $file;

templates/email.php

Spacing +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 <html>
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title><?= wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES ); ?></title>
+    <title><?= wp_specialchars_decode(get_option('blogname'), ENT_QUOTES); ?></title>
 </head>
 <body>