pryley / castor-framework

src/Helpers/Development.php

Indentation +65 added lines, -65 removed lines

@@ -4,82 +4,82 @@
 
 class Development
 {
-    public $templatePaths = [];
+	public $templatePaths = [];
 
-    protected $utility;
+	protected $utility;
 
-    public function __construct(Utility $utility)
-    {
-        $this->utility = $utility;
-    }
+	public function __construct(Utility $utility)
+	{
+		$this->utility = $utility;
+	}
 
-    public function capture()
-    {
-        ob_start();
-        call_user_func_array([$this, 'printF'], func_get_args());
-        return ob_get_clean();
-    }
+	public function capture()
+	{
+		ob_start();
+		call_user_func_array([$this, 'printF'], func_get_args());
+		return ob_get_clean();
+	}
 
-    public function className($override = 'dev')
-    {
-        return $this->isDev() ? $override : '';
-    }
+	public function className($override = 'dev')
+	{
+		return $this->isDev() ? $override : '';
+	}
 
-    public function debug()
-    {
-        call_user_func_array([$this, 'printF'], func_get_args());
-    }
+	public function debug()
+	{
+		call_user_func_array([$this, 'printF'], func_get_args());
+	}
 
-    public function isDev()
-    {
-        return defined('DEV') && (bool) DEV && WP_ENV == 'development';
-    }
+	public function isDev()
+	{
+		return defined('DEV') && (bool) DEV && WP_ENV == 'development';
+	}
 
-    public function isProduction()
-    {
-        return WP_ENV == 'production';
-    }
+	public function isProduction()
+	{
+		return WP_ENV == 'production';
+	}
 
-    public function printFiltersFor($hook = '')
-    {
-        global $wp_filter;
-        if (empty($hook) || !isset($wp_filter[$hook])) {
-            return;
-        }
-        $this->printF($wp_filter[$hook]);
-    }
+	public function printFiltersFor($hook = '')
+	{
+		global $wp_filter;
+		if (empty($hook) || !isset($wp_filter[$hook])) {
+			return;
+		}
+		$this->printF($wp_filter[$hook]);
+	}
 
-    public function printTemplatePaths()
-    {
-        $this->printF(implode("\n", $this->templatePaths()));
-    }
+	public function printTemplatePaths()
+	{
+		$this->printF(implode("\n", $this->templatePaths()));
+	}
 
-    public function storeTemplatePath($template)
-    {
-        if (is_string($template)) {
-            $this->templatePaths[] = $this->utility->trimLeft($template, trailingslashit(WP_CONTENT_DIR));
-        }
-    }
+	public function storeTemplatePath($template)
+	{
+		if (is_string($template)) {
+			$this->templatePaths[] = $this->utility->trimLeft($template, trailingslashit(WP_CONTENT_DIR));
+		}
+	}
 
-    protected function printF()
-    {
-        $args = func_num_args();
+	protected function printF()
+	{
+		$args = func_num_args();
 
-        if (1 == $args) {
-            printf('<div class="print__r"><pre>%s</pre></div>',
-                htmlspecialchars(print_r(func_get_arg(0), true), ENT_QUOTES, 'UTF-8')
-            );
-        } elseif ($args > 1) {
-            echo '<div class="print__r_group">';
-            foreach (func_get_args() as $value) {
-                $this->printF($value);
-            }
-            echo '</div>';
-        }
-    }
+		if (1 == $args) {
+			printf('<div class="print__r"><pre>%s</pre></div>',
+				htmlspecialchars(print_r(func_get_arg(0), true), ENT_QUOTES, 'UTF-8')
+			);
+		} elseif ($args > 1) {
+			echo '<div class="print__r_group">';
+			foreach (func_get_args() as $value) {
+				$this->printF($value);
+			}
+			echo '</div>';
+		}
+	}
 
-    public function templatePaths()
-    {
-        return $this->templatePaths;
-    }
+	public function templatePaths()
+	{
+		return $this->templatePaths;
+	}
 }

Spacing +18 added lines, -18 removed lines

@@ -8,7 +8,7 @@ 
 
     protected $utility;
 
-    public function __construct(Utility $utility)
+    public function __construct( Utility $utility )
     {
         $this->utility = $utility;
     }
@@ -16,23 +16,23 @@ 
     public function capture()
     {
         ob_start();
-        call_user_func_array([$this, 'printF'], func_get_args());
+        call_user_func_array( [$this, 'printF'], func_get_args() );
         return ob_get_clean();
     }
 
