jacobemerick / archangel

src/Archangel.php

Doc Comments +9 added lines, -9 removed lines

@@ -83,7 +83,7 @@ 
      * @param string $address email address for the recipient
      * @param string $title   name of the recipient (optional)
 
-     * @return object instantiated $this
+     * @return Archangel instantiated $this
      */
     public function addTo($address, $title = '')
     {
@@ -101,7 +101,7 @@ 
      * @param string $address email address for the cc recipient
      * @param string $title   name of the cc recipient (optional)
      *
-     * @return object instantiated $this
+     * @return Archangel instantiated $this
      */
     public function addCC($address, $title = '')
     {
@@ -119,7 +119,7 @@ 
      * @param string $address email address for the bcc recipient
      * @param string $title   name of the bcc recipient (optional)
      *
-     * @return object instantiated $this
+     * @return Archangel instantiated $this
      */
     public function addBCC($address, $title = '')
     {
@@ -137,7 +137,7 @@ 
      * @param string $address email address for the sender
      * @param string $title   name of the sender (optional)
      *
-     * @return object instantiated $this
+     * @return Archangel instantiated $this
      */
     public function setFrom($address, $title = '')
     {
@@ -155,7 +155,7 @@ 
      * @param string $address email address for the reply-to
      * @param string $title   name of the reply-to (optional)
      *
-     * @return object instantiated $this
+     * @return Archangel instantiated $this
      */
     public function setReplyTo($address, $title = '')
     {
@@ -172,7 +172,7 @@ 
      *
      * @param string $subject subject for the email
      *
-     * @return object instantiated $this
+     * @return Archangel instantiated $this
      */
     public function setSubject($subject)
     {
@@ -186,7 +186,7 @@ 
      *
      * @param string $message the plain-text message
      *
-     * @return object instantiated $this
+     * @return Archangel instantiated $this
      */
     public function setPlainMessage($message)
     {
@@ -200,7 +200,7 @@ 
      *
      * @param string $message the html message
      *
-     * @return object instantiated $this
+     * @return Archangel instantiated $this
      */
     public function setHTMLMessage($message)
     {
@@ -216,7 +216,7 @@ 
      * @param string $type  mime type of the file
      * @param string $title the title of the attachment (optional)
      *
-     * @return object instantiated $this
+     * @return Archangel instantiated $this
      */
     public function addAttachment($path, $type, $title = '')
     {

Indentation +403 added lines, -404 removed lines

@@ -16,410 +16,409 @@
 class Archangel implements LoggerAwareInterface
 {
 
-    /** @var string $subject */
-    protected $subject;
-
-    /** @var array $toAddresses */
-    protected $toAddresses = array();
-
-    /** @var array $ccAddresses */
-    protected $ccAddresses = array();
-
-    /** @var array $bccAddresses */
-    protected $bccAddresses = array();
-
-    /** @var array $headers */
-    protected $headers = array();
-
-    /** @var string $plainMessage */
-    protected $plainMessage;
-
-    /** @var string $htmlMessage */
-    protected $htmlMessage;
-
-    /** @var array $attachments */
-    protected $attachments = array();
-
-    /** @var string $boundary */
-    protected $boundary;
-
-    /** @var string $alternativeBoundary */
-    protected $alternativeBoundary;
-
-    /** @var LoggerInterface */
-    protected $logger;
-
-    /** @var string LINE_BREAK */
-    const LINE_BREAK = "\r\n";
-
-    /**
-     * @param string $mailer
-     */
-    public function __construct($mailer = null)
-    {
-        if (is_null($mailer)) {
-            $mailer = sprintf('PHP/%s', phpversion());
-        }
-        $this->headers['X-Mailer'] = $mailer;
-
-        $this->logger = new NullLogger();
-    }
-
-    /**
-     * @param LoggerInterface $logger
-     *
-     * @return $this;
-     */
-    public function setLogger(LoggerInterface $logger)
-    {
-        $this->logger = $logger;
-
-        return $this;
-    }
-
-    /**
-     * Setter method for adding recipients
-     *
-     * @param string $address email address for the recipient
-     * @param string $title   name of the recipient (optional)
-
-     * @return object instantiated $this
-     */
-    public function addTo($address, $title = '')
-    {
-        if (!empty($title)) {
-            $address = sprintf('"%s" <%s>', $title, $address);
-        }
-        array_push($this->toAddresses, $address);
-
-        return $this;
-    }
-
-    /**
-     * Setter method for adding cc recipients
-     *
-     * @param string $address email address for the cc recipient
-     * @param string $title   name of the cc recipient (optional)
-     *
-     * @return object instantiated $this
-     */
-    public function addCC($address, $title = '')
-    {
-        if (!empty($title)) {
-            $address = sprintf('"%s" <%s>', $title, $address);
-        }
-        array_push($this->ccAddresses, $address);
-
-        return $this;
-    }
-
-    /**
-     * Setter method for adding bcc recipients
-     *
-     * @param string $address email address for the bcc recipient
-     * @param string $title   name of the bcc recipient (optional)
-     *
-     * @return object instantiated $this
-     */
-    public function addBCC($address, $title = '')
-    {
-        if (!empty($title)) {
-            $address = sprintf('"%s" <%s>', $title, $address);
-        }
-        array_push($this->bccAddresses, $address);
-
-        return $this;
-    }
-
-    /**
-     * Setter method for setting the single 'from' field
-     *
-     * @param string $address email address for the sender
-     * @param string $title   name of the sender (optional)
-     *
-     * @return object instantiated $this
-     */
-    public function setFrom($address, $title = '')
-    {
-        if (!empty($title)) {
-            $address = sprintf('"%s" <%s>', $title, $address);
-        }
-        $this->headers['From'] = $address;
-
-        return $this;
-    }
-
-    /**
-     * Setter method for setting the single 'reply-to' field
-     *
-     * @param string $address email address for the reply-to
-     * @param string $title   name of the reply-to (optional)
-     *
-     * @return object instantiated $this
-     */
-    public function setReplyTo($address, $title = '')
-    {
-        if (!empty($title)) {
-            $address = sprintf('"%s" <%s>', $title, $address);
-        }
-        $this->headers['Reply-To'] = $address;
-
-        return $this;
-    }
-
-    /**
-     * Setter method for setting a subject
-     *
-     * @param string $subject subject for the email
-     *
-     * @return object instantiated $this
-     */
-    public function setSubject($subject)
-    {
-        $this->subject = $subject;
-
-        return $this;
-    }
-
-    /**
-     * Setter method for the plain text message
-     *
-     * @param string $message the plain-text message
-     *
-     * @return object instantiated $this
-     */
-    public function setPlainMessage($message)
-    {
-        $this->plainMessage = $message;
-
-        return $this;
-    }
-
-    /**
-     * Setter method for the html message
-     *
-     * @param string $message the html message
-     *
-     * @return object instantiated $this
-     */
-    public function setHTMLMessage($message)
-    {
-        $this->htmlMessage = $message;
-
-        return $this;
-    }
-
-    /**
-     * Setter method for adding attachments
-     *
-     * @param string $path  the full path of the attachment
-     * @param string $type  mime type of the file
-     * @param string $title the title of the attachment (optional)
-     *
-     * @return object instantiated $this
-     */
-    public function addAttachment($path, $type, $title = '')
-    {
-        array_push($this->attachments, array(
-          'path' => $path,
-          'type' => $type,
-          'title' => $title,
-        ));
-
-        return $this;
-    }
-
-    /**
-     * The executing step, the actual sending of the email
-     * First checks to make sure the minimum fields are set (returns false if they are not)
-     * Second it attempts to send the mail with php's mail() (returns false if it fails)
-     *
-     * return boolean whether or not the email was valid & sent
-     */
-    public function send()
-    {
-        if (!$this->checkRequiredFields()) {
-            return false;
-        }
-
-        $recipients = $this->buildTo();
-        $subject = $this->subject;
-        $message = $this->buildMessage();
-        $headers = $this->buildHeaders();
-
-        return mail($recipients, $subject, $message, $headers);
-    }
-
-    /**
-     * Call to check the minimum required fields
-     *
-     * @return boolean whether or not the email meets the minimum required fields
-     */
-    protected function checkRequiredFields()
-    {
-        if (empty($this->toAddresses)) {
-            return false;
-        }
-        if (empty($this->subject)) {
-            return false;
-        }
-
-        if (empty($this->plainMessage) && empty($this->htmlMessage) && empty($this->attachments)) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Build the recipients from 'to'
-     *
-     * @return string comma-separated lit of recipients
-     */
-    protected function buildTo()
-    {
-        return implode(', ', $this->toAddresses);
-    }
-
-    /**
-     * Long, nasty creater of the actual message, with all the multipart logic you'd never want to see
-     *
-     * @return string email message
-     */
-    protected function buildMessage()
-    {
-        $messageString = '';
+	/** @var string $subject */
+	protected $subject;
+
+	/** @var array $toAddresses */
+	protected $toAddresses = array();
+
+	/** @var array $ccAddresses */
+	protected $ccAddresses = array();
+
+	/** @var array $bccAddresses */
+	protected $bccAddresses = array();
+
+	/** @var array $headers */
+	protected $headers = array();
+
+	/** @var string $plainMessage */
+	protected $plainMessage;
+
+	/** @var string $htmlMessage */
+	protected $htmlMessage;
+
+	/** @var array $attachments */
+	protected $attachments = array();
+
+	/** @var string $boundary */
+	protected $boundary;
+
+	/** @var string $alternativeBoundary */
+	protected $alternativeBoundary;
+
+	/** @var LoggerInterface */
+	protected $logger;
+
+	/** @var string LINE_BREAK */
+	const LINE_BREAK = "\r\n";
+
+	/**
+	 * @param string $mailer
+	 */
+	public function __construct($mailer = null)
+	{
+		if (is_null($mailer)) {
+			$mailer = sprintf('PHP/%s', phpversion());
+		}
+		$this->headers['X-Mailer'] = $mailer;
+
+		$this->logger = new NullLogger();
+	}
+
+	/**
+	 * @param LoggerInterface $logger
+	 *
+	 * @return $this;
+	 */
+	public function setLogger(LoggerInterface $logger)
+	{
+		$this->logger = $logger;
+
+		return $this;
+	}
+
+	/**
+	 * Setter method for adding recipients
+	 *
+	 * @param string $address email address for the recipient
+	 * @param string $title   name of the recipient (optional)
+	 * @return object instantiated $this
+	 */
+	public function addTo($address, $title = '')
+	{
+		if (!empty($title)) {
+			$address = sprintf('"%s" <%s>', $title, $address);
+		}
+		array_push($this->toAddresses, $address);
+
+		return $this;
+	}
+
+	/**
+	 * Setter method for adding cc recipients
+	 *
+	 * @param string $address email address for the cc recipient
+	 * @param string $title   name of the cc recipient (optional)
+	 *
+	 * @return object instantiated $this
+	 */
+	public function addCC($address, $title = '')
+	{
+		if (!empty($title)) {
+			$address = sprintf('"%s" <%s>', $title, $address);
+		}
+		array_push($this->ccAddresses, $address);
+
+		return $this;
+	}
+
+	/**
+	 * Setter method for adding bcc recipients
+	 *
+	 * @param string $address email address for the bcc recipient
+	 * @param string $title   name of the bcc recipient (optional)
+	 *
+	 * @return object instantiated $this
+	 */
+	public function addBCC($address, $title = '')
+	{
+		if (!empty($title)) {
+			$address = sprintf('"%s" <%s>', $title, $address);
+		}
+		array_push($this->bccAddresses, $address);
+
+		return $this;
+	}
+
+	/**
+	 * Setter method for setting the single 'from' field
+	 *
+	 * @param string $address email address for the sender
+	 * @param string $title   name of the sender (optional)
+	 *
+	 * @return object instantiated $this
+	 */
+	public function setFrom($address, $title = '')
+	{
+		if (!empty($title)) {
+			$address = sprintf('"%s" <%s>', $title, $address);
+		}
+		$this->headers['From'] = $address;
+
+		return $this;
+	}
+
+	/**
+	 * Setter method for setting the single 'reply-to' field
+	 *
+	 * @param string $address email address for the reply-to
+	 * @param string $title   name of the reply-to (optional)
+	 *
+	 * @return object instantiated $this
+	 */
+	public function setReplyTo($address, $title = '')
+	{
+		if (!empty($title)) {
+			$address = sprintf('"%s" <%s>', $title, $address);
+		}
+		$this->headers['Reply-To'] = $address;
+
+		return $this;
+	}
+
+	/**
+	 * Setter method for setting a subject
+	 *
+	 * @param string $subject subject for the email
+	 *
+	 * @return object instantiated $this
+	 */
+	public function setSubject($subject)
+	{
+		$this->subject = $subject;
+
+		return $this;
+	}
+
+	/**
+	 * Setter method for the plain text message
+	 *
+	 * @param string $message the plain-text message
+	 *
+	 * @return object instantiated $this
+	 */
+	public function setPlainMessage($message)
+	{
+		$this->plainMessage = $message;
+
+		return $this;
+	}
+
+	/**
+	 * Setter method for the html message
+	 *
+	 * @param string $message the html message
+	 *
+	 * @return object instantiated $this
+	 */
+	public function setHTMLMessage($message)
+	{
+		$this->htmlMessage = $message;
+
+		return $this;
+	}
+
+	/**
+	 * Setter method for adding attachments
+	 *
+	 * @param string $path  the full path of the attachment
+	 * @param string $type  mime type of the file
+	 * @param string $title the title of the attachment (optional)
+	 *
+	 * @return object instantiated $this
+	 */
+	public function addAttachment($path, $type, $title = '')
+	{
+		array_push($this->attachments, array(
+		  'path' => $path,
+		  'type' => $type,
+		  'title' => $title,
+		));
+
+		return $this;
+	}
+
+	/**
+	 * The executing step, the actual sending of the email
+	 * First checks to make sure the minimum fields are set (returns false if they are not)
+	 * Second it attempts to send the mail with php's mail() (returns false if it fails)
+	 *
+	 * return boolean whether or not the email was valid & sent
+	 */
+	public function send()
+	{
+		if (!$this->checkRequiredFields()) {
+			return false;
+		}
+
+		$recipients = $this->buildTo();
+		$subject = $this->subject;
+		$message = $this->buildMessage();
+		$headers = $this->buildHeaders();
+
+		return mail($recipients, $subject, $message, $headers);
+	}
+
+	/**
+	 * Call to check the minimum required fields
+	 *
+	 * @return boolean whether or not the email meets the minimum required fields
+	 */
+	protected function checkRequiredFields()
+	{
+		if (empty($this->toAddresses)) {
+			return false;
+		}
+		if (empty($this->subject)) {
+			return false;
+		}
+
+		if (empty($this->plainMessage) && empty($this->htmlMessage) && empty($this->attachments)) {
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Build the recipients from 'to'
+	 *
+	 * @return string comma-separated lit of recipients
+	 */
+	protected function buildTo()
+	{
+		return implode(', ', $this->toAddresses);
+	}
+
+	/**
+	 * Long, nasty creater of the actual message, with all the multipart logic you'd never want to see
+	 *
+	 * @return string email message
+	 */
+	protected function buildMessage()
+	{
+		$messageString = '';
         
-        if (!empty($this->attachments)) {
-            $messageString .= "--{$this->getBoundary()}" . self::LINE_BREAK;
-        }
-        if (!empty($this->plainMessage) && !empty($this->htmlMessage)) {
-            if (!empty($this->attachments)) {
-                $messageString .= "Content-Type: multipart/alternative; boundary={$this->getAlternativeBoundary()}" . self::LINE_BREAK;
-                $messageString .= self::LINE_BREAK;
-            }
-            $messageString .= "--{$this->getAlternativeBoundary()}" . self::LINE_BREAK;
-            $messageString .= 'Content-Type: text/plain; charset="iso-8859"' . self::LINE_BREAK;
-            $messageString .= 'Content-Transfer-Encoding: 7bit' . self::LINE_BREAK;
-            $messageString .= self::LINE_BREAK;
-            $messageString .= $this->plainMessage;
-            $messageString .= self::LINE_BREAK;
-            $messageString .= "--{$this->getAlternativeBoundary()}" . self::LINE_BREAK;
-            $messageString .= 'Content-Type: text/html; charset="iso-8859-1"' . self::LINE_BREAK;
-            $messageString .= 'Content-Transfer-Encoding: 7bit' . self::LINE_BREAK;
-            $messageString .= self::LINE_BREAK;
-            $messageString .= $this->htmlMessage;
-            $messageString .= self::LINE_BREAK;
-            $messageString .= "--{$this->getAlternativeBoundary()}--" . self::LINE_BREAK;
-            $messageString .= self::LINE_BREAK;
-        } elseif (!empty($this->plainMessage)) {
-            if (!empty($this->attachments)) {
-                $messageString .= 'Content-Type: text/plain; charset="iso-8859"' . self::LINE_BREAK;
-                $messageString .= 'Content-Transfer-Encoding: 7bit' . self::LINE_BREAK;
-                $messageString .= self::LINE_BREAK;
-            }
-            $messageString .= $this->plainMessage;
-            $messageString .= self::LINE_BREAK;
-        } elseif (!empty($this->htmlMessage)) {
-            if (!empty($this->attachments)) {
-                $messageString .= 'Content-Type: text/html; charset="iso-8859-1"' . self::LINE_BREAK;
-                $messageString .= 'Content-Transfer-Encoding: 7bit' . self::LINE_BREAK;
-                $messageString .= self::LINE_BREAK;
-            }
-            $messageString .= $this->htmlMessage;
-            $messageString .= self::LINE_BREAK;
-        }
-        if (!empty($this->attachments)) {
-            foreach ($this->attachments as $attachment) {
-                $messageString .= "--{$this->getBoundary()}" . self::LINE_BREAK;
-                $messageString .= "Content-Type: {$attachment['type']}; name=\"{$attachment['title']}\"" . self::LINE_BREAK;
-                $messageString .= 'Content-Transfer-Encoding: base64' . self::LINE_BREAK;
-                $messageString .= 'Content-Disposition: attachment' . self::LINE_BREAK;
-                $messageString .= self::LINE_BREAK;
-                $messageString .= $this->buildAttachmentContent($attachment);
-                $messageString .= self::LINE_BREAK;
-            }
-            $messageString .= "--{$this->getBoundary()}--" . self::LINE_BREAK;
-        }
-        return $messageString;
-    }
-
-
-    /**
-     * Builder for the additional headers needed for multipart emails
-     *
-     * @return string headers needed for multipart
-     */
-    protected function buildHeaders()
-    {
-        $headerString = '';
-        foreach ($this->headers as $key => $value) {
-            $headerString .= sprintf('%s: %s', $key, $value) . self::LINE_BREAK;
-        }
-
-        if (!empty($this->ccAddresses)) {
-            $headerString .= 'CC: ' . implode(', ', $this->ccAddresses) . self::LINE_BREAK;
-        }
-        if (!empty($this->bccAddresses)) {
-            $headerString .= 'BCC: ' . implode(', ', $this->bccAddresses) . self::LINE_BREAK;
-        }
+		if (!empty($this->attachments)) {
+			$messageString .= "--{$this->getBoundary()}" . self::LINE_BREAK;
+		}
+		if (!empty($this->plainMessage) && !empty($this->htmlMessage)) {
+			if (!empty($this->attachments)) {
+				$messageString .= "Content-Type: multipart/alternative; boundary={$this->getAlternativeBoundary()}" . self::LINE_BREAK;
+				$messageString .= self::LINE_BREAK;
+			}
+			$messageString .= "--{$this->getAlternativeBoundary()}" . self::LINE_BREAK;
+			$messageString .= 'Content-Type: text/plain; charset="iso-8859"' . self::LINE_BREAK;
+			$messageString .= 'Content-Transfer-Encoding: 7bit' . self::LINE_BREAK;
+			$messageString .= self::LINE_BREAK;
+			$messageString .= $this->plainMessage;
+			$messageString .= self::LINE_BREAK;
+			$messageString .= "--{$this->getAlternativeBoundary()}" . self::LINE_BREAK;
+			$messageString .= 'Content-Type: text/html; charset="iso-8859-1"' . self::LINE_BREAK;
+			$messageString .= 'Content-Transfer-Encoding: 7bit' . self::LINE_BREAK;
+			$messageString .= self::LINE_BREAK;
+			$messageString .= $this->htmlMessage;
+			$messageString .= self::LINE_BREAK;
+			$messageString .= "--{$this->getAlternativeBoundary()}--" . self::LINE_BREAK;
+			$messageString .= self::LINE_BREAK;
+		} elseif (!empty($this->plainMessage)) {
+			if (!empty($this->attachments)) {
+				$messageString .= 'Content-Type: text/plain; charset="iso-8859"' . self::LINE_BREAK;
+				$messageString .= 'Content-Transfer-Encoding: 7bit' . self::LINE_BREAK;
+				$messageString .= self::LINE_BREAK;
+			}
+			$messageString .= $this->plainMessage;
+			$messageString .= self::LINE_BREAK;
+		} elseif (!empty($this->htmlMessage)) {
+			if (!empty($this->attachments)) {
+				$messageString .= 'Content-Type: text/html; charset="iso-8859-1"' . self::LINE_BREAK;
+				$messageString .= 'Content-Transfer-Encoding: 7bit' . self::LINE_BREAK;
+				$messageString .= self::LINE_BREAK;
+			}
+			$messageString .= $this->htmlMessage;
+			$messageString .= self::LINE_BREAK;
+		}
+		if (!empty($this->attachments)) {
+			foreach ($this->attachments as $attachment) {
+				$messageString .= "--{$this->getBoundary()}" . self::LINE_BREAK;
+				$messageString .= "Content-Type: {$attachment['type']}; name=\"{$attachment['title']}\"" . self::LINE_BREAK;
+				$messageString .= 'Content-Transfer-Encoding: base64' . self::LINE_BREAK;
+				$messageString .= 'Content-Disposition: attachment' . self::LINE_BREAK;
+				$messageString .= self::LINE_BREAK;
+				$messageString .= $this->buildAttachmentContent($attachment);
+				$messageString .= self::LINE_BREAK;
+			}
+			$messageString .= "--{$this->getBoundary()}--" . self::LINE_BREAK;
+		}
+		return $messageString;
+	}
+
+
+	/**
+	 * Builder for the additional headers needed for multipart emails
+	 *
+	 * @return string headers needed for multipart
+	 */
+	protected function buildHeaders()
+	{
+		$headerString = '';
+		foreach ($this->headers as $key => $value) {
+			$headerString .= sprintf('%s: %s', $key, $value) . self::LINE_BREAK;
+		}
+
+		if (!empty($this->ccAddresses)) {
+			$headerString .= 'CC: ' . implode(', ', $this->ccAddresses) . self::LINE_BREAK;
+		}
+		if (!empty($this->bccAddresses)) {
+			$headerString .= 'BCC: ' . implode(', ', $this->bccAddresses) . self::LINE_BREAK;
+		}
         
-        if (!empty($this->attachments)) {
-            $headerString .= "Content-Type: multipart/mixed; boundary=\"{$this->getBoundary()}\"";
-        } elseif (!empty($this->plainMessage) && !empty($this->htmlMessage)) {
-            $headerString .= "Content-Type: multipart/alternative; boundary=\"{$this->getAlternativeBoundary()}\"";
-        } elseif (!empty($this->htmlMessage)) {
-            $headerString .= 'Content-type: text/html; charset="iso-8859-1"';
-        }
-
-        return $headerString;
-    }
-
-    /**
-     * File reader for attachments
-     *
-     * @return string binary representation of file, base64'd
-     */
-    protected function buildAttachmentContent($attachment)
-    {
-        if (!file_exists($attachment['path'])) {
-            return ''; // todo log error
-        }
-
-        $handle = fopen($attachment['path'], 'r');
-        $contents = fread($handle, filesize($attachment['path']));
-        fclose($handle);
-
-        $contents = base64_encode($contents);
-        $contents = chunk_split($contents);
-        return $contents;
-    }
-
-    /**
-     * Holder for the boundry logic
-     * Not called/created unless it's needed
-     *
-     * @return  string  boundary
-     */
-    protected function getBoundary()
-    {
-        if (!isset($this->boundary)) {
-            $this->boundary = sprintf('PHP-mixed-%s', uniqid());
-        }
-        return $this->boundary;
-    }
-
-    /**
-     * Holder to create the alternative boundry logic
-     * Not called/created unless it's needed
-     *
-     * @return string alternative boundary
-     */
-    protected function getAlternativeBoundary()
-    {
-        if (!isset($this->alternativeBoundary)) {
-            $this->alternativeBoundary = sprintf('PHP-alternative-%s', uniqid());
-        }
-        return $this->alternativeBoundary;
-    }
+		if (!empty($this->attachments)) {
+			$headerString .= "Content-Type: multipart/mixed; boundary=\"{$this->getBoundary()}\"";
+		} elseif (!empty($this->plainMessage) && !empty($this->htmlMessage)) {
+			$headerString .= "Content-Type: multipart/alternative; boundary=\"{$this->getAlternativeBoundary()}\"";
+		} elseif (!empty($this->htmlMessage)) {
+			$headerString .= 'Content-type: text/html; charset="iso-8859-1"';
+		}
+
+		return $headerString;
+	}
+
+	/**
+	 * File reader for attachments
+	 *
+	 * @return string binary representation of file, base64'd
+	 */
+	protected function buildAttachmentContent($attachment)
+	{
+		if (!file_exists($attachment['path'])) {
+			return ''; // todo log error
+		}
+
+		$handle = fopen($attachment['path'], 'r');
+		$contents = fread($handle, filesize($attachment['path']));
+		fclose($handle);
+
+		$contents = base64_encode($contents);
+		$contents = chunk_split($contents);
+		return $contents;
+	}
+
+	/**
+	 * Holder for the boundry logic
+	 * Not called/created unless it's needed
+	 *
+	 * @return  string  boundary
+	 */
+	protected function getBoundary()
+	{
+		if (!isset($this->boundary)) {
+			$this->boundary = sprintf('PHP-mixed-%s', uniqid());
+		}
+		return $this->boundary;
+	}
+
+	/**
+	 * Holder to create the alternative boundry logic
+	 * Not called/created unless it's needed
+	 *
+	 * @return string alternative boundary
+	 */
+	protected function getAlternativeBoundary()
+	{
+		if (!isset($this->alternativeBoundary)) {
+			$this->alternativeBoundary = sprintf('PHP-alternative-%s', uniqid());
+		}
+		return $this->alternativeBoundary;
+	}
 }

tests/ArchangelTest.php

Indentation +161 added lines, -161 removed lines

@@ -8,166 +8,166 @@
 class ArchangelTest extends PHPUnit_Framework_TestCase
 {
 
-    public function testIsInstanceOfArchangel()
-    {
-        $archangel = new Archangel();
-
-        $this->assertInstanceOf('Jacobemerick\Archangel\Archangel', $archangel);
-    }
+	public function testIsInstanceOfArchangel()
+	{
+		$archangel = new Archangel();
+
+		$this->assertInstanceOf('Jacobemerick\Archangel\Archangel', $archangel);
+	}
 
-    public function testIsLoggerAwareInterface()
-    {
-        $archangel = new Archangel();
-
-        $this->assertInstanceOf('Psr\Log\LoggerAwareInterface', $archangel);
-    }
-
-    public function testConstructSetsDefaultMailer()
-    {
-        $archangel = new Archangel();
-        $mailer = sprintf('PHP/%s', phpversion());
-        $headers = array('X-Mailer' => $mailer);
-
-        $this->assertAttributeEquals($headers, 'headers', $archangel);
-    }
-
-    public function testConstructOverridesMailer()
-    {
-        $archangel = new Archangel('AwesomeMailer');
-        $headers = array('X-Mailer' => 'AwesomeMailer');
-
-        $this->assertAttributeEquals($headers, 'headers', $archangel);
-    }
-
-    public function testConstructSetsNullLogger()
-    {
-        $archangel = new Archangel();
-
-        $this->assertAttributeInstanceOf('Psr\Log\NullLogger', 'logger', $archangel);
-    }
-
-    public function testSetLogger()
-    {
-        $logger = $this->getMock('Psr\Log\LoggerInterface');
-        $archangel = new Archangel();
-        $archangel->setLogger($logger);
-
-        $this->assertAttributeSame($logger, 'logger', $archangel);
-    }
-
-    public function testAddTo()
-    {
-        $archangel = new Archangel();
-        $archangel->addTo('test@example.com');
-
-        $this->assertAttributeContains('test@example.com', 'toAddresses', $archangel);
-    }
-
-    public function testAddToMultiple()
-    {
-        $archangel = new Archangel();
-        $archangel->addTo('testOne@example.com');
-        $archangel->addTo('testTwo@example.com');
-
-        $this->assertAttributeContains('testOne@example.com', 'toAddresses', $archangel);
-        $this->assertAttributeContains('testTwo@example.com', 'toAddresses', $archangel);
-    }
-
-    public function testAddToWithTitle()
-    {
-        $archangel = new Archangel();
-        $archangel->addTo('test@example.com', 'Mr. Test Alot');
-
-        $this->assertAttributeContains('"Mr. Test Alot" <test@example.com>', 'toAddresses', $archangel);
-    }
-
-    public function testAddCc()
-    {
-        $archangel = new Archangel();
-        $archangel->addCc('test@example.com');
-
-        $this->assertAttributeContains('test@example.com', 'ccAddresses', $archangel);
-    }
-
-    public function testAddCcMultiple()
-    {
-        $archangel = new Archangel();
-        $archangel->addCc('testOne@example.com');
-        $archangel->addCc('testTwo@example.com');
-
-        $this->assertAttributeContains('testOne@example.com', 'ccAddresses', $archangel);
-        $this->assertAttributeContains('testTwo@example.com', 'ccAddresses', $archangel);
-    }
-
-    public function testAddCcWithTitle()
-    {
-        $archangel = new Archangel();
-        $archangel->addCc('test@example.com', 'Mr. Test Alot');
-
-        $this->assertAttributeContains('"Mr. Test Alot" <test@example.com>', 'ccAddresses', $archangel);
-    }
-
-    public function testAddBcc()
-    {
-        $archangel = new Archangel();
-        $archangel->addBcc('test@example.com');
-
-        $this->assertAttributeContains('test@example.com', 'bccAddresses', $archangel);
-    }
-
-    public function testAddBccMultiple()
-    {
-        $archangel = new Archangel();
-        $archangel->addBcc('testOne@example.com');
-        $archangel->addBcc('testTwo@example.com');
-
-        $this->assertAttributeContains('testOne@example.com', 'bccAddresses', $archangel);
-        $this->assertAttributeContains('testTwo@example.com', 'bccAddresses', $archangel);
-    }
-
-    public function testAddBccWithTitle()
-    {
-        $archangel = new Archangel();
-        $archangel->addBcc('test@example.com', 'Mr. Test Alot');
-
-        $this->assertAttributeContains('"Mr. Test Alot" <test@example.com>', 'bccAddresses', $archangel);
-    }
-
-    public function testSetFrom()
-    {
-        $archangel = new Archangel();
-        $archangel->setFrom('test@example.com');
-        $setHeaders = $this->getProtectedProperty($archangel, 'headers');
-
-        $this->assertArraySubset(array('From' => 'test@example.com'), $setHeaders);
-    }
-
-    public function testSetFromMultiple()
-    {
-        $archangel = new Archangel();
-        $archangel->setFrom('testOne@example.com');
-        $archangel->setFrom('testTwo@example.com');
-        $setHeaders = $this->getProtectedProperty($archangel, 'headers');
-
-        $this->assertArraySubset(array('From' => 'testTwo@example.com'), $setHeaders);
-        $this->assertNotContains('testOne@example.com', $setHeaders);
-    }
-
-    public function testSetFromWithTitle()
-    {
-        $archangel = new Archangel();
-        $archangel->setFrom('test@example.com', 'Mr. Test Alot');
-        $setHeaders = $this->getProtectedProperty($archangel, 'headers');
-
-        $this->assertArraySubset(array('From' => '"Mr. Test Alot" <test@example.com>'), $setHeaders);
-    }
-
-    protected function getProtectedProperty($archangel, $property)
-    {
-        $reflectedArchangel = new ReflectionClass($archangel);
-        $reflectedProperty = $reflectedArchangel->getProperty($property);
-        $reflectedProperty->setAccessible(true);
-
-        return $reflectedProperty->getValue($archangel);
-    }
+	public function testIsLoggerAwareInterface()
+	{
+		$archangel = new Archangel();
+
+		$this->assertInstanceOf('Psr\Log\LoggerAwareInterface', $archangel);
+	}
+
+	public function testConstructSetsDefaultMailer()
+	{
+		$archangel = new Archangel();
+		$mailer = sprintf('PHP/%s', phpversion());
+		$headers = array('X-Mailer' => $mailer);
+
+		$this->assertAttributeEquals($headers, 'headers', $archangel);
+	}
+
+	public function testConstructOverridesMailer()
+	{
+		$archangel = new Archangel('AwesomeMailer');
+		$headers = array('X-Mailer' => 'AwesomeMailer');
+
+		$this->assertAttributeEquals($headers, 'headers', $archangel);
+	}
+
+	public function testConstructSetsNullLogger()
+	{
+		$archangel = new Archangel();
+
+		$this->assertAttributeInstanceOf('Psr\Log\NullLogger', 'logger', $archangel);
+	}
+
+	public function testSetLogger()
+	{
+		$logger = $this->getMock('Psr\Log\LoggerInterface');
+		$archangel = new Archangel();
+		$archangel->setLogger($logger);
+
+		$this->assertAttributeSame($logger, 'logger', $archangel);
+	}
+
+	public function testAddTo()
+	{
+		$archangel = new Archangel();
+		$archangel->addTo('test@example.com');
+
+		$this->assertAttributeContains('test@example.com', 'toAddresses', $archangel);
+	}
+
+	public function testAddToMultiple()
+	{
+		$archangel = new Archangel();
+		$archangel->addTo('testOne@example.com');
+		$archangel->addTo('testTwo@example.com');
+
+		$this->assertAttributeContains('testOne@example.com', 'toAddresses', $archangel);
+		$this->assertAttributeContains('testTwo@example.com', 'toAddresses', $archangel);
+	}
+
+	public function testAddToWithTitle()
+	{
+		$archangel = new Archangel();
+		$archangel->addTo('test@example.com', 'Mr. Test Alot');
+
+		$this->assertAttributeContains('"Mr. Test Alot" <test@example.com>', 'toAddresses', $archangel);
+	}
+
+	public function testAddCc()
+	{
+		$archangel = new Archangel();
+		$archangel->addCc('test@example.com');
+
+		$this->assertAttributeContains('test@example.com', 'ccAddresses', $archangel);
+	}
+
+	public function testAddCcMultiple()
+	{
+		$archangel = new Archangel();
+		$archangel->addCc('testOne@example.com');
+		$archangel->addCc('testTwo@example.com');
+
+		$this->assertAttributeContains('testOne@example.com', 'ccAddresses', $archangel);
+		$this->assertAttributeContains('testTwo@example.com', 'ccAddresses', $archangel);
+	}
+
+	public function testAddCcWithTitle()
+	{
+		$archangel = new Archangel();
+		$archangel->addCc('test@example.com', 'Mr. Test Alot');
+
+		$this->assertAttributeContains('"Mr. Test Alot" <test@example.com>', 'ccAddresses', $archangel);
+	}
+
+	public function testAddBcc()
+	{
+		$archangel = new Archangel();
+		$archangel->addBcc('test@example.com');
+
+		$this->assertAttributeContains('test@example.com', 'bccAddresses', $archangel);
+	}
+
+	public function testAddBccMultiple()
+	{
+		$archangel = new Archangel();
+		$archangel->addBcc('testOne@example.com');
+		$archangel->addBcc('testTwo@example.com');
+
+		$this->assertAttributeContains('testOne@example.com', 'bccAddresses', $archangel);
+		$this->assertAttributeContains('testTwo@example.com', 'bccAddresses', $archangel);
+	}
+
+	public function testAddBccWithTitle()
+	{
+		$archangel = new Archangel();
+		$archangel->addBcc('test@example.com', 'Mr. Test Alot');
+
+		$this->assertAttributeContains('"Mr. Test Alot" <test@example.com>', 'bccAddresses', $archangel);
+	}
+
+	public function testSetFrom()
+	{
+		$archangel = new Archangel();
+		$archangel->setFrom('test@example.com');
+		$setHeaders = $this->getProtectedProperty($archangel, 'headers');
+
+		$this->assertArraySubset(array('From' => 'test@example.com'), $setHeaders);
+	}
+
+	public function testSetFromMultiple()
+	{
+		$archangel = new Archangel();
+		$archangel->setFrom('testOne@example.com');
+		$archangel->setFrom('testTwo@example.com');
+		$setHeaders = $this->getProtectedProperty($archangel, 'headers');
+
+		$this->assertArraySubset(array('From' => 'testTwo@example.com'), $setHeaders);
+		$this->assertNotContains('testOne@example.com', $setHeaders);
+	}
+
+	public function testSetFromWithTitle()
+	{
+		$archangel = new Archangel();
+		$archangel->setFrom('test@example.com', 'Mr. Test Alot');
+		$setHeaders = $this->getProtectedProperty($archangel, 'headers');
+
+		$this->assertArraySubset(array('From' => '"Mr. Test Alot" <test@example.com>'), $setHeaders);
+	}
+
+	protected function getProtectedProperty($archangel, $property)
+	{
+		$reflectedArchangel = new ReflectionClass($archangel);
+		$reflectedProperty = $reflectedArchangel->getProperty($property);
+		$reflectedProperty->setAccessible(true);
+
+		return $reflectedProperty->getValue($archangel);
+	}
 }