jacobemerick / archangel

tests/function-overrides.php

Indentation +3 added lines, -3 removed lines

@@ -3,13 +3,13 @@
 namespace Jacobemerick\Archangel;
 
 function mail($to, $subject, $message, $headers) {
-    return compact('to', 'subject', 'message', 'headers');
+	return compact('to', 'subject', 'message', 'headers');
 }
 
 function phpversion() {
-    return '6.0.0';
+	return '6.0.0';
 }
 
 function uniqid() {
-    return '1234567890123';
+	return '1234567890123';
 }

tests/ArchangelTest.php

Indentation +958 added lines, -958 removed lines

@@ -10,963 +10,963 @@
 class ArchangelTest extends PHPUnit_Framework_TestCase
 {
 
-    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 testConstructSetsBoundaries()
-    {
-        $archangel = new Archangel();
-        $expectedBoundaryMixed = sprintf('PHP-mixed-%s', uniqid());
-        $expectedBoundaryAlternative = sprintf('PHP-alternative-%s', uniqid());
-
-        $this->assertAttributeEquals($expectedBoundaryMixed, 'boundaryMixed', $archangel);
-        $this->assertAttributeEquals($expectedBoundaryAlternative, 'boundaryAlternative', $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');
-        $headersProperty = $this->getProtectedProperty('headers');
-        $headers = $headersProperty->getValue($archangel);
-
-        $this->assertArraySubset(
-            array('CC' => array('test@example.com')),
-            $headers
-        );
-    }
-
-    public function testAddCCMultiple()
-    {
-        $archangel = new Archangel();
-        $archangel->addCC('testOne@example.com');
-        $archangel->addCC('testTwo@example.com');
-        $headersProperty = $this->getProtectedProperty('headers');
-        $headers = $headersProperty->getValue($archangel);
-
-        $this->assertArraySubset(
-            array('CC' => array('testOne@example.com', 'testTwo@example.com')),
-            $headers
-        );
-    }
-
-    public function testAddCCWithTitle()
-    {
-        $archangel = new Archangel();
-        $archangel->addCC('test@example.com', 'Mr. Test Alot');
-        $headersProperty = $this->getProtectedProperty('headers');
-        $headers = $headersProperty->getValue($archangel);
-
-        $this->assertArraySubset(
-            array('CC' => array('"Mr. Test Alot" <test@example.com>')),
-            $headers
-        );
-    }
-
-    public function testAddBCC()
-    {
-        $archangel = new Archangel();
-        $archangel->addBCC('test@example.com');
-        $headersProperty = $this->getProtectedProperty('headers');
-        $headers = $headersProperty->getValue($archangel);
-
-        $this->assertArraySubset(
-            array('BCC' => array('test@example.com')),
-            $headers
-        );
-    }
-
-    public function testAddBCCMultiple()
-    {
-        $archangel = new Archangel();
-        $archangel->addBCC('testOne@example.com');
-        $archangel->addBCC('testTwo@example.com');
-        $headersProperty = $this->getProtectedProperty('headers');
-        $headers = $headersProperty->getValue($archangel);
-
-        $this->assertArraySubset(
-            array('BCC' => array('testOne@example.com', 'testTwo@example.com')),
-            $headers
-        );
-    }
-
-    public function testAddBCCWithTitle()
-    {
-        $archangel = new Archangel();
-        $archangel->addBCC('test@example.com', 'Mr. Test Alot');
-        $headersProperty = $this->getProtectedProperty('headers');
-        $headers = $headersProperty->getValue($archangel);
-
-        $this->assertArraySubset(
-            array('BCC' => array('"Mr. Test Alot" <test@example.com>')),
-            $headers
-        );
-    }
-
-    public function testSetFrom()
-    {
-        $archangel = new Archangel();
-        $archangel->setFrom('test@example.com');
-        $headersProperty = $this->getProtectedProperty('headers');
-        $headers = $headersProperty->getValue($archangel);
-
-        $this->assertArraySubset(array('From' => 'test@example.com'), $headers);
-    }
-
-    public function testSetFromMultiple()
-    {
-        $archangel = new Archangel();
-        $archangel->setFrom('testOne@example.com');
-        $archangel->setFrom('testTwo@example.com');
-        $headersProperty = $this->getProtectedProperty('headers');
-        $headers = $headersProperty->getValue($archangel);
-
-        $this->assertArraySubset(array('From' => 'testTwo@example.com'), $headers);
-        $this->assertNotContains('testOne@example.com', $headers);
-    }
-
-    public function testSetFromWithTitle()
-    {
-        $archangel = new Archangel();
-        $archangel->setFrom('test@example.com', 'Mr. Test Alot');
-        $headersProperty = $this->getProtectedProperty('headers');
-        $headers = $headersProperty->getValue($archangel);
-
-        $this->assertArraySubset(array('From' => '"Mr. Test Alot" <test@example.com>'), $headers);
-    }
-
-    public function testSetReplyTo()
-    {
-        $archangel = new Archangel();
-        $archangel->setReplyTo('test@example.com');
-        $headersProperty = $this->getProtectedProperty('headers');
-        $headers = $headersProperty->getValue($archangel);
-
-        $this->assertArraySubset(array('Reply-To' => 'test@example.com'), $headers);
-    }
-
-    public function testSetReplyToMultiple()
-    {
-        $archangel = new Archangel();
-        $archangel->setReplyTo('testOne@example.com');
-        $archangel->setReplyTo('testTwo@example.com');
-        $headersProperty = $this->getProtectedProperty('headers');
-        $headers = $headersProperty->getValue($archangel);
-
-        $this->assertArraySubset(array('Reply-To' => 'testTwo@example.com'), $headers);
-        $this->assertNotContains('testOne@example.com', $headers);
-    }
-
-    public function testSetReplyToWithTitle()
-    {
-        $archangel = new Archangel();
-        $archangel->setReplyTo('test@example.com', 'Mr. Test Alot');
-        $headersProperty = $this->getProtectedProperty('headers');
-        $headers = $headersProperty->getValue($archangel);
-
-        $this->assertArraySubset(array('Reply-To' => '"Mr. Test Alot" <test@example.com>'), $headers);
-    }
-
-    public function testFormatEmailAddress()
-    {
-        $archangel = new Archangel();
-        $formatMethod = $this->getProtectedMethod('formatEmailAddress');
-        $formattedEmail = $formatMethod->invokeArgs($archangel, array('test@example.com', ''));
-
-        $this->assertEquals('test@example.com', $formattedEmail);
-    }
-
-    public function testFormatEmailAddressWithTitle()
-    {
-        $archangel = new Archangel();
-        $formatMethod = $this->getProtectedMethod('formatEmailAddress');
-        $formattedEmail = $formatMethod->invokeArgs($archangel, array('test@example.com', 'Mr. Test Alot'));
-
-        $this->assertEquals('"Mr. Test Alot" <test@example.com>', $formattedEmail);
-    }
-
-    public function testSetSubject()
-    {
-        $archangel = new Archangel();
-        $archangel->setSubject('Test Subject');
-
-        $this->assertAttributeEquals('Test Subject', 'subject', $archangel);
-    }
-
-    public function testSetPlainMessage()
-    {
-        $archangel = new Archangel();
-        $archangel->setPlainMessage('Plain text message');
-
-        $this->assertAttributeEquals('Plain text message', 'plainMessage', $archangel);
-    }
-
-    public function testSetHTMLMessage()
-    {
-        $archangel = new Archangel();
-        $archangel->setHTMLMessage('<p>An HTML message.</p>');
-
-        $this->assertAttributeEquals('<p>An HTML message.</p>', 'htmlMessage', $archangel);
-    }
-
-    public function testAddAttachment()
-    {
-        $archangel = new Archangel();
-        $archangel->addAttachment('path', 'type');
-
-        $this->assertAttributeContains(
-            array('path' => 'path', 'type' => 'type', 'title' => ''),
-            'attachments',
-            $archangel
-        );
-    }
-
-    public function testAddAttachmentMultiple()
-    {
-        $archangel = new Archangel();
-        $archangel->addAttachment('pathOne', 'typeOne');
-        $archangel->addAttachment('pathTwo', 'typeTwo');
-
-        $this->assertAttributeContains(
-            array('path' => 'pathOne', 'type' => 'typeOne', 'title' => ''),
-            'attachments',
-            $archangel
-        );
-        $this->assertAttributeContains(
-            array('path' => 'pathTwo', 'type' => 'typeTwo', 'title' => ''),
-            'attachments',
-            $archangel
-        );
-    }
-
-    public function testAddAttachmentWithTitle()
-    {
-        $archangel = new Archangel();
-        $archangel->addAttachment('path', 'type', 'title');
-
-        $this->assertAttributeContains(
-            array('path' => 'path', 'type' => 'type', 'title' => 'title'),
-            'attachments',
-            $archangel
-        );
-    }
-
-    public function testSend()
-    {
-        $archangel = new Archangel();
-        $archangel->addTo('test@example.com');
-        $archangel->setSubject('Test Subject');
-        $archangel->setPlainMessage('Plain text message');
-        $response = $archangel->send();
-
-        $expectedResponse = array(
-            'to' => 'test@example.com',
-            'subject' => 'Test Subject',
-            'message' => 'Plain text message',
-            'headers' => 'X-Mailer: PHP/6.0.0',
-        );
-
-        $this->assertEquals($expectedResponse, $response);
-    }
-
-    public function testSendFailure()
-    {
-        $archangel = new Archangel();
-        $response = $archangel->send();
-
-        $this->assertFalse($response);
-    }
-
-    /**
-     * @dataProvider dataCheckRequiredFields
-     */
-    public function testCheckRequiredFields(
-        $expectedResult,
-        $toAddresses,
-        $subject,
-        $plainMessage,
-        $htmlMessage,
-        $attachments
-    ) {
-        $archangel = new Archangel();
-
-        if (!empty($toAddresses)) {
-            $toAddressesProperty = $this->getProtectedProperty('toAddresses');
-            $toAddressesProperty->setValue($archangel, $toAddresses);
-        }
-
-        if (!empty($subject)) {
-            $subjectProperty = $this->getProtectedProperty('subject');
-            $subjectProperty->setValue($archangel, $subject);
-        }
-
-        if (!empty($plainMessage)) {
-            $plainMessageProperty = $this->getProtectedProperty('plainMessage');
-            $plainMessageProperty->setValue($archangel, $plainMessage);
-        }
-
-        if (!empty($htmlMessage)) {
-            $htmlMessageProperty = $this->getProtectedProperty('htmlMessage');
-            $htmlMessageProperty->setValue($archangel, $htmlMessage);
-        }
-
-        if (!empty($attachments)) {
-            $attachmentsProperty = $this->getProtectedProperty('attachments');
-            $attachmentsProperty->setValue($archangel, $attachments);
-        }
-
-        $checkMethod = $this->getProtectedMethod('checkRequiredFields');
-        $isValid = $checkMethod->invoke($archangel);
-
-        if ($expectedResult == true) {
-            $this->assertTrue($isValid);
-            return;
-        }
-        $this->assertNotTrue($isValid);
-    }
-
-    public function dataCheckRequiredFields()
-    {
-        return array(
-            array(
-                'expectedResult' => false,
-                'toAddresses' => array(),
-                'subject' => '',
-                'plainMessage' => '',
-                'htmlMessage' => '',
-                'attachments' => array(),
-            ),
-            array(
-                'expectedResult' => false,
-                'toAddresses' => array('test@example.com'),
-                'subject' => '',
-                'plainMessage' => '',
-                'htmlMessage' => '',
-                'attachments' => array(),
-            ),
-            array(
-                'expectedResult' => false,
-                'toAddresses' => array('test@example.com'),
-                'subject' => 'Test Subject',
-                'plainMessage' => '',
-                'htmlMessage' => '',
-                'attachments' => array(),
-            ),
-            array(
-                'expectedResult' => false,
-                'toAddresses' => array(),
-                'subject' => 'Test Subject',
-                'plainMessage' => '',
-                'htmlMessage' => '',
-                'attachments' => array(),
-            ),
-            array(
-                'expectedResult' => false,
-                'toAddresses' => array(),
-                'subject' => 'Test Subject',
-                'plainMessage' => 'Plain text message',
-                'htmlMessage' => '',
-                'attachments' => array(),
-            ),
-            array(
-                'expectedResult' => true,
-                'toAddresses' => array('test@example.com'),
-                'subject' => 'Test Subject',
-                'plainMessage' => 'Plain text message',
-                'htmlMessage' => '',
-                'attachments' => array(),
-            ),
-            array(
-                'expectedResult' => true,
-                'toAddresses' => array('test@example.com'),
-                'subject' => 'Test Subject',
-                'plainMessage' => '',
-                'htmlMessage' => '<p>An HTML message.</p>',
-                'attachments' => array(),
-            ),
-            array(
-                'expectedResult' => true,
-                'toAddresses' => array('test@example.com'),
-                'subject' => 'Test Subject',
-                'plainMessage' => '',
-                'htmlMessage' => '',
-                'attachments' => array(
-                    array('path' => 'path', 'type' => 'type'),
-                ),
-            ),
-            array(
-                'expectedResult' => true,
-                'toAddresses' => array('test@example.com'),
-                'subject' => 'Test Subject',
-                'plainMessage' => 'Plain text message',
-                'htmlMessage' => '<p>An HTML message.</p>',
-                'attachments' => array(
-                    array('path' => 'path', 'type' => 'type'),
-                ),
-            ),
-       );
-    }
+	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 testConstructSetsBoundaries()
+	{
+		$archangel = new Archangel();
+		$expectedBoundaryMixed = sprintf('PHP-mixed-%s', uniqid());
+		$expectedBoundaryAlternative = sprintf('PHP-alternative-%s', uniqid());
+
+		$this->assertAttributeEquals($expectedBoundaryMixed, 'boundaryMixed', $archangel);
+		$this->assertAttributeEquals($expectedBoundaryAlternative, 'boundaryAlternative', $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');
+		$headersProperty = $this->getProtectedProperty('headers');
+		$headers = $headersProperty->getValue($archangel);
+
+		$this->assertArraySubset(
+			array('CC' => array('test@example.com')),
+			$headers
+		);
+	}
+
+	public function testAddCCMultiple()
+	{
+		$archangel = new Archangel();
+		$archangel->addCC('testOne@example.com');
+		$archangel->addCC('testTwo@example.com');
+		$headersProperty = $this->getProtectedProperty('headers');
+		$headers = $headersProperty->getValue($archangel);
+
+		$this->assertArraySubset(
+			array('CC' => array('testOne@example.com', 'testTwo@example.com')),
+			$headers
+		);
+	}
+
+	public function testAddCCWithTitle()
+	{
+		$archangel = new Archangel();
+		$archangel->addCC('test@example.com', 'Mr. Test Alot');
+		$headersProperty = $this->getProtectedProperty('headers');
+		$headers = $headersProperty->getValue($archangel);
+
+		$this->assertArraySubset(
+			array('CC' => array('"Mr. Test Alot" <test@example.com>')),
+			$headers
+		);
+	}
+
+	public function testAddBCC()
+	{
+		$archangel = new Archangel();
+		$archangel->addBCC('test@example.com');
+		$headersProperty = $this->getProtectedProperty('headers');
+		$headers = $headersProperty->getValue($archangel);
+
+		$this->assertArraySubset(
+			array('BCC' => array('test@example.com')),
+			$headers
+		);
+	}
+
+	public function testAddBCCMultiple()
+	{
+		$archangel = new Archangel();
+		$archangel->addBCC('testOne@example.com');
+		$archangel->addBCC('testTwo@example.com');
+		$headersProperty = $this->getProtectedProperty('headers');
+		$headers = $headersProperty->getValue($archangel);
+
+		$this->assertArraySubset(
+			array('BCC' => array('testOne@example.com', 'testTwo@example.com')),
+			$headers
+		);
+	}
+
+	public function testAddBCCWithTitle()
+	{
+		$archangel = new Archangel();
+		$archangel->addBCC('test@example.com', 'Mr. Test Alot');
+		$headersProperty = $this->getProtectedProperty('headers');
+		$headers = $headersProperty->getValue($archangel);
+
+		$this->assertArraySubset(
+			array('BCC' => array('"Mr. Test Alot" <test@example.com>')),
+			$headers
+		);
+	}
+
+	public function testSetFrom()
+	{
+		$archangel = new Archangel();
+		$archangel->setFrom('test@example.com');
+		$headersProperty = $this->getProtectedProperty('headers');
+		$headers = $headersProperty->getValue($archangel);
+
+		$this->assertArraySubset(array('From' => 'test@example.com'), $headers);
+	}
+
+	public function testSetFromMultiple()
+	{
+		$archangel = new Archangel();
+		$archangel->setFrom('testOne@example.com');
+		$archangel->setFrom('testTwo@example.com');
+		$headersProperty = $this->getProtectedProperty('headers');
+		$headers = $headersProperty->getValue($archangel);
+
+		$this->assertArraySubset(array('From' => 'testTwo@example.com'), $headers);
+		$this->assertNotContains('testOne@example.com', $headers);
+	}
+
+	public function testSetFromWithTitle()
+	{
+		$archangel = new Archangel();
+		$archangel->setFrom('test@example.com', 'Mr. Test Alot');
+		$headersProperty = $this->getProtectedProperty('headers');
+		$headers = $headersProperty->getValue($archangel);
+
+		$this->assertArraySubset(array('From' => '"Mr. Test Alot" <test@example.com>'), $headers);
+	}
+
+	public function testSetReplyTo()
+	{
+		$archangel = new Archangel();
+		$archangel->setReplyTo('test@example.com');
+		$headersProperty = $this->getProtectedProperty('headers');
+		$headers = $headersProperty->getValue($archangel);
+
+		$this->assertArraySubset(array('Reply-To' => 'test@example.com'), $headers);
+	}
+
+	public function testSetReplyToMultiple()
+	{
+		$archangel = new Archangel();
+		$archangel->setReplyTo('testOne@example.com');
+		$archangel->setReplyTo('testTwo@example.com');
+		$headersProperty = $this->getProtectedProperty('headers');
+		$headers = $headersProperty->getValue($archangel);
+
+		$this->assertArraySubset(array('Reply-To' => 'testTwo@example.com'), $headers);
+		$this->assertNotContains('testOne@example.com', $headers);
+	}
+
+	public function testSetReplyToWithTitle()
+	{
+		$archangel = new Archangel();
+		$archangel->setReplyTo('test@example.com', 'Mr. Test Alot');
+		$headersProperty = $this->getProtectedProperty('headers');
+		$headers = $headersProperty->getValue($archangel);
+
+		$this->assertArraySubset(array('Reply-To' => '"Mr. Test Alot" <test@example.com>'), $headers);
+	}
+
+	public function testFormatEmailAddress()
+	{
+		$archangel = new Archangel();
+		$formatMethod = $this->getProtectedMethod('formatEmailAddress');
+		$formattedEmail = $formatMethod->invokeArgs($archangel, array('test@example.com', ''));
+
+		$this->assertEquals('test@example.com', $formattedEmail);
+	}
+
+	public function testFormatEmailAddressWithTitle()
+	{
+		$archangel = new Archangel();
+		$formatMethod = $this->getProtectedMethod('formatEmailAddress');
+		$formattedEmail = $formatMethod->invokeArgs($archangel, array('test@example.com', 'Mr. Test Alot'));
+
+		$this->assertEquals('"Mr. Test Alot" <test@example.com>', $formattedEmail);
+	}
+
+	public function testSetSubject()
+	{
+		$archangel = new Archangel();
+		$archangel->setSubject('Test Subject');
+
+		$this->assertAttributeEquals('Test Subject', 'subject', $archangel);
+	}
+
+	public function testSetPlainMessage()
+	{
+		$archangel = new Archangel();
+		$archangel->setPlainMessage('Plain text message');
+
+		$this->assertAttributeEquals('Plain text message', 'plainMessage', $archangel);
+	}
+
+	public function testSetHTMLMessage()
+	{
+		$archangel = new Archangel();
+		$archangel->setHTMLMessage('<p>An HTML message.</p>');
+
+		$this->assertAttributeEquals('<p>An HTML message.</p>', 'htmlMessage', $archangel);
+	}
+
+	public function testAddAttachment()
+	{
+		$archangel = new Archangel();
+		$archangel->addAttachment('path', 'type');
+
+		$this->assertAttributeContains(
+			array('path' => 'path', 'type' => 'type', 'title' => ''),
+			'attachments',
+			$archangel
+		);
+	}
+
+	public function testAddAttachmentMultiple()
+	{
+		$archangel = new Archangel();
+		$archangel->addAttachment('pathOne', 'typeOne');
+		$archangel->addAttachment('pathTwo', 'typeTwo');
+
+		$this->assertAttributeContains(
+			array('path' => 'pathOne', 'type' => 'typeOne', 'title' => ''),
+			'attachments',
+			$archangel
+		);
+		$this->assertAttributeContains(
+			array('path' => 'pathTwo', 'type' => 'typeTwo', 'title' => ''),
+			'attachments',
+			$archangel
+		);
+	}
+
+	public function testAddAttachmentWithTitle()
+	{
+		$archangel = new Archangel();
+		$archangel->addAttachment('path', 'type', 'title');
+
+		$this->assertAttributeContains(
+			array('path' => 'path', 'type' => 'type', 'title' => 'title'),
+			'attachments',
+			$archangel
+		);
+	}
+
+	public function testSend()
+	{
+		$archangel = new Archangel();
+		$archangel->addTo('test@example.com');
+		$archangel->setSubject('Test Subject');
+		$archangel->setPlainMessage('Plain text message');
+		$response = $archangel->send();
+
+		$expectedResponse = array(
+			'to' => 'test@example.com',
+			'subject' => 'Test Subject',
+			'message' => 'Plain text message',
+			'headers' => 'X-Mailer: PHP/6.0.0',
+		);
+
+		$this->assertEquals($expectedResponse, $response);
+	}
+
+	public function testSendFailure()
+	{
+		$archangel = new Archangel();
+		$response = $archangel->send();
+
+		$this->assertFalse($response);
+	}
+
+	/**
+	 * @dataProvider dataCheckRequiredFields
+	 */
+	public function testCheckRequiredFields(
+		$expectedResult,
+		$toAddresses,
+		$subject,
+		$plainMessage,
+		$htmlMessage,
+		$attachments
+	) {
+		$archangel = new Archangel();
+
+		if (!empty($toAddresses)) {
+			$toAddressesProperty = $this->getProtectedProperty('toAddresses');
+			$toAddressesProperty->setValue($archangel, $toAddresses);
+		}
+
+		if (!empty($subject)) {
+			$subjectProperty = $this->getProtectedProperty('subject');
+			$subjectProperty->setValue($archangel, $subject);
+		}
+
+		if (!empty($plainMessage)) {
+			$plainMessageProperty = $this->getProtectedProperty('plainMessage');
+			$plainMessageProperty->setValue($archangel, $plainMessage);
+		}
+
+		if (!empty($htmlMessage)) {
+			$htmlMessageProperty = $this->getProtectedProperty('htmlMessage');
+			$htmlMessageProperty->setValue($archangel, $htmlMessage);
+		}
+
+		if (!empty($attachments)) {
+			$attachmentsProperty = $this->getProtectedProperty('attachments');
+			$attachmentsProperty->setValue($archangel, $attachments);
+		}
+
+		$checkMethod = $this->getProtectedMethod('checkRequiredFields');
+		$isValid = $checkMethod->invoke($archangel);
+
+		if ($expectedResult == true) {
+			$this->assertTrue($isValid);
+			return;
+		}
+		$this->assertNotTrue($isValid);
+	}
+
+	public function dataCheckRequiredFields()
+	{
+		return array(
+			array(
+				'expectedResult' => false,
+				'toAddresses' => array(),
+				'subject' => '',
+				'plainMessage' => '',
+				'htmlMessage' => '',
+				'attachments' => array(),
+			),
+			array(
+				'expectedResult' => false,
+				'toAddresses' => array('test@example.com'),
+				'subject' => '',
+				'plainMessage' => '',
+				'htmlMessage' => '',
+				'attachments' => array(),
+			),
+			array(
+				'expectedResult' => false,
+				'toAddresses' => array('test@example.com'),
+				'subject' => 'Test Subject',
+				'plainMessage' => '',
+				'htmlMessage' => '',
+				'attachments' => array(),
+			),
+			array(
+				'expectedResult' => false,
+				'toAddresses' => array(),
+				'subject' => 'Test Subject',
+				'plainMessage' => '',
+				'htmlMessage' => '',
+				'attachments' => array(),
+			),
+			array(
+				'expectedResult' => false,
+				'toAddresses' => array(),
+				'subject' => 'Test Subject',
+				'plainMessage' => 'Plain text message',
+				'htmlMessage' => '',
+				'attachments' => array(),
+			),
+			array(
+				'expectedResult' => true,
+				'toAddresses' => array('test@example.com'),
+				'subject' => 'Test Subject',
+				'plainMessage' => 'Plain text message',
+				'htmlMessage' => '',
+				'attachments' => array(),
+			),
+			array(
+				'expectedResult' => true,
+				'toAddresses' => array('test@example.com'),
+				'subject' => 'Test Subject',
+				'plainMessage' => '',
+				'htmlMessage' => '<p>An HTML message.</p>',
+				'attachments' => array(),
+			),
+			array(
+				'expectedResult' => true,
+				'toAddresses' => array('test@example.com'),
+				'subject' => 'Test Subject',
+				'plainMessage' => '',
+				'htmlMessage' => '',
+				'attachments' => array(
+					array('path' => 'path', 'type' => 'type'),
+				),
+			),
+			array(
+				'expectedResult' => true,
+				'toAddresses' => array('test@example.com'),
+				'subject' => 'Test Subject',
+				'plainMessage' => 'Plain text message',
+				'htmlMessage' => '<p>An HTML message.</p>',
+				'attachments' => array(
+					array('path' => 'path', 'type' => 'type'),
+				),
+			),
+	   );
+	}
  
-    public function testBuildTo()
-    {
-        $archangel = new Archangel();
-        $addressesProperty = $this->getProtectedProperty('toAddresses');
-        $addressesProperty->setValue($archangel, array('test@example.com'));
-        $buildMethod = $this->getProtectedMethod('buildTo');
-        $toAddresses = $buildMethod->invoke($archangel);
-
-        $this->assertEquals('test@example.com', $toAddresses);
-    }
-
-    public function testBuildToMultiple()
-    {
-        $archangel = new Archangel();
-        $addressesProperty = $this->getProtectedProperty('toAddresses');
-        $addressesProperty->setValue($archangel, array('testOne@example.com', 'testTwo@example.com'));
-        $buildMethod = $this->getProtectedMethod('buildTo');
-        $toAddresses = $buildMethod->invoke($archangel);
-
-        $this->assertEquals('testOne@example.com, testTwo@example.com', $toAddresses);
-    }
-
-    public function testBuildMessageEmpty()
-    {
-        $archangel = new Archangel();
-        $plainMessageProperty = $this->getProtectedProperty('plainMessage');
-        $plainMessageProperty->setValue($archangel, '');
-        $htmlMessageProperty = $this->getProtectedProperty('htmlMessage');
-        $htmlMessageProperty->setValue($archangel, '');
-        $buildMethod = $this->getProtectedMethod('buildMessage');
-        $builtMessage = $buildMethod->invoke($archangel);
-
-        $this->assertEmpty($builtMessage);
-    }
-
-    public function testBuildMessagePlain()
-    {
-        $message = 'Plain text message';
-
-        $archangel = new Archangel();
-        $plainMessageProperty = $this->getProtectedProperty('plainMessage');
-        $plainMessageProperty->setValue($archangel, $message);
-        $htmlMessageProperty = $this->getProtectedProperty('htmlMessage');
-        $htmlMessageProperty->setValue($archangel, '');
-        $buildMethod = $this->getProtectedMethod('buildMessage');
-        $builtMessage = $buildMethod->invoke($archangel);
-
-        $this->assertEquals($message, $builtMessage);
-    }
-
-    public function testBuildMessageHtml()
-    {
-        $message = '<p>HTML Message.</p>';
-
-        $archangel = new Archangel();
-        $plainMessageProperty = $this->getProtectedProperty('plainMessage');
-        $plainMessageProperty->setValue($archangel, '');
-        $htmlMessageProperty = $this->getProtectedProperty('htmlMessage');
-        $htmlMessageProperty->setValue($archangel, $message);
-        $buildMethod = $this->getProtectedMethod('buildMessage');
-        $builtMessage = $buildMethod->invoke($archangel);
-
-        $this->assertEquals($message, $builtMessage);
-    }
-
-    public function testBuildMessageMultipart()
-    {
-        $plainMessage = 'Plain text message';
-        $htmlMessage = '<p>HTML Message.</p>';
-
-        $archangel = new Archangel();
-
-        $boundaryProperty = $this->getProtectedProperty('boundaryAlternative');
-        $boundary = $boundaryProperty->getValue($archangel);
-        $plainMsgMethod = $this->getProtectedMethod('buildPlainMessageHeader');
-        $plainMsgHeaders = $plainMsgMethod->invoke($archangel);
-        $htmlMsgMethod = $this->getProtectedMethod('buildHtmlMessageHeader');
-        $htmlMsgHeaders = $htmlMsgMethod->invoke($archangel);
-
-        $expectedMessage = array();
-        array_push($expectedMessage, "--{$boundary}");
-        $expectedMessage = array_merge($expectedMessage, $plainMsgHeaders);
-        array_push($expectedMessage, $plainMessage);
-        array_push($expectedMessage, "--{$boundary}");
-        $expectedMessage = array_merge($expectedMessage, $htmlMsgHeaders);
-        array_push($expectedMessage, $htmlMessage);
-        array_push($expectedMessage, "--{$boundary}--");
-        $expectedMessage = implode(Archangel::LINE_BREAK, $expectedMessage);
-
-        $plainMessageProperty = $this->getProtectedProperty('plainMessage');
-        $plainMessageProperty->setValue($archangel, $plainMessage);
-        $htmlMessageProperty = $this->getProtectedProperty('htmlMessage');
-        $htmlMessageProperty->setValue($archangel, $htmlMessage);
-        $buildMethod = $this->getProtectedMethod('buildMessage');
-        $builtMessage = $buildMethod->invoke($archangel);
-
-        $this->assertEquals($expectedMessage, $builtMessage);
-    }
-
-    public function testBuildMessageWithAttachmentsEmpty()
-    {
-        $path = __DIR__ . '/test.txt';
-        $textContent = 'Dummy Content';
-        $this->makeTmpFile($path, $textContent);
-
-        $encodedContent = chunk_split(base64_encode($textContent));
-        $type = 'text/plain';
-        $title = 'Test File';
-
-        $archangel = new Archangel();
-
-        $boundaryMixedProperty = $this->getProtectedProperty('boundaryMixed');
-        $boundaryMixed = $boundaryMixedProperty->getValue($archangel);
-
-        $expectedMessage = array();
-        array_push($expectedMessage, "--{$boundaryMixed}");
-        array_push($expectedMessage, "Content-Type: {$type}; name=\"{$title}\"");
-        array_push($expectedMessage, 'Content-Transfer-Encoding: base64');
-        array_push($expectedMessage, 'Content-Disposition: attachment');
-        array_push($expectedMessage, '');
-        array_push($expectedMessage, $encodedContent);
-        array_push($expectedMessage, "--{$boundaryMixed}--");
-        $expectedMessage = implode(Archangel::LINE_BREAK, $expectedMessage);
-
-        $plainMessageProperty = $this->getProtectedProperty('plainMessage');
-        $plainMessageProperty->setValue($archangel, '');
-        $htmlMessageProperty = $this->getProtectedProperty('htmlMessage');
-        $htmlMessageProperty->setValue($archangel, '');
-        $attachmentProperty = $this->getProtectedProperty('attachments');
-        $attachmentProperty->setValue($archangel, array(
-            array('path' => $path, 'type' => $type, 'title' => $title)
-        ));
-        $buildMethod = $this->getProtectedMethod('buildMessageWithAttachments');
-        $builtMessage = $buildMethod->invoke($archangel);
-
-        unlink($path);
-        $this->assertEquals($expectedMessage, $builtMessage);
-    }
-
-    public function testBuildMessageWithAttachmentsPlain()
-    {
-        $path = __DIR__ . '/test.txt';
-        $textContent = 'Dummy Content';
-        $this->makeTmpFile($path, $textContent);
-
-        $encodedContent = chunk_split(base64_encode($textContent));
-        $type = 'text/plain';
-        $title = 'Test File';
-        $message = 'Plain text message';
-
-        $archangel = new Archangel();
-
-        $boundaryMixedProperty = $this->getProtectedProperty('boundaryMixed');
-        $boundaryMixed = $boundaryMixedProperty->getValue($archangel);
-        $plainMsgMethod = $this->getProtectedMethod('buildPlainMessageHeader');
-        $plainMsgHeaders = $plainMsgMethod->invoke($archangel);
-
-        $expectedMessage = array();
-        array_push($expectedMessage, "--{$boundaryMixed}");
-        $expectedMessage = array_merge($expectedMessage, $plainMsgHeaders);
-        array_push($expectedMessage, $message);
-        array_push($expectedMessage, "--{$boundaryMixed}");
-        array_push($expectedMessage, "Content-Type: {$type}; name=\"{$title}\"");
-        array_push($expectedMessage, 'Content-Transfer-Encoding: base64');
-        array_push($expectedMessage, 'Content-Disposition: attachment');
-        array_push($expectedMessage, '');
-        array_push($expectedMessage, $encodedContent);
-        array_push($expectedMessage, "--{$boundaryMixed}--");
-        $expectedMessage = implode(Archangel::LINE_BREAK, $expectedMessage);
-
-        $plainMessageProperty = $this->getProtectedProperty('plainMessage');
-        $plainMessageProperty->setValue($archangel, $message);
-        $htmlMessageProperty = $this->getProtectedProperty('htmlMessage');
-        $htmlMessageProperty->setValue($archangel, '');
-        $attachmentProperty = $this->getProtectedProperty('attachments');
-        $attachmentProperty->setValue($archangel, array(
-            array('path' => $path, 'type' => $type, 'title' => $title)
-        ));
-        $buildMethod = $this->getProtectedMethod('buildMessageWithAttachments');
-        $builtMessage = $buildMethod->invoke($archangel);
-
-        unlink($path);
-        $this->assertEquals($expectedMessage, $builtMessage);
-    }
-
-    public function testBuildMessageWithAttachmentsHtml()
-    {
-        $path = __DIR__ . '/test.txt';
-        $textContent = 'Dummy Content';
-        $this->makeTmpFile($path, $textContent);
-
-        $encodedContent = chunk_split(base64_encode($textContent));
-        $type = 'text/plain';
-        $title = 'Test File';
-        $message = '<p>HTML Message.</p>';
-
-        $archangel = new Archangel();
-
-        $boundaryMixedProperty = $this->getProtectedProperty('boundaryMixed');
-        $boundaryMixed = $boundaryMixedProperty->getValue($archangel);
-        $htmlMsgMethod = $this->getProtectedMethod('buildHtmlMessageHeader');
-        $htmlMsgHeaders = $htmlMsgMethod->invoke($archangel);
-
-        $expectedMessage = array();
-        array_push($expectedMessage, "--{$boundaryMixed}");
-        $expectedMessage = array_merge($expectedMessage, $htmlMsgHeaders);
-        array_push($expectedMessage, $message);
-        array_push($expectedMessage, "--{$boundaryMixed}");
-        array_push($expectedMessage, "Content-Type: {$type}; name=\"{$title}\"");
-        array_push($expectedMessage, 'Content-Transfer-Encoding: base64');
-        array_push($expectedMessage, 'Content-Disposition: attachment');
-        array_push($expectedMessage, '');
-        array_push($expectedMessage, $encodedContent);
-        array_push($expectedMessage, "--{$boundaryMixed}--");
-        $expectedMessage = implode(Archangel::LINE_BREAK, $expectedMessage);
-
-        $plainMessageProperty = $this->getProtectedProperty('plainMessage');
-        $plainMessageProperty->setValue($archangel, '');
-        $htmlMessageProperty = $this->getProtectedProperty('htmlMessage');
-        $htmlMessageProperty->setValue($archangel, $message);
-        $attachmentProperty = $this->getProtectedProperty('attachments');
-        $attachmentProperty->setValue($archangel, array(
-            array('path' => $path, 'type' => $type, 'title' => $title)
-        ));
-        $buildMethod = $this->getProtectedMethod('buildMessageWithAttachments');
-        $builtMessage = $buildMethod->invoke($archangel);
-
-        unlink($path);
-        $this->assertEquals($expectedMessage, $builtMessage);
-    }
-
-    public function testBuildMessageWithAttachmentsMultipart()
-    {
-        $path = __DIR__ . '/test.txt';
-        $textContent = 'Dummy Content';
-        $this->makeTmpFile($path, $textContent);
-
-        $encodedContent = chunk_split(base64_encode($textContent));
-        $type = 'text/plain';
-        $title = 'Test File';
-        $plainMessage = 'Plain text message';
-        $htmlMessage = '<p>HTML Message.</p>';
-
-        $archangel = new Archangel();
-
-        $boundaryMixedProperty = $this->getProtectedProperty('boundaryMixed');
-        $boundaryMixed = $boundaryMixedProperty->getValue($archangel);
-        $boundaryAltProperty = $this->getProtectedProperty('boundaryAlternative');
-        $boundaryAlternative = $boundaryAltProperty->getValue($archangel);
-        $plainMsgMethod = $this->getProtectedMethod('buildPlainMessageHeader');
-        $plainMsgHeaders = $plainMsgMethod->invoke($archangel);
-        $htmlMsgMethod = $this->getProtectedMethod('buildHtmlMessageHeader');
-        $htmlMsgHeaders = $htmlMsgMethod->invoke($archangel);
-
-        $expectedMessage = array();
-        array_push($expectedMessage, "--{$boundaryMixed}");
-        array_push($expectedMessage, "Content-Type: multipart/alternative; boundary={$boundaryAlternative}");
-        array_push($expectedMessage, '');
-        array_push($expectedMessage, "--{$boundaryAlternative}");
-        $expectedMessage = array_merge($expectedMessage, $plainMsgHeaders);
-        array_push($expectedMessage, $plainMessage);
-        array_push($expectedMessage, "--{$boundaryAlternative}");
-        $expectedMessage = array_merge($expectedMessage, $htmlMsgHeaders);
-        array_push($expectedMessage, $htmlMessage);
-        array_push($expectedMessage, "--{$boundaryAlternative}--");
-        array_push($expectedMessage, '');
-        array_push($expectedMessage, "--{$boundaryMixed}");
-        array_push($expectedMessage, "Content-Type: {$type}; name=\"{$title}\"");
-        array_push($expectedMessage, 'Content-Transfer-Encoding: base64');
-        array_push($expectedMessage, 'Content-Disposition: attachment');
-        array_push($expectedMessage, '');
-        array_push($expectedMessage, $encodedContent);
-        array_push($expectedMessage, "--{$boundaryMixed}--");
-        $expectedMessage = implode(Archangel::LINE_BREAK, $expectedMessage);
-
-        $plainMessageProperty = $this->getProtectedProperty('plainMessage');
-        $plainMessageProperty->setValue($archangel, $plainMessage);
-        $htmlMessageProperty = $this->getProtectedProperty('htmlMessage');
-        $htmlMessageProperty->setValue($archangel, $htmlMessage);
-        $attachmentProperty = $this->getProtectedProperty('attachments');
-        $attachmentProperty->setValue($archangel, array(
-            array('path' => $path, 'type' => $type, 'title' => $title)
-        ));
-        $buildMethod = $this->getProtectedMethod('buildMessageWithAttachments');
-        $builtMessage = $buildMethod->invoke($archangel);
-
-        unlink($path);
-        $this->assertEquals($expectedMessage, $builtMessage);
-    }
-
-    public function testBuildPlainMessageHeader()
-    {
-        $expectedMessageHeader = array(
-            'Content-Type: text/plain; charset="iso-8859"',
-            'Content-Transfer-Encoding: 7bit',
-            '',
-        );
-
-        $archangel = new Archangel();
-        $buildMethod = $this->getProtectedMethod('buildPlainMessageHeader');
-        $messageHeader = $buildMethod->invoke($archangel);
-
-        $this->assertEquals($expectedMessageHeader, $messageHeader);
-    }
-
-    public function testBuildHtmlMessageHeader()
-    {
-        $expectedMessageHeader = array(
-            'Content-Type: text/html; charset="iso-8859-1"',
-            'Content-Transfer-Encoding: 7bit',
-            '',
-        );
-
-        $archangel = new Archangel();
-        $buildMethod = $this->getProtectedMethod('buildHtmlMessageHeader');
-        $messageHeader = $buildMethod->invoke($archangel);
-
-        $this->assertEquals($expectedMessageHeader, $messageHeader);
-    }
-
-    /**
-     * @dataProvider dataBuildHeaders
-     */
-    public function testBuildHeaders(
-        $expectedHeaders,
-        $headers,
-        $attachments,
-        $plainMessage,
-        $htmlMessage
-    ) {
-        $archangel = new Archangel();
-        $headersProperty = $this->getProtectedProperty('headers');
-        $headersProperty->setValue($archangel, $headers);
-
-        if (!empty($attachments)) {
-            $attachmentsProperty = $this->getProtectedProperty('attachments');
-            $attachmentsProperty->setValue($archangel, $attachments);
-        }
-
-        if (!empty($plainMessage)) {
-            $plainMessageProperty = $this->getProtectedProperty('plainMessage');
-            $plainMessageProperty->setValue($archangel, $plainMessage);
-        }
-
-        if (!empty($htmlMessage)) {
-            $htmlMessageProperty = $this->getProtectedProperty('htmlMessage');
-            $htmlMessageProperty->setValue($archangel, $htmlMessage);
-        }
-
-        $buildHeadersMethod = $this->getProtectedMethod('buildHeaders');
-        $builtHeaders = $buildHeadersMethod->invoke($archangel);
-
-        $this->assertEquals($expectedHeaders, $builtHeaders);
-    }
-
-    public function dataBuildHeaders()
-    {
-        return array(
-            array(
-                'expectedHeaders' =>
-                    "From: test@example.com\r\n" .
-                    "X-Mailer: PHP/6.0.0",
-                'headers' => array(
-                    'From' => 'test@example.com',
-                    'X-Mailer' => sprintf('PHP/%s', phpversion())
-                ),
-                'attachments' => null,
-                'plainMessage' => true,
-                'htmlMessage' => null,
-            ),
-            array(
-                'expectedHeaders' =>
-                    "CC: testOne@example.com, testTwo@example.com\r\n" .
-                    "From: test@example.com\r\n" .
-                    "X-Mailer: PHP/6.0.0",
-                'headers' => array(
-                    'CC' => array('testOne@example.com', 'testTwo@example.com'),
-                    'From' => 'test@example.com',
-                    'X-Mailer' => sprintf('PHP/%s', phpversion())
-                ),
-                'attachments' => null,
-                'plainMessage' => true,
-                'htmlMessage' => null,
-            ),
-            array(
-                'expectedHeaders' =>
-                    "BCC: testOne@example.com, testTwo@example.com\r\n" .
-                    "From: test@example.com\r\n" .
-                    "X-Mailer: PHP/6.0.0",
-                'headers' => array(
-                    'BCC' => array('testOne@example.com', 'testTwo@example.com'),
-                    'From' => 'test@example.com',
-                    'X-Mailer' => sprintf('PHP/%s', phpversion())
-                ),
-                'attachments' => null,
-                'plainMessage' => true,
-                'htmlMessage' => null,
-            ),
-            array(
-                'expectedHeaders' =>
-                    "From: test@example.com\r\n" .
-                    "X-Mailer: PHP/6.0.0\r\n" .
-                    "Content-Type: multipart/mixed; boundary=\"PHP-mixed-1234567890123\"",
-                'headers' => array(
-                    'From' => 'test@example.com',
-                    'X-Mailer' => sprintf('PHP/%s', phpversion())
-                ),
-                'attachments' => true,
-                'plainMessage' => true,
-                'htmlMessage' => null,
-            ),
-            array(
-                'expectedHeaders' =>
-                    "From: test@example.com\r\n" .
-                    "X-Mailer: PHP/6.0.0\r\n" .
-                    "Content-Type: multipart/alternative; boundary=\"PHP-alternative-1234567890123\"",
-                'headers' => array(
-                    'From' => 'test@example.com',
-                    'X-Mailer' => sprintf('PHP/%s', phpversion())
-                ),
-                'attachments' => null,
-                'plainMessage' => true,
-                'htmlMessage' => true,
-            ),
-            array(
-                'expectedHeaders' =>
-                    "From: test@example.com\r\n" .
-                    "X-Mailer: PHP/6.0.0\r\n" .
-                    "Content-type: text/html; charset=\"iso-8859-1\"",
-                'headers' => array(
-                    'From' => 'test@example.com',
-                    'X-Mailer' => sprintf('PHP/%s', phpversion())
-                ),
-                'attachments' => null,
-                'plainMessage' => null,
-                'htmlMessage' => true,
-            ),
-        );
-    }
-
-    public function testBuildAttachmentContent()
-    {
-        $path = __DIR__ . '/test.txt';
-        $textContent = 'Dummy Content';
-        $this->makeTmpFile($path, $textContent);
-
-        $expectedContent = chunk_split(base64_encode($textContent));
-
-        $archangel = new Archangel();
-        $buildMethod = $this->getProtectedMethod('buildAttachmentContent');
-        $content = $buildMethod->invokeArgs($archangel, array($path));
-
-        unlink($path);
-        $this->assertEquals($expectedContent, $content);
-    }
-
-    public function testBuildAttachmentContentFailure()
-    {
-        $logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
-
-        $archangel = new Archangel();
-        $archangel->setLogger($logger);
-        $buildMethod = $this->getProtectedMethod('buildAttachmentContent');
-        $content = $buildMethod->invokeArgs($archangel, array('INVALID_PATH'));
-
-        $this->assertEmpty($content);
-    }
-
-    protected function getProtectedProperty($property)
-    {
-        $reflectedArchangel = new ReflectionClass('Jacobemerick\Archangel\Archangel');
-        $reflectedProperty = $reflectedArchangel->getProperty($property);
-        $reflectedProperty->setAccessible(true);
-
-        return $reflectedProperty;
-    }
-
-    protected function getProtectedMethod($method)
-    {
-        $reflectedArchangel = new ReflectionClass('Jacobemerick\Archangel\Archangel');
-        $reflectedMethod = $reflectedArchangel->getMethod($method);
-        $reflectedMethod->setAccessible(true);
-
-        return $reflectedMethod;
-    }
-
-    protected function makeTmpFile($path, $content)
-    {
-        $handle = fopen($path, 'w');
-        fwrite($handle, $content);
-        fclose($handle);
-    }
+	public function testBuildTo()
+	{
+		$archangel = new Archangel();
+		$addressesProperty = $this->getProtectedProperty('toAddresses');
+		$addressesProperty->setValue($archangel, array('test@example.com'));
+		$buildMethod = $this->getProtectedMethod('buildTo');
+		$toAddresses = $buildMethod->invoke($archangel);
+
+		$this->assertEquals('test@example.com', $toAddresses);
+	}
+
+	public function testBuildToMultiple()
+	{
+		$archangel = new Archangel();
+		$addressesProperty = $this->getProtectedProperty('toAddresses');
+		$addressesProperty->setValue($archangel, array('testOne@example.com', 'testTwo@example.com'));
+		$buildMethod = $this->getProtectedMethod('buildTo');
+		$toAddresses = $buildMethod->invoke($archangel);
+
+		$this->assertEquals('testOne@example.com, testTwo@example.com', $toAddresses);
+	}
+
+	public function testBuildMessageEmpty()
+	{
+		$archangel = new Archangel();
+		$plainMessageProperty = $this->getProtectedProperty('plainMessage');
+		$plainMessageProperty->setValue($archangel, '');
+		$htmlMessageProperty = $this->getProtectedProperty('htmlMessage');
+		$htmlMessageProperty->setValue($archangel, '');
+		$buildMethod = $this->getProtectedMethod('buildMessage');
+		$builtMessage = $buildMethod->invoke($archangel);
+
+		$this->assertEmpty($builtMessage);
+	}
+
+	public function testBuildMessagePlain()
+	{
+		$message = 'Plain text message';
+
+		$archangel = new Archangel();
+		$plainMessageProperty = $this->getProtectedProperty('plainMessage');
+		$plainMessageProperty->setValue($archangel, $message);
+		$htmlMessageProperty = $this->getProtectedProperty('htmlMessage');
+		$htmlMessageProperty->setValue($archangel, '');
+		$buildMethod = $this->getProtectedMethod('buildMessage');
+		$builtMessage = $buildMethod->invoke($archangel);
+
+		$this->assertEquals($message, $builtMessage);
+	}
+
+	public function testBuildMessageHtml()
+	{
+		$message = '<p>HTML Message.</p>';
+
+		$archangel = new Archangel();
+		$plainMessageProperty = $this->getProtectedProperty('plainMessage');
+		$plainMessageProperty->setValue($archangel, '');
+		$htmlMessageProperty = $this->getProtectedProperty('htmlMessage');
+		$htmlMessageProperty->setValue($archangel, $message);
+		$buildMethod = $this->getProtectedMethod('buildMessage');
+		$builtMessage = $buildMethod->invoke($archangel);
+
+		$this->assertEquals($message, $builtMessage);
+	}
+
+	public function testBuildMessageMultipart()
+	{
+		$plainMessage = 'Plain text message';
+		$htmlMessage = '<p>HTML Message.</p>';
+
+		$archangel = new Archangel();
+
+		$boundaryProperty = $this->getProtectedProperty('boundaryAlternative');
+		$boundary = $boundaryProperty->getValue($archangel);
+		$plainMsgMethod = $this->getProtectedMethod('buildPlainMessageHeader');
+		$plainMsgHeaders = $plainMsgMethod->invoke($archangel);
+		$htmlMsgMethod = $this->getProtectedMethod('buildHtmlMessageHeader');
+		$htmlMsgHeaders = $htmlMsgMethod->invoke($archangel);
+
+		$expectedMessage = array();
+		array_push($expectedMessage, "--{$boundary}");
+		$expectedMessage = array_merge($expectedMessage, $plainMsgHeaders);
+		array_push($expectedMessage, $plainMessage);
+		array_push($expectedMessage, "--{$boundary}");
+		$expectedMessage = array_merge($expectedMessage, $htmlMsgHeaders);
+		array_push($expectedMessage, $htmlMessage);
+		array_push($expectedMessage, "--{$boundary}--");
+		$expectedMessage = implode(Archangel::LINE_BREAK, $expectedMessage);
+
+		$plainMessageProperty = $this->getProtectedProperty('plainMessage');
+		$plainMessageProperty->setValue($archangel, $plainMessage);
+		$htmlMessageProperty = $this->getProtectedProperty('htmlMessage');
+		$htmlMessageProperty->setValue($archangel, $htmlMessage);
+		$buildMethod = $this->getProtectedMethod('buildMessage');
+		$builtMessage = $buildMethod->invoke($archangel);
+
+		$this->assertEquals($expectedMessage, $builtMessage);
+	}
+
+	public function testBuildMessageWithAttachmentsEmpty()
+	{
+		$path = __DIR__ . '/test.txt';
+		$textContent = 'Dummy Content';
+		$this->makeTmpFile($path, $textContent);
+
+		$encodedContent = chunk_split(base64_encode($textContent));
+		$type = 'text/plain';
+		$title = 'Test File';
+
+		$archangel = new Archangel();
+
+		$boundaryMixedProperty = $this->getProtectedProperty('boundaryMixed');
+		$boundaryMixed = $boundaryMixedProperty->getValue($archangel);
+
+		$expectedMessage = array();
+		array_push($expectedMessage, "--{$boundaryMixed}");
+		array_push($expectedMessage, "Content-Type: {$type}; name=\"{$title}\"");
+		array_push($expectedMessage, 'Content-Transfer-Encoding: base64');
+		array_push($expectedMessage, 'Content-Disposition: attachment');
+		array_push($expectedMessage, '');
+		array_push($expectedMessage, $encodedContent);
+		array_push($expectedMessage, "--{$boundaryMixed}--");
+		$expectedMessage = implode(Archangel::LINE_BREAK, $expectedMessage);
+
+		$plainMessageProperty = $this->getProtectedProperty('plainMessage');
+		$plainMessageProperty->setValue($archangel, '');
+		$htmlMessageProperty = $this->getProtectedProperty('htmlMessage');
+		$htmlMessageProperty->setValue($archangel, '');
+		$attachmentProperty = $this->getProtectedProperty('attachments');
+		$attachmentProperty->setValue($archangel, array(
+			array('path' => $path, 'type' => $type, 'title' => $title)
+		));
+		$buildMethod = $this->getProtectedMethod('buildMessageWithAttachments');
+		$builtMessage = $buildMethod->invoke($archangel);
+
+		unlink($path);
+		$this->assertEquals($expectedMessage, $builtMessage);
+	}
+
+	public function testBuildMessageWithAttachmentsPlain()
+	{
+		$path = __DIR__ . '/test.txt';
+		$textContent = 'Dummy Content';
+		$this->makeTmpFile($path, $textContent);
+
+		$encodedContent = chunk_split(base64_encode($textContent));
+		$type = 'text/plain';
+		$title = 'Test File';
+		$message = 'Plain text message';
+
+		$archangel = new Archangel();
+
+		$boundaryMixedProperty = $this->getProtectedProperty('boundaryMixed');
+		$boundaryMixed = $boundaryMixedProperty->getValue($archangel);
+		$plainMsgMethod = $this->getProtectedMethod('buildPlainMessageHeader');
+		$plainMsgHeaders = $plainMsgMethod->invoke($archangel);
+
+		$expectedMessage = array();
+		array_push($expectedMessage, "--{$boundaryMixed}");
+		$expectedMessage = array_merge($expectedMessage, $plainMsgHeaders);
+		array_push($expectedMessage, $message);
+		array_push($expectedMessage, "--{$boundaryMixed}");
+		array_push($expectedMessage, "Content-Type: {$type}; name=\"{$title}\"");
+		array_push($expectedMessage, 'Content-Transfer-Encoding: base64');
+		array_push($expectedMessage, 'Content-Disposition: attachment');
+		array_push($expectedMessage, '');
+		array_push($expectedMessage, $encodedContent);
+		array_push($expectedMessage, "--{$boundaryMixed}--");
+		$expectedMessage = implode(Archangel::LINE_BREAK, $expectedMessage);
+
+		$plainMessageProperty = $this->getProtectedProperty('plainMessage');
+		$plainMessageProperty->setValue($archangel, $message);
+		$htmlMessageProperty = $this->getProtectedProperty('htmlMessage');
+		$htmlMessageProperty->setValue($archangel, '');
+		$attachmentProperty = $this->getProtectedProperty('attachments');
+		$attachmentProperty->setValue($archangel, array(
+			array('path' => $path, 'type' => $type, 'title' => $title)
+		));
+		$buildMethod = $this->getProtectedMethod('buildMessageWithAttachments');
+		$builtMessage = $buildMethod->invoke($archangel);
+
+		unlink($path);
+		$this->assertEquals($expectedMessage, $builtMessage);
+	}
+
+	public function testBuildMessageWithAttachmentsHtml()
+	{
+		$path = __DIR__ . '/test.txt';
+		$textContent = 'Dummy Content';
+		$this->makeTmpFile($path, $textContent);
+
+		$encodedContent = chunk_split(base64_encode($textContent));
+		$type = 'text/plain';
+		$title = 'Test File';
+		$message = '<p>HTML Message.</p>';
+
+		$archangel = new Archangel();
+
+		$boundaryMixedProperty = $this->getProtectedProperty('boundaryMixed');
+		$boundaryMixed = $boundaryMixedProperty->getValue($archangel);
+		$htmlMsgMethod = $this->getProtectedMethod('buildHtmlMessageHeader');
+		$htmlMsgHeaders = $htmlMsgMethod->invoke($archangel);
+
+		$expectedMessage = array();
+		array_push($expectedMessage, "--{$boundaryMixed}");
+		$expectedMessage = array_merge($expectedMessage, $htmlMsgHeaders);
+		array_push($expectedMessage, $message);
+		array_push($expectedMessage, "--{$boundaryMixed}");
+		array_push($expectedMessage, "Content-Type: {$type}; name=\"{$title}\"");
+		array_push($expectedMessage, 'Content-Transfer-Encoding: base64');
+		array_push($expectedMessage, 'Content-Disposition: attachment');
+		array_push($expectedMessage, '');
+		array_push($expectedMessage, $encodedContent);
+		array_push($expectedMessage, "--{$boundaryMixed}--");
+		$expectedMessage = implode(Archangel::LINE_BREAK, $expectedMessage);
+
+		$plainMessageProperty = $this->getProtectedProperty('plainMessage');
+		$plainMessageProperty->setValue($archangel, '');
+		$htmlMessageProperty = $this->getProtectedProperty('htmlMessage');
+		$htmlMessageProperty->setValue($archangel, $message);
+		$attachmentProperty = $this->getProtectedProperty('attachments');
+		$attachmentProperty->setValue($archangel, array(
+			array('path' => $path, 'type' => $type, 'title' => $title)
+		));
+		$buildMethod = $this->getProtectedMethod('buildMessageWithAttachments');
+		$builtMessage = $buildMethod->invoke($archangel);
+
+		unlink($path);
+		$this->assertEquals($expectedMessage, $builtMessage);
+	}
+
+	public function testBuildMessageWithAttachmentsMultipart()
+	{
+		$path = __DIR__ . '/test.txt';
+		$textContent = 'Dummy Content';
+		$this->makeTmpFile($path, $textContent);
+
+		$encodedContent = chunk_split(base64_encode($textContent));
+		$type = 'text/plain';
+		$title = 'Test File';
+		$plainMessage = 'Plain text message';
+		$htmlMessage = '<p>HTML Message.</p>';
+
+		$archangel = new Archangel();
+
+		$boundaryMixedProperty = $this->getProtectedProperty('boundaryMixed');
+		$boundaryMixed = $boundaryMixedProperty->getValue($archangel);
+		$boundaryAltProperty = $this->getProtectedProperty('boundaryAlternative');
+		$boundaryAlternative = $boundaryAltProperty->getValue($archangel);
+		$plainMsgMethod = $this->getProtectedMethod('buildPlainMessageHeader');
+		$plainMsgHeaders = $plainMsgMethod->invoke($archangel);
+		$htmlMsgMethod = $this->getProtectedMethod('buildHtmlMessageHeader');
+		$htmlMsgHeaders = $htmlMsgMethod->invoke($archangel);
+
+		$expectedMessage = array();
+		array_push($expectedMessage, "--{$boundaryMixed}");
+		array_push($expectedMessage, "Content-Type: multipart/alternative; boundary={$boundaryAlternative}");
+		array_push($expectedMessage, '');
+		array_push($expectedMessage, "--{$boundaryAlternative}");
+		$expectedMessage = array_merge($expectedMessage, $plainMsgHeaders);
+		array_push($expectedMessage, $plainMessage);
+		array_push($expectedMessage, "--{$boundaryAlternative}");
+		$expectedMessage = array_merge($expectedMessage, $htmlMsgHeaders);
+		array_push($expectedMessage, $htmlMessage);
+		array_push($expectedMessage, "--{$boundaryAlternative}--");
+		array_push($expectedMessage, '');
+		array_push($expectedMessage, "--{$boundaryMixed}");
+		array_push($expectedMessage, "Content-Type: {$type}; name=\"{$title}\"");
+		array_push($expectedMessage, 'Content-Transfer-Encoding: base64');
+		array_push($expectedMessage, 'Content-Disposition: attachment');
+		array_push($expectedMessage, '');
+		array_push($expectedMessage, $encodedContent);
+		array_push($expectedMessage, "--{$boundaryMixed}--");
+		$expectedMessage = implode(Archangel::LINE_BREAK, $expectedMessage);
+
+		$plainMessageProperty = $this->getProtectedProperty('plainMessage');
+		$plainMessageProperty->setValue($archangel, $plainMessage);
+		$htmlMessageProperty = $this->getProtectedProperty('htmlMessage');
+		$htmlMessageProperty->setValue($archangel, $htmlMessage);
+		$attachmentProperty = $this->getProtectedProperty('attachments');
+		$attachmentProperty->setValue($archangel, array(
+			array('path' => $path, 'type' => $type, 'title' => $title)
+		));
+		$buildMethod = $this->getProtectedMethod('buildMessageWithAttachments');
+		$builtMessage = $buildMethod->invoke($archangel);
+
+		unlink($path);
+		$this->assertEquals($expectedMessage, $builtMessage);
+	}
+
+	public function testBuildPlainMessageHeader()
+	{
+		$expectedMessageHeader = array(
+			'Content-Type: text/plain; charset="iso-8859"',
+			'Content-Transfer-Encoding: 7bit',
+			'',
+		);
+
+		$archangel = new Archangel();
+		$buildMethod = $this->getProtectedMethod('buildPlainMessageHeader');
+		$messageHeader = $buildMethod->invoke($archangel);
+
+		$this->assertEquals($expectedMessageHeader, $messageHeader);
+	}
+
+	public function testBuildHtmlMessageHeader()
+	{
+		$expectedMessageHeader = array(
+			'Content-Type: text/html; charset="iso-8859-1"',
+			'Content-Transfer-Encoding: 7bit',
+			'',
+		);
+
+		$archangel = new Archangel();
+		$buildMethod = $this->getProtectedMethod('buildHtmlMessageHeader');
+		$messageHeader = $buildMethod->invoke($archangel);
+
+		$this->assertEquals($expectedMessageHeader, $messageHeader);
+	}
+
+	/**
+	 * @dataProvider dataBuildHeaders
+	 */
+	public function testBuildHeaders(
+		$expectedHeaders,
+		$headers,
+		$attachments,
+		$plainMessage,
+		$htmlMessage
+	) {
+		$archangel = new Archangel();
+		$headersProperty = $this->getProtectedProperty('headers');
+		$headersProperty->setValue($archangel, $headers);
+
+		if (!empty($attachments)) {
+			$attachmentsProperty = $this->getProtectedProperty('attachments');
+			$attachmentsProperty->setValue($archangel, $attachments);
+		}
+
+		if (!empty($plainMessage)) {
+			$plainMessageProperty = $this->getProtectedProperty('plainMessage');
+			$plainMessageProperty->setValue($archangel, $plainMessage);
+		}
+
+		if (!empty($htmlMessage)) {
+			$htmlMessageProperty = $this->getProtectedProperty('htmlMessage');
+			$htmlMessageProperty->setValue($archangel, $htmlMessage);
+		}
+
+		$buildHeadersMethod = $this->getProtectedMethod('buildHeaders');
+		$builtHeaders = $buildHeadersMethod->invoke($archangel);
+
+		$this->assertEquals($expectedHeaders, $builtHeaders);
+	}
+
+	public function dataBuildHeaders()
+	{
+		return array(
+			array(
+				'expectedHeaders' =>
+					"From: test@example.com\r\n" .
+					"X-Mailer: PHP/6.0.0",
+				'headers' => array(
+					'From' => 'test@example.com',
+					'X-Mailer' => sprintf('PHP/%s', phpversion())
+				),
+				'attachments' => null,
+				'plainMessage' => true,
+				'htmlMessage' => null,
+			),
+			array(
+				'expectedHeaders' =>
+					"CC: testOne@example.com, testTwo@example.com\r\n" .
+					"From: test@example.com\r\n" .
+					"X-Mailer: PHP/6.0.0",
+				'headers' => array(
+					'CC' => array('testOne@example.com', 'testTwo@example.com'),
+					'From' => 'test@example.com',
+					'X-Mailer' => sprintf('PHP/%s', phpversion())
+				),
+				'attachments' => null,
+				'plainMessage' => true,
+				'htmlMessage' => null,
+			),
+			array(
+				'expectedHeaders' =>
+					"BCC: testOne@example.com, testTwo@example.com\r\n" .
+					"From: test@example.com\r\n" .
+					"X-Mailer: PHP/6.0.0",
+				'headers' => array(
+					'BCC' => array('testOne@example.com', 'testTwo@example.com'),
+					'From' => 'test@example.com',
+					'X-Mailer' => sprintf('PHP/%s', phpversion())
+				),
+				'attachments' => null,
+				'plainMessage' => true,
+				'htmlMessage' => null,
+			),
+			array(
+				'expectedHeaders' =>
+					"From: test@example.com\r\n" .
+					"X-Mailer: PHP/6.0.0\r\n" .
+					"Content-Type: multipart/mixed; boundary=\"PHP-mixed-1234567890123\"",
+				'headers' => array(
+					'From' => 'test@example.com',
+					'X-Mailer' => sprintf('PHP/%s', phpversion())
+				),
+				'attachments' => true,
+				'plainMessage' => true,
+				'htmlMessage' => null,
+			),
+			array(
+				'expectedHeaders' =>
+					"From: test@example.com\r\n" .
+					"X-Mailer: PHP/6.0.0\r\n" .
+					"Content-Type: multipart/alternative; boundary=\"PHP-alternative-1234567890123\"",
+				'headers' => array(
+					'From' => 'test@example.com',
+					'X-Mailer' => sprintf('PHP/%s', phpversion())
+				),
+				'attachments' => null,
+				'plainMessage' => true,
+				'htmlMessage' => true,
+			),
+			array(
+				'expectedHeaders' =>
+					"From: test@example.com\r\n" .
+					"X-Mailer: PHP/6.0.0\r\n" .
+					"Content-type: text/html; charset=\"iso-8859-1\"",
+				'headers' => array(
+					'From' => 'test@example.com',
+					'X-Mailer' => sprintf('PHP/%s', phpversion())
+				),
+				'attachments' => null,
+				'plainMessage' => null,
+				'htmlMessage' => true,
+			),
+		);
+	}
+
+	public function testBuildAttachmentContent()
+	{
+		$path = __DIR__ . '/test.txt';
+		$textContent = 'Dummy Content';
+		$this->makeTmpFile($path, $textContent);
+
+		$expectedContent = chunk_split(base64_encode($textContent));
+
+		$archangel = new Archangel();
+		$buildMethod = $this->getProtectedMethod('buildAttachmentContent');
+		$content = $buildMethod->invokeArgs($archangel, array($path));
+
+		unlink($path);
+		$this->assertEquals($expectedContent, $content);
+	}
+
+	public function testBuildAttachmentContentFailure()
+	{
+		$logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
+
+		$archangel = new Archangel();
+		$archangel->setLogger($logger);
+		$buildMethod = $this->getProtectedMethod('buildAttachmentContent');
+		$content = $buildMethod->invokeArgs($archangel, array('INVALID_PATH'));
+
+		$this->assertEmpty($content);
+	}
+
+	protected function getProtectedProperty($property)
+	{
+		$reflectedArchangel = new ReflectionClass('Jacobemerick\Archangel\Archangel');
+		$reflectedProperty = $reflectedArchangel->getProperty($property);
+		$reflectedProperty->setAccessible(true);
+
+		return $reflectedProperty;
+	}
+
+	protected function getProtectedMethod($method)
+	{
+		$reflectedArchangel = new ReflectionClass('Jacobemerick\Archangel\Archangel');
+		$reflectedMethod = $reflectedArchangel->getMethod($method);
+		$reflectedMethod->setAccessible(true);
+
+		return $reflectedMethod;
+	}
+
+	protected function makeTmpFile($path, $content)
+	{
+		$handle = fopen($path, 'w');
+		fwrite($handle, $content);
+		fclose($handle);
+	}
 }

src/Archangel.php

Indentation +453 added lines, -454 removed lines

@@ -16,458 +16,457 @@
 class Archangel implements LoggerAwareInterface
 {
 
-    /** @var boolean $isTestMode */
-    protected $isTestMode;
-
-    /** @var string $subject */
-    protected $subject;
-
-    /** @var array $toAddresses */
-    protected $toAddresses = 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 $boundaryMixed */
-    protected $boundaryMixed;
-
-    /** @var string $boundaryAlternative */
-    protected $boundaryAlternative;
-
-    /** @var LoggerInterface */
-    protected $logger;
-
-    /** @var string LINE_BREAK */
-    const LINE_BREAK = "\r\n";
-
-    /**
-     * @param string  $mailer
-     * @param boolean $isTestMode
-     */
-    public function __construct($mailer = null, $isTestMode = false)
-    {
-        if (is_null($mailer)) {
-            $mailer = sprintf('PHP/%s', phpversion());
-        }
-        $this->headers['X-Mailer'] = $mailer;
-        $this->isTestMode = $isTestMode;
-
-        $this->logger = new NullLogger();
-        $this->boundaryMixed = sprintf('PHP-mixed-%s', uniqid());
-        $this->boundaryAlternative = sprintf('PHP-alternative-%s', uniqid());
-    }
-
-    /**
-     * @param LoggerInterface $logger
-     *
-     * @return object instantiated $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 = '')
-    {
-        array_push(
-            $this->toAddresses,
-            $this->formatEmailAddress($address, $title)
-        );
-
-        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 (!isset($this->headers['CC'])) {
-            $this->headers['CC'] = array();
-        }
-
-        array_push(
-            $this->headers['CC'],
-            $this->formatEmailAddress($address, $title)
-        );
-
-        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 (!isset($this->headers['BCC'])) {
-            $this->headers['BCC'] = array();
-        }
-
-        array_push(
-            $this->headers['BCC'],
-            $this->formatEmailAddress($address, $title)
-        );
-
-        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 = '')
-    {
-        $this->headers['From'] = $this->formatEmailAddress($address, $title);
-
-        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 = '')
-    {
-        $this->headers['Reply-To'] = $this->formatEmailAddress($address, $title);
-
-        return $this;
-    }
-
-    /**
-     * @param string $address
-     * @param string $title
-     *
-     * @return string
-     */
-    protected function formatEmailAddress($address, $title)
-    {
-        if (!empty($title)) {
-            $address = sprintf('"%s" <%s>', $title, $address);
-        }
-        return $address;
-    }
-
-    /**
-     * 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()) {
-            $this->logger->error('Minimum required fields not filled out, cannot send Archangel mail.');
-            return false;
-        }
-
-        $recipients = $this->buildTo();
-        $subject = $this->subject;
-        $message = (empty($this->attachments)) ? $this->buildMessage() : $this->buildMessageWithAttachments();
-        $headers = $this->buildHeaders();
-
-        $debugMessage = array(
-            'Triggered send on Archangel mail.',
-            "Recipients: {$recipients}",
-            "Subject: {$subject}",
-            "Message: {$message}",
-            "Headers: {$headers}",
-        );
-        $this->logger->debug(implode(' || ', $debugMessage));
-
-        if ($this->isTestMode) {
-            return true;
-        }
-        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);
-    }
-
-    /**
-     * Returns a simple email message without attachments
-     *
-     * @return string email message
-     */
-    protected function buildMessage()
-    {
-        if (empty($this->plainMessage) && empty($this->htmlMessage)) {
-            return '';
-        }
-        if (!empty($this->plainMessage) && empty($this->htmlMessage)) {
-            return $this->plainMessage;
-        }
-        if (empty($this->plainMessage) && !empty($this->htmlMessage)) {
-            return $this->htmlMessage;
-        }
-
-        $message = array();
-        array_push($message, "--{$this->boundaryAlternative}");
-        $message = array_merge($message, $this->buildPlainMessageHeader());
-        array_push($message, $this->plainMessage);
-        array_push($message, "--{$this->boundaryAlternative}");
-        $message = array_merge($message, $this->buildHtmlMessageHeader());
-        array_push($message, $this->htmlMessage);
-        array_push($message, "--{$this->boundaryAlternative}--");
-
-        return implode(self::LINE_BREAK, $message);
-    }
-
-    /**
-     * Build multi-part message with attachments
-     *
-     * @return string email message
-     */
-    protected function buildMessageWithAttachments()
-    {
-        $message = array();
-
-        if (!empty($this->plainMessage) || !empty($this->htmlMessage)) {
-            array_push($message, "--{$this->boundaryMixed}");
-        }
-
-        if (!empty($this->plainMessage) && !empty($this->htmlMessage)) {
-            array_push($message, "Content-Type: multipart/alternative; boundary={$this->boundaryAlternative}");
-            array_push($message, '');
-            array_push($message, "--{$this->boundaryAlternative}");
-            $message = array_merge($message, $this->buildPlainMessageHeader());
-            array_push($message, $this->plainMessage);
-            array_push($message, "--{$this->boundaryAlternative}");
-            $message = array_merge($message, $this->buildHtmlMessageHeader());
-            array_push($message, $this->htmlMessage);
-            array_push($message, "--{$this->boundaryAlternative}--");
-            array_push($message, '');
-        } elseif (!empty($this->plainMessage)) {
-            $message = array_merge($message, $this->buildPlainMessageHeader());
-            array_push($message, $this->plainMessage);
-        } elseif (!empty($this->htmlMessage)) {
-            $message = array_merge($message, $this->buildHtmlMessageHeader());
-            array_push($message, $this->htmlMessage);
-        }
-        foreach ($this->attachments as $attachment) {
-            array_push($message, "--{$this->boundaryMixed}");
-            array_push($message, "Content-Type: {$attachment['type']}; name=\"{$attachment['title']}\"");
-            array_push($message, 'Content-Transfer-Encoding: base64');
-            array_push($message, 'Content-Disposition: attachment');
-            array_push($message, '');
-            array_push($message, $this->buildAttachmentContent($attachment['path']));
-        }
-        array_push($message, "--{$this->boundaryMixed}--");
-
-        return implode(self::LINE_BREAK, $message);
-    }
-
-
-    /**
-     * Shared holder for the plain message header
-     *
-     * @return array
-     */
-    protected function buildPlainMessageHeader()
-    {
-        return array(
-            'Content-Type: text/plain; charset="iso-8859"',
-            'Content-Transfer-Encoding: 7bit',
-            '',
-        );
-    }
-
-    /**
-     * Shared holder for the html message header
-     *
-     * @return array
-     */
-    protected function buildHtmlMessageHeader()
-    {
-        return array(
-            'Content-Type: text/html; charset="iso-8859-1"',
-            'Content-Transfer-Encoding: 7bit',
-            '',
-        );
-    }
-
-    /**
-     * Builder for the additional headers needed for multipart emails
-     *
-     * @return string headers needed for multipart
-     */
-    protected function buildHeaders()
-    {
-        $headers = array();
-        foreach ($this->headers as $key => $value) {
-            if ($key == 'CC' || $key == 'BCC') {
-                $value = implode(', ', $value);
-            }
-            array_push($headers, sprintf('%s: %s', $key, $value));
-        }
-
-        if (!empty($this->attachments)) {
-            array_push(
-                $headers,
-                "Content-Type: multipart/mixed; boundary=\"{$this->boundaryMixed}\""
-            );
-        } elseif (!empty($this->plainMessage) && !empty($this->htmlMessage)) {
-            array_push(
-                $headers,
-                "Content-Type: multipart/alternative; boundary=\"{$this->boundaryAlternative}\""
-            );
-        } elseif (!empty($this->htmlMessage)) {
-            array_push(
-                $headers,
-                'Content-type: text/html; charset="iso-8859-1"'
-            );
-        }
-
-        return implode(self::LINE_BREAK, $headers);
-    }
-
-    /**
-     * File reader for attachments
-     *
-     * @param string $path filepath of the attachment
-     *
-     * @return string binary representation of file, base64'd
-     */
-    protected function buildAttachmentContent($path)
-    {
-        if (!file_exists($path)) {
-            $this->logger->error("Could not find file {$path} for attaching to Archangel mail.");
-            return '';
-        }
-
-        $handle = fopen($path, 'r');
-        $contents = fread($handle, filesize($path));
-        fclose($handle);
-
-        $contents = base64_encode($contents);
-        $contents = chunk_split($contents);
-        return $contents;
-    }
+	/** @var boolean $isTestMode */
+	protected $isTestMode;
+
+	/** @var string $subject */
+	protected $subject;
+
+	/** @var array $toAddresses */
+	protected $toAddresses = 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 $boundaryMixed */
+	protected $boundaryMixed;
+
+	/** @var string $boundaryAlternative */
+	protected $boundaryAlternative;
+
+	/** @var LoggerInterface */
+	protected $logger;
+
+	/** @var string LINE_BREAK */
+	const LINE_BREAK = "\r\n";
+
+	/**
+	 * @param string  $mailer
+	 * @param boolean $isTestMode
+	 */
+	public function __construct($mailer = null, $isTestMode = false)
+	{
+		if (is_null($mailer)) {
+			$mailer = sprintf('PHP/%s', phpversion());
+		}
+		$this->headers['X-Mailer'] = $mailer;
+		$this->isTestMode = $isTestMode;
+
+		$this->logger = new NullLogger();
+		$this->boundaryMixed = sprintf('PHP-mixed-%s', uniqid());
+		$this->boundaryAlternative = sprintf('PHP-alternative-%s', uniqid());
+	}
+
+	/**
+	 * @param LoggerInterface $logger
+	 *
+	 * @return object instantiated $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 = '')
+	{
+		array_push(
+			$this->toAddresses,
+			$this->formatEmailAddress($address, $title)
+		);
+
+		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 (!isset($this->headers['CC'])) {
+			$this->headers['CC'] = array();
+		}
+
+		array_push(
+			$this->headers['CC'],
+			$this->formatEmailAddress($address, $title)
+		);
+
+		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 (!isset($this->headers['BCC'])) {
+			$this->headers['BCC'] = array();
+		}
+
+		array_push(
+			$this->headers['BCC'],
+			$this->formatEmailAddress($address, $title)
+		);
+
+		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 = '')
+	{
+		$this->headers['From'] = $this->formatEmailAddress($address, $title);
+
+		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 = '')
+	{
+		$this->headers['Reply-To'] = $this->formatEmailAddress($address, $title);
+
+		return $this;
+	}
+
+	/**
+	 * @param string $address
+	 * @param string $title
+	 *
+	 * @return string
+	 */
+	protected function formatEmailAddress($address, $title)
+	{
+		if (!empty($title)) {
+			$address = sprintf('"%s" <%s>', $title, $address);
+		}
+		return $address;
+	}
+
+	/**
+	 * 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()) {
+			$this->logger->error('Minimum required fields not filled out, cannot send Archangel mail.');
+			return false;
+		}
+
+		$recipients = $this->buildTo();
+		$subject = $this->subject;
+		$message = (empty($this->attachments)) ? $this->buildMessage() : $this->buildMessageWithAttachments();
+		$headers = $this->buildHeaders();
+
+		$debugMessage = array(
+			'Triggered send on Archangel mail.',
+			"Recipients: {$recipients}",
+			"Subject: {$subject}",
+			"Message: {$message}",
+			"Headers: {$headers}",
+		);
+		$this->logger->debug(implode(' || ', $debugMessage));
+
+		if ($this->isTestMode) {
+			return true;
+		}
+		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);
+	}
+
+	/**
+	 * Returns a simple email message without attachments
+	 *
+	 * @return string email message
+	 */
+	protected function buildMessage()
+	{
+		if (empty($this->plainMessage) && empty($this->htmlMessage)) {
+			return '';
+		}
+		if (!empty($this->plainMessage) && empty($this->htmlMessage)) {
+			return $this->plainMessage;
+		}
+		if (empty($this->plainMessage) && !empty($this->htmlMessage)) {
+			return $this->htmlMessage;
+		}
+
+		$message = array();
+		array_push($message, "--{$this->boundaryAlternative}");
+		$message = array_merge($message, $this->buildPlainMessageHeader());
+		array_push($message, $this->plainMessage);
+		array_push($message, "--{$this->boundaryAlternative}");
+		$message = array_merge($message, $this->buildHtmlMessageHeader());
+		array_push($message, $this->htmlMessage);
+		array_push($message, "--{$this->boundaryAlternative}--");
+
+		return implode(self::LINE_BREAK, $message);
+	}
+
+	/**
+	 * Build multi-part message with attachments
+	 *
+	 * @return string email message
+	 */
+	protected function buildMessageWithAttachments()
+	{
+		$message = array();
+
+		if (!empty($this->plainMessage) || !empty($this->htmlMessage)) {
+			array_push($message, "--{$this->boundaryMixed}");
+		}
+
+		if (!empty($this->plainMessage) && !empty($this->htmlMessage)) {
+			array_push($message, "Content-Type: multipart/alternative; boundary={$this->boundaryAlternative}");
+			array_push($message, '');
+			array_push($message, "--{$this->boundaryAlternative}");
+			$message = array_merge($message, $this->buildPlainMessageHeader());
+			array_push($message, $this->plainMessage);
+			array_push($message, "--{$this->boundaryAlternative}");
+			$message = array_merge($message, $this->buildHtmlMessageHeader());
+			array_push($message, $this->htmlMessage);
+			array_push($message, "--{$this->boundaryAlternative}--");
+			array_push($message, '');
+		} elseif (!empty($this->plainMessage)) {
+			$message = array_merge($message, $this->buildPlainMessageHeader());
+			array_push($message, $this->plainMessage);
+		} elseif (!empty($this->htmlMessage)) {
+			$message = array_merge($message, $this->buildHtmlMessageHeader());
+			array_push($message, $this->htmlMessage);
+		}
+		foreach ($this->attachments as $attachment) {
+			array_push($message, "--{$this->boundaryMixed}");
+			array_push($message, "Content-Type: {$attachment['type']}; name=\"{$attachment['title']}\"");
+			array_push($message, 'Content-Transfer-Encoding: base64');
+			array_push($message, 'Content-Disposition: attachment');
+			array_push($message, '');
+			array_push($message, $this->buildAttachmentContent($attachment['path']));
+		}
+		array_push($message, "--{$this->boundaryMixed}--");
+
+		return implode(self::LINE_BREAK, $message);
+	}
+
+
+	/**
+	 * Shared holder for the plain message header
+	 *
+	 * @return array
+	 */
+	protected function buildPlainMessageHeader()
+	{
+		return array(
+			'Content-Type: text/plain; charset="iso-8859"',
+			'Content-Transfer-Encoding: 7bit',
+			'',
+		);
+	}
+
+	/**
+	 * Shared holder for the html message header
+	 *
+	 * @return array
+	 */
+	protected function buildHtmlMessageHeader()
+	{
+		return array(
+			'Content-Type: text/html; charset="iso-8859-1"',
+			'Content-Transfer-Encoding: 7bit',
+			'',
+		);
+	}
+
+	/**
+	 * Builder for the additional headers needed for multipart emails
+	 *
+	 * @return string headers needed for multipart
+	 */
+	protected function buildHeaders()
+	{
+		$headers = array();
+		foreach ($this->headers as $key => $value) {
+			if ($key == 'CC' || $key == 'BCC') {
+				$value = implode(', ', $value);
+			}
+			array_push($headers, sprintf('%s: %s', $key, $value));
+		}
+
+		if (!empty($this->attachments)) {
+			array_push(
+				$headers,
+				"Content-Type: multipart/mixed; boundary=\"{$this->boundaryMixed}\""
+			);
+		} elseif (!empty($this->plainMessage) && !empty($this->htmlMessage)) {
+			array_push(
+				$headers,
+				"Content-Type: multipart/alternative; boundary=\"{$this->boundaryAlternative}\""
+			);
+		} elseif (!empty($this->htmlMessage)) {
+			array_push(
+				$headers,
+				'Content-type: text/html; charset="iso-8859-1"'
+			);
+		}
+
+		return implode(self::LINE_BREAK, $headers);
+	}
+
+	/**
+	 * File reader for attachments
+	 *
+	 * @param string $path filepath of the attachment
+	 *
+	 * @return string binary representation of file, base64'd
+	 */
+	protected function buildAttachmentContent($path)
+	{
+		if (!file_exists($path)) {
+			$this->logger->error("Could not find file {$path} for attaching to Archangel mail.");
+			return '';
+		}
+
+		$handle = fopen($path, 'r');
+		$contents = fread($handle, filesize($path));
+		fclose($handle);
+
+		$contents = base64_encode($contents);
+		$contents = chunk_split($contents);
+		return $contents;
+	}
 }