-    public function className($override = 'dev')
+    public function className( $override = 'dev' )
     {
         return $this->isDev() ? $override : '';
     }
 
     public function debug()
     {
-        call_user_func_array([$this, 'printF'], func_get_args());
+        call_user_func_array( [$this, 'printF'], func_get_args() );
     }
 
     public function isDev()
     {
-        return defined('DEV') && (bool) DEV && WP_ENV == 'development';
+        return defined( 'DEV' ) && (bool) DEV && WP_ENV == 'development';
     }
 
     public function isProduction()
@@ -40,24 +40,24 @@ 
         return WP_ENV == 'production';
     }
 
-    public function printFiltersFor($hook = '')
+    public function printFiltersFor( $hook = '' )
     {
         global $wp_filter;
-        if (empty($hook) || !isset($wp_filter[$hook])) {
+        if( empty( $hook ) || !isset( $wp_filter[$hook] ) ) {
             return;
         }
-        $this->printF($wp_filter[$hook]);
+        $this->printF( $wp_filter[$hook] );
     }
 
     public function printTemplatePaths()
     {
-        $this->printF(implode("\n", $this->templatePaths()));
+        $this->printF( implode( "\n", $this->templatePaths() ) );
     }
 
-    public function storeTemplatePath($template)
+    public function storeTemplatePath( $template )
     {
-        if (is_string($template)) {
-            $this->templatePaths[] = $this->utility->trimLeft($template, trailingslashit(WP_CONTENT_DIR));
+        if( is_string( $template ) ) {
+            $this->templatePaths[] = $this->utility->trimLeft( $template, trailingslashit( WP_CONTENT_DIR ) );
         }
     }
 
@@ -65,14 +65,14 @@ 
     {
         $args = func_num_args();
 
-        if (1 == $args) {
-            printf('<div class="print__r"><pre>%s</pre></div>',
-                htmlspecialchars(print_r(func_get_arg(0), true), ENT_QUOTES, 'UTF-8')
+        if( 1 == $args ) {
+            printf( '<div class="print__r"><pre>%s</pre></div>',
+                htmlspecialchars( print_r( func_get_arg( 0 ), true ), ENT_QUOTES, 'UTF-8' )
             );
-        } elseif ($args > 1) {
+        } elseif( $args > 1 ) {
             echo '<div class="print__r_group">';
-            foreach (func_get_args() as $value) {
-                $this->printF($value);
+            foreach( func_get_args() as $value ) {
+                $this->printF( $value );
             }
             echo '</div>';
         }

src/Services/Email.php

Indentation +262 added lines, -262 removed lines

@@ -6,266 +6,266 @@
 
 class Email
 {
-    /**
-     * @var Template
-     */
-    public $template;
-
-    /**
-     * @var array
-     */
-    protected $attachments;
-
-    /**
-     * @var array
-     */
-    protected $headers;
-
-    /**
-     * @var string
-     */
-    protected $message;
-
-    /**
-     * @var string
-     */
-    protected $subject;
-
-    /**
-     * @var string
-     */
-    protected $to;
-
-    public function __construct(Template $template)
-    {
-        $this->template = $template;
-    }
-
-    /**
-     * @return Email
-     */
-    public function compose(array $email)
-    {
-        $email = $this->normalize($email);
-
-        $this->attachments = $email['attachments'];
-        $this->headers = $this->buildHeaders($email);
-        $this->message = $this->buildHtmlMessage($email);
-        $this->subject = $email['subject'];
-        $this->to = $email['to'];
-
-        add_action('phpmailer_init', function ($phpmailer) {
-            if ('text/plain' === $phpmailer->ContentType || !empty($phpmailer->AltBody)) {
-                return;
-            }
-            $phpmailer->AltBody = $this->buildPlainTextMessage($phpmailer->Body);
-        });
-
-        return $this;
-    }
-
-    /**
-     * @param bool $plaintext
-     *
-     * @return string|null
-     */
-    public function read($plaintext = false)
-    {
-        return $plaintext
-            ? $this->buildPlainTextMessage($this->message)
-            : $this->message;
-    }
-
-    /**
-     * @return bool|null
-     */
-    public function send()
-    {
-        if (!$this->message || !$this->subject || !$this->to) {
-            return;
-        }
-
-        $sent = wp_mail(
-            $this->to,
-            $this->subject,
-            $this->message,
-            $this->headers,
-            $this->attachments
-        );
-
-        $this->reset();
-
-        return $sent;
-    }
-
-    /**
-     * @return array
-     */
-    protected function buildHeaders(array $email)
-    {
-        $allowed = [
-            'bcc',
-            'cc',
-            'from',
-            'reply-to',
-        ];
-
-        $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);
-        }
-
-        $headers[] = 'Content-Type: text/html';
-
-        return apply_filters('castor/email/headers', $headers, $this);
-    }
-
-    /**
-     * @return string
-     */
-    protected function buildHtmlMessage(array $email)
-    {
-        $body = $this->renderTemplate('index');
-        $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);
-
-        return apply_filters('castor/email/message', $message, 'html', $this);
-    }
-
-    /**
-     * @param string $message
-     *
-     * @return string
-     */
-    protected function buildPlainTextMessage($message)
-    {
-        return apply_filters('castor/email/message', $this->stripHtmlTags($message), 'text', $this);
-    }
-
-    /**
-     * @param string $message
-     *
-     * @return string
-     */
-    protected function filterHtml($message)
-    {
-        $message = strip_shortcodes($message);
-        $message = wptexturize($message);
-        $message = wpautop($message);
-        $message = str_replace(['<> ', ']]>'], ['', ']]>'], $message);
-        $message = stripslashes($message);
-        return $message;
-    }
-
-    /**
-     * @return string
-     */
-    protected function getDefaultFrom()
-    {
-        return sprintf('%s <%s>',
-            wp_specialchars_decode((string) get_option('blogname'), ENT_QUOTES),
-            (string) get_option('admin_email')
-        );
-    }
-
-    /**
-     * @return array
-     */
-    protected function normalize($email)
-    {
-        $defaults = array_fill_keys([
-            'after', 'attachments', 'bcc', 'before', 'cc', 'from', 'message', 'reply-to', 'subject',
-            'template', 'template-tags', 'to',
-        ], '');
-        $defaults['from'] = $this->getDefaultFrom();
-
-        $email = shortcode_atts($defaults, $email);
-
-        foreach (['attachments', 'template-tags'] as $key) {
-            $email[$key] = array_filter((array) $email[$key]);
-        }
-        if (empty($email['reply-to'])) {
-            $email['reply-to'] = $email['from'];
-        }
-
-        return apply_filters('castor/email/compose', $email, $this);
-    }
-
-    /**
-     * Override by adding the custom template to "templates/castor/" in your theme.
-     *
-     * @param string $templatePath
-     *
-     * @return void|string
-     */
-    protected function renderTemplate($templatePath, array $args = [])
-    {
-        $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)) {
-            return;
-        }
-
-        ob_start();
-        include $file;
-        $template = ob_get_clean();
-
-        return $this->renderTemplateString($template, $args);
-    }
-
-    /**
-     * @param string $template
-     *
-     * @return string
-     */
-    protected function renderTemplateString($template, array $args = [])
-    {
-        foreach ($args as $key => $value) {
-            $template = str_replace('{'.$key.'}', $value, $template);
-        }
-        return trim($template);
-    }
-
-    /**
-     * @return void
-     */
-    protected function reset()
-    {
-        $this->attachments = [];
-        $this->headers = [];
-        $this->message = null;
-        $this->subject = null;
-        $this->to = null;
-    }
-
-    /**
-     * - remove invisible elements
-     * - replace certain elements with a line-break
-     * - replace certain table elements with a space
-     * - add a placeholder for plain-text bullets to list elements
-     * - strip all remaining HTML tags.
-     * @return 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');
-    }
+	/**
+	 * @var Template
+	 */
+	public $template;
+
+	/**
+	 * @var array
+	 */
+	protected $attachments;
+
+	/**
+	 * @var array
+	 */
+	protected $headers;
+
+	/**
+	 * @var string
+	 */
+	protected $message;
+
+	/**
+	 * @var string
+	 */
+	protected $subject;
+
+	/**
+	 * @var string
+	 */
+	protected $to;
+
+	public function __construct(Template $template)
+	{
+		$this->template = $template;
+	}
+
+	/**
+	 * @return Email
+	 */
+	public function compose(array $email)
+	{
+		$email = $this->normalize($email);
+
+		$this->attachments = $email['attachments'];
+		$this->headers = $this->buildHeaders($email);
+		$this->message = $this->buildHtmlMessage($email);
+		$this->subject = $email['subject'];
+		$this->to = $email['to'];
+
+		add_action('phpmailer_init', function ($phpmailer) {
+			if ('text/plain' === $phpmailer->ContentType || !empty($phpmailer->AltBody)) {
+				return;
+			}
+			$phpmailer->AltBody = $this->buildPlainTextMessage($phpmailer->Body);
+		});
+
+		return $this;
+	}
+
+	/**
+	 * @param bool $plaintext
+	 *
+	 * @return string|null
+	 */
+	public function read($plaintext = false)
+	{
+		return $plaintext
+			? $this->buildPlainTextMessage($this->message)
+			: $this->message;
+	}
+
+	/**
+	 * @return bool|null
+	 */
+	public function send()
+	{
+		if (!$this->message || !$this->subject || !$this->to) {
+			return;
+		}
+
+		$sent = wp_mail(
+			$this->to,
+			$this->subject,
+			$this->message,
+			$this->headers,
+			$this->attachments
+		);
+
+		$this->reset();
+
+		return $sent;
+	}
+
+	/**
+	 * @return array
+	 */
+	protected function buildHeaders(array $email)
+	{
+		$allowed = [
+			'bcc',
+			'cc',
+			'from',
+			'reply-to',
+		];
+
+		$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);
+		}
+
+		$headers[] = 'Content-Type: text/html';
+
+		return apply_filters('castor/email/headers', $headers, $this);
+	}
+
+	/**
+	 * @return string
+	 */
+	protected function buildHtmlMessage(array $email)
+	{
+		$body = $this->renderTemplate('index');
+		$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);
+
+		return apply_filters('castor/email/message', $message, 'html', $this);
+	}
+
+	/**
+	 * @param string $message
+	 *
+	 * @return string
+	 */
+	protected function buildPlainTextMessage($message)
+	{
+		return apply_filters('castor/email/message', $this->stripHtmlTags($message), 'text', $this);
+	}
+
+	/**
+	 * @param string $message
+	 *
+	 * @return string
+	 */
+	protected function filterHtml($message)
+	{
+		$message = strip_shortcodes($message);
+		$message = wptexturize($message);
+		$message = wpautop($message);
+		$message = str_replace(['&lt;&gt; ', ']]>'], ['', ']]&gt;'], $message);
+		$message = stripslashes($message);
+		return $message;
+	}
+
+	/**
+	 * @return string
+	 */
+	protected function getDefaultFrom()
+	{
+		return sprintf('%s <%s>',
+			wp_specialchars_decode((string) get_option('blogname'), ENT_QUOTES),
+			(string) get_option('admin_email')
+		);
+	}
+
+	/**
+	 * @return array
+	 */
+	protected function normalize($email)
+	{
+		$defaults = array_fill_keys([
+			'after', 'attachments', 'bcc', 'before', 'cc', 'from', 'message', 'reply-to', 'subject',
+			'template', 'template-tags', 'to',
+		], '');
+		$defaults['from'] = $this->getDefaultFrom();
+
+		$email = shortcode_atts($defaults, $email);
+
+		foreach (['attachments', 'template-tags'] as $key) {
+			$email[$key] = array_filter((array) $email[$key]);
+		}
+		if (empty($email['reply-to'])) {
+			$email['reply-to'] = $email['from'];
+		}
+
+		return apply_filters('castor/email/compose', $email, $this);
+	}
+
+	/**
+	 * Override by adding the custom template to "templates/castor/" in your theme.
+	 *
+	 * @param string $templatePath
+	 *
+	 * @return void|string
+	 */
+	protected function renderTemplate($templatePath, array $args = [])
+	{
+		$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)) {
+			return;
+		}
+
+		ob_start();
+		include $file;
+		$template = ob_get_clean();
+
+		return $this->renderTemplateString($template, $args);
+	}
+
+	/**
+	 * @param string $template
+	 *
+	 * @return string
+	 */
+	protected function renderTemplateString($template, array $args = [])
+	{
+		foreach ($args as $key => $value) {
+			$template = str_replace('{'.$key.'}', $value, $template);
+		}
+		return trim($template);
+	}
+
+	/**
+	 * @return void
+	 */
+	protected function reset()
+	{
+		$this->attachments = [];
+		$this->headers = [];
+		$this->message = null;
+		$this->subject = null;
+		$this->to = null;
+	}
+
+	/**
+	 * - remove invisible elements
+	 * - replace certain elements with a line-break
+	 * - replace certain table elements with a space
+	 * - add a placeholder for plain-text bullets to list elements
+	 * - strip all remaining HTML tags.
+	 * @return 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');
+	}
 }

Spacing +64 added lines, -64 removed lines

@@ -36,7 +36,7 @@ 
      */
     protected $to;
 
-    public function __construct(Template $template)
+    public function __construct( Template $template )
     {
         $this->template = $template;
     }
@@ -44,21 +44,21 @@ 
     /**
      * @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) {
-            if ('text/plain' === $phpmailer->ContentType || !empty($phpmailer->AltBody)) {
+        add_action( 'phpmailer_init', function( $phpmailer ) {
+            if( 'text/plain' === $phpmailer->ContentType || !empty( $phpmailer->AltBody ) ) {
                 return;
             }
-            $phpmailer->AltBody = $this->buildPlainTextMessage($phpmailer->Body);
+            $phpmailer->AltBody = $this->buildPlainTextMessage( $phpmailer->Body );
         });
 
         return $this;
@@ -69,10 +69,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;
     }
 
@@ -81,7 +81,7 @@ 
      */
     public function send()
     {
-        if (!$this->message || !$this->subject || !$this->to) {
+        if( !$this->message || !$this->subject || !$this->to ) {
             return;
         }
 
@@ -101,7 +101,7 @@ 
     /**
      * @return array
      */
-    protected function buildHeaders(array $email)
+    protected function buildHeaders( array $email )
     {
         $allowed = [
             'bcc',
@@ -110,33 +110,33 @@ 
             '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('index');
-        $message = !empty($email['template'])
-            ? $this->renderTemplate($email['template'], $email['template-tags'])
+        $body = $this->renderTemplate( 'index' );
+        $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 );
     }
 
     /**
@@ -144,9 +144,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 );
     }
 
     /**
@@ -154,13 +154,13 @@ 
      *
      * @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;
     }
 
@@ -169,33 +169,33 @@ 
      */
     protected function getDefaultFrom()
     {
-        return sprintf('%s <%s>',
-            wp_specialchars_decode((string) get_option('blogname'), ENT_QUOTES),
-            (string) get_option('admin_email')
+        return sprintf( '%s <%s>',
+            wp_specialchars_decode( (string) get_option( 'blogname' ), ENT_QUOTES ),
+            (string) get_option( 'admin_email' )
         );
     }
 
     /**
      * @return array
      */
-    protected function normalize($email)
+    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',
-        ], '');
+        ], '' );
         $defaults['from'] = $this->getDefaultFrom();
 
-        $email = shortcode_atts($defaults, $email);
+        $email = shortcode_atts( $defaults, $email );
 
-        foreach (['attachments', 'template-tags'] as $key) {
-            $email[$key] = array_filter((array) $email[$key]);
+        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'];
         }
 
-        return apply_filters('castor/email/compose', $email, $this);
+        return apply_filters( 'castor/email/compose', $email, $this );
     }
 
     /**
@@ -205,14 +205,14 @@ 
      *
      * @return void|string
      */
-    protected function renderTemplate($templatePath, array $args = [])
+    protected function renderTemplate( $templatePath, array $args = [] )
     {
-        $file = $this->template->get('castor/email/'.$templatePath);
+        $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)) {
+        if( !file_exists( $file ) ) {
             return;
         }
 
@@ -220,7 +220,7 @@ 
         include $file;
         $template = ob_get_clean();
 
-        return $this->renderTemplateString($template, $args);
+        return $this->renderTemplateString( $template, $args );
     }
 
     /**
@@ -228,12 +228,12 @@ 
      *
      * @return string
      */
-    protected function renderTemplateString($template, array $args = [])
+    protected function renderTemplateString( $template, array $args = [] )
     {
-        foreach ($args as $key => $value) {
-            $template = str_replace('{'.$key.'}', $value, $template);
+        foreach( $args as $key => $value ) {
+            $template = str_replace( '{'.$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 +1 added lines, -2 removed lines

@@ -4,8 +4,7 @@
 
 use GeminiLabs\Castor\Helpers\Template;
 
-class Email
-{
+class Email {
     /**
      * @var Template
      */