Merge pull request #44 from icambridge/setMessage

Add setMessage to MessageBuilder

src/Mailgun/Messages/MessageBuilder.php

@@ -338,6 +338,11 @@ class MessageBuilder
         }
     }
 
+    public function setMessage($message)
+    {
+        $this->message = $message;
+    }
+
     public function getMessage()
     {
         return $this->message;

tests/Mailgun/Tests/Connection/ConnectionTest.php

@@ -3,13 +3,17 @@ namespace Mailgun\Tests\Connection;
 
 use Mailgun\Tests\Mock\Mailgun;
 
-class ConnectionTest extends \Mailgun\Tests\MailgunTestCase{
+class ConnectionTest extends \Mailgun\Tests\MailgunTestCase
+{
 
     private $client;
 
-	public function setUp(){ 
+    public function setUp()
+    {
     }
-	public function testNewClientInstantiation(){	
+
+    public function testNewClientInstantiation()
+    {
         $this->client = new Mailgun("My-Super-Awesome-API-Key", "samples.mailgun.org", false);
     }
 }

tests/Mailgun/Tests/Lists/OptInHandlerTest.php

@@ -3,31 +3,48 @@ namespace Mailgun\Tests\Lists;
 
 use Mailgun\Tests\Mock\Mailgun;
 
-class OptInHandler extends \Mailgun\Tests\MailgunTestCase{
+class OptInHandler extends \Mailgun\Tests\MailgunTestCase
+{
 
     private $client;
     private $sampleDomain = "samples.mailgun.org";
     private $optInHandler;
 
-	public function setUp(){ 
+    public function setUp()
+    {
         $this->client = new Mailgun("My-Super-Awesome-API-Key");
         $this->optInHandler = $this->client->OptInHandler();
     }
 
-	public function testReturnOfGenerateHash(){
+    public function testReturnOfGenerateHash()
-		$generatedHash = $this->optInHandler->generateHash('mytestlist@example.com', 'mysupersecretappid', 'testrecipient@example.com');
+    {
+        $generatedHash = $this->optInHandler->generateHash(
+            'mytestlist@example.com',
+            'mysupersecretappid',
+            'testrecipient@example.com'
+        );
         $knownHash     = "eyJoIjoiMTllODc2YWNkMWRmNzk4NTc0ZTU0YzhjMzIzOTNiYTNjNzdhNGMxOCIsInAiOiJleUp5SWpvaWRHVnpkSEpsWTJsd2FXVnVkRUJsZUdGdGNHeGxMbU52YlNJc0ltd2lPaUp0ZVhSbGMzUnNhWE4wUUdWNFlXMXdiR1V1WTI5dEluMD0ifQ%3D%3D";
         $this->assertEquals($generatedHash, $knownHash);
     }
 
-	public function testGoodHash(){
+    public function testGoodHash()
-		$validation = $this->optInHandler->validateHash('mysupersecretappid', 'eyJoIjoiMTllODc2YWNkMWRmNzk4NTc0ZTU0YzhjMzIzOTNiYTNjNzdhNGMxOCIsInAiOiJleUp5SWpvaWRHVnpkSEpsWTJsd2FXVnVkRUJsZUdGdGNHeGxMbU52YlNJc0ltd2lPaUp0ZVhSbGMzUnNhWE4wUUdWNFlXMXdiR1V1WTI5dEluMD0ifQ%3D%3D');
+    {
+        $validation = $this->optInHandler->validateHash(
+            'mysupersecretappid',
+            'eyJoIjoiMTllODc2YWNkMWRmNzk4NTc0ZTU0YzhjMzIzOTNiYTNjNzdhNGMxOCIsInAiOiJleUp5SWpvaWRHVnpkSEpsWTJsd2FXVnVkRUJsZUdGdGNHeGxMbU52YlNJc0ltd2lPaUp0ZVhSbGMzUnNhWE4wUUdWNFlXMXdiR1V1WTI5dEluMD0ifQ%3D%3D'
+        );
         $this->assertArrayHasKey('recipientAddress', $validation);
         $this->assertArrayHasKey('mailingList', $validation);
     }
-	public function testBadHash(){
+
-		$validation = $this->optInHandler->validateHash('mybadsecretappid', 'eyJoIjoiMTllODc2YWNkMWRmNzk4NTc0ZTU0YzhjMzIzOTNiYTNjNzdhNGMxOCIsInAiOiJleUp5SWpvaWRHVnpkSEpsWTJsd2FXVnVkRUJsZUdGdGNHeGxMbU52YlNJc0ltd2lPaUp0ZVhSbGMzUnNhWE4wUUdWNFlXMXdiR1V1WTI5dEluMD0ifQ%3D%3D');
+    public function testBadHash()
+    {
+        $validation = $this->optInHandler->validateHash(
+            'mybadsecretappid',
+            'eyJoIjoiMTllODc2YWNkMWRmNzk4NTc0ZTU0YzhjMzIzOTNiYTNjNzdhNGMxOCIsInAiOiJleUp5SWpvaWRHVnpkSEpsWTJsd2FXVnVkRUJsZUdGdGNHeGxMbU52YlNJc0ltd2lPaUp0ZVhSbGMzUnNhWE4wUUdWNFlXMXdiR1V1WTI5dEluMD0ifQ%3D%3D'
+        );
         $this->assertFalse($validation);
     }
 }
+
 ?>

tests/Mailgun/Tests/MailgunTest.php

@@ -3,7 +3,8 @@ namespace Mailgun\Tests\Lists;
 
 use Mailgun\Mailgun;
 
-class MailgunTest extends \Mailgun\Tests\MailgunTestCase{
+class MailgunTest extends \Mailgun\Tests\MailgunTestCase
+{
 
     public function testSendMessageMissingRequiredMIMEParametersExceptionGetsFlung()
     {

tests/Mailgun/Tests/MailgunTestCase.php

@@ -4,6 +4,8 @@ namespace Mailgun\Tests;
 
 use Guzzle\Tests\GuzzleTestCase;
 
-abstract class MailgunTestCase extends GuzzleTestCase{}
+abstract class MailgunTestCase extends GuzzleTestCase
+{
+}
 
 ?>

tests/Mailgun/Tests/Messages/BatchMessageTest.php

@@ -3,19 +3,25 @@ namespace Mailgun\Tests\Messages;
 
 use Mailgun\Tests\Mock\Mailgun;
 
-class BatchMessageTest extends \Mailgun\Tests\MailgunTestCase{
+class BatchMessageTest extends \Mailgun\Tests\MailgunTestCase
+{
 
     private $client;
     private $sampleDomain = "samples.mailgun.org";
 
-	public function setUp(){ 
+    public function setUp()
+    {
         $this->client = new Mailgun("My-Super-Awesome-API-Key");
     }
-	public function testBlankInstantiation(){
+
+    public function testBlankInstantiation()
+    {
         $message = $this->client->BatchMessage($this->sampleDomain);
         $this->assertTrue(is_array($message->getMessage()));
     }
-	public function testAddRecipient(){
+
+    public function testAddRecipient()
+    {
         $message = $this->client->BatchMessage($this->sampleDomain);
         $message->addToRecipient("test@samples.mailgun.org", array("first" => "Test", "last" => "User"));
         $messageObj = $message->getMessage();
@@ -27,7 +33,9 @@ class BatchMessageTest extends \Mailgun\Tests\MailgunTestCase{
         $array = $property->getValue($message);
         $this->assertEquals(1, $array['recipients']['to']);
     }
-	public function testRecipientVariablesOnTo(){
+
+    public function testRecipientVariablesOnTo()
+    {
         $message = $this->client->BatchMessage($this->sampleDomain);
         $message->addToRecipient("test@samples.mailgun.org", array("first" => "Test", "last" => "User"));
         $messageObj = $message->getMessage();
@@ -40,7 +48,9 @@ class BatchMessageTest extends \Mailgun\Tests\MailgunTestCase{
         $this->assertEquals("Test", $propertyValue['test@samples.mailgun.org']['first']);
         $this->assertEquals("User", $propertyValue['test@samples.mailgun.org']['last']);
     }
-	public function testRecipientVariablesOnCc(){
+
+    public function testRecipientVariablesOnCc()
+    {
         $message = $this->client->BatchMessage($this->sampleDomain);
         $message->addCcRecipient("test@samples.mailgun.org", array("first" => "Test", "last" => "User"));
         $messageObj = $message->getMessage();
@@ -53,7 +63,9 @@ class BatchMessageTest extends \Mailgun\Tests\MailgunTestCase{
         $this->assertEquals("Test", $propertyValue['test@samples.mailgun.org']['first']);
         $this->assertEquals("User", $propertyValue['test@samples.mailgun.org']['last']);
     }
-	public function testRecipientVariablesOnBcc(){
+
+    public function testRecipientVariablesOnBcc()
+    {
         $message = $this->client->BatchMessage($this->sampleDomain);
         $message->addBccRecipient("test@samples.mailgun.org", array("first" => "Test", "last" => "User"));
         $messageObj = $message->getMessage();
@@ -66,7 +78,9 @@ class BatchMessageTest extends \Mailgun\Tests\MailgunTestCase{
         $this->assertEquals("Test", $propertyValue['test@samples.mailgun.org']['first']);
         $this->assertEquals("User", $propertyValue['test@samples.mailgun.org']['last']);
     }
-	public function testAddMultipleBatchRecipients(){
+
+    public function testAddMultipleBatchRecipients()
+    {
         $message = $this->client->BatchMessage($this->sampleDomain);
         for ($i = 0; $i < 100; $i++) {
             $message->addToRecipient("$i@samples.mailgun.org", array("first" => "Test", "last" => "User $i"));
@@ -74,7 +88,9 @@ class BatchMessageTest extends \Mailgun\Tests\MailgunTestCase{
         $messageObj = $message->getMessage();
         $this->assertEquals(100, count($messageObj["to"]));
     }
-	public function testMaximumBatchSize(){
+
+    public function testMaximumBatchSize()
+    {
         $message = $this->client->BatchMessage($this->sampleDomain);
         $message->setFromAddress("samples@mailgun.org", array("first" => "Test", "last" => "User"));
         $message->setSubject("This is the subject of the message!");
@@ -85,7 +101,9 @@ class BatchMessageTest extends \Mailgun\Tests\MailgunTestCase{
         $messageObj = $message->getMessage();
         $this->assertEquals(1, count($messageObj["to"]));
     }
-	public function testAttributeResetOnEndBatchMessage(){
+
+    public function testAttributeResetOnEndBatchMessage()
+    {
         $message = $this->client->BatchMessage($this->sampleDomain);
         $message->addToRecipient("test-user@samples.mailgun.org", array("first" => "Test", "last" => "User"));
         $message->setFromAddress("samples@mailgun.org", array("first" => "Test", "last" => "User"));
@@ -95,17 +113,21 @@ class BatchMessageTest extends \Mailgun\Tests\MailgunTestCase{
         $messageObj = $message->getMessage();
         $this->assertTrue(true, empty($messageObj));
     }
-    public function testDefaultIDInVariables() {
+
+    public function testDefaultIDInVariables()
+    {
         $message = $this->client->BatchMessage($this->sampleDomain);
         $message->addToRecipient("test-user@samples.mailgun.org", array("first" => "Test", "last" => "User"));
 
         $reflectionClass = new \ReflectionClass(get_class($message));
         $property        = $reflectionClass->getProperty('batchRecipientAttributes');
-        $property->setAccessible(True);
+        $property->setAccessible(true);
         $propertyValue = $property->getValue($message);
         $this->assertEquals(1, $propertyValue['test-user@samples.mailgun.org']['id']);
     }
-    public function testgetMessageIds() {
+
+    public function testgetMessageIds()
+    {
         $message = $this->client->BatchMessage($this->sampleDomain);
         $message->addToRecipient("test-user@samples.mailgun.org", array("first" => "Test", "last" => "User"));
         $message->setFromAddress("samples@mailgun.org", array("first" => "Test", "last" => "User"));
@@ -123,6 +145,7 @@ class BatchMessageTest extends \Mailgun\Tests\MailgunTestCase{
         $message = $this->client->BatchMessage($this->sampleDomain);
         $message->sendMessage(array(1, 2, 3));
     }
+
     public function testInvalidMissingRequiredMIMEParametersExceptionGetsFlungNoTo()
     {
         $this->setExpectedException("\\Mailgun\\Messages\\Exceptions\\MissingRequiredMIMEParameters");
@@ -130,6 +153,7 @@ class BatchMessageTest extends \Mailgun\Tests\MailgunTestCase{
         $message = $this->client->BatchMessage($this->sampleDomain);
         $message->sendMessage(array("from" => 1, 2, 3));
     }
+
     public function testInvalidMissingRequiredMIMEParametersExceptionGetsFlungNoSubject()
     {
         $this->setExpectedException("\\Mailgun\\Messages\\Exceptions\\MissingRequiredMIMEParameters");
@@ -137,6 +161,7 @@ class BatchMessageTest extends \Mailgun\Tests\MailgunTestCase{
         $message = $this->client->BatchMessage($this->sampleDomain);
         $message->sendMessage(array("from" => 1, "to" => 2, 3));
     }
+
     public function testInvalidMissingRequiredMIMEParametersExceptionGetsFlungNoTextOrHtml()
     {
         $this->setExpectedException("\\Mailgun\\Messages\\Exceptions\\MissingRequiredMIMEParameters");
@@ -145,6 +170,7 @@ class BatchMessageTest extends \Mailgun\Tests\MailgunTestCase{
         $message->sendMessage(array("from" => 1, "to" => 2, "subject" => 3));
     }
 }
+
 ?>
 
 

tests/Mailgun/Tests/Messages/MessageBuilderTest.php

@@ -3,22 +3,28 @@ namespace Mailgun\Tests\Messages;
 
 use Mailgun\Tests\Mock\Mailgun;
 
-class MessageBuilderTest extends \Mailgun\Tests\MailgunTestCase{
+class MessageBuilderTest extends \Mailgun\Tests\MailgunTestCase
+{
     private $client;
 
-	public function setUp(){ 
+    public function setUp()
+    {
         $this->client = new Mailgun("My-Super-Awesome-API-Key", "samples.mailgun.org", false);
     }
-	public function testBlankInstantiation(){
+
+    public function testBlankInstantiation()
+    {
         $message = $this->client->MessageBuilder();
         $this->assertTrue(is_array($message->getMessage()));
     }
-	public function testCountersSetToZero(){
+
+    public function testCountersSetToZero()
+    {
         $message = $this->client->MessageBuilder();
 
         $reflectionClass = new \ReflectionClass(get_class($message));
         $property        = $reflectionClass->getProperty('counters');
-        $property->setAccessible(True);
+        $property->setAccessible(true);
         $propertyValue = $property->getValue($message);
         $this->assertEquals(0, $propertyValue['recipients']['to']);
         $this->assertEquals(0, $propertyValue['recipients']['cc']);
@@ -28,25 +34,33 @@ class MessageBuilderTest extends \Mailgun\Tests\MailgunTestCase{
         $this->assertEquals(0, $propertyValue['attributes']['custom_option']);
         $this->assertEquals(0, $propertyValue['attributes']['tag']);
     }
-	public function testAddToRecipient(){
+
+    public function testAddToRecipient()
+    {
         $message = $this->client->MessageBuilder();
         $message->addToRecipient("test@samples.mailgun.org", array("first" => "Test", "last" => "User"));
         $messageObj = $message->getMessage();
         $this->assertEquals(array("to" => array("'Test User' <test@samples.mailgun.org>")), $messageObj);
     }
-	public function testAddCcRecipient(){
+
+    public function testAddCcRecipient()
+    {
         $message = $this->client->MessageBuilder();
         $message->addCcRecipient("test@samples.mailgun.org", array("first" => "Test", "last" => "User"));
         $messageObj = $message->getMessage();
         $this->assertEquals(array("cc" => array("'Test User' <test@samples.mailgun.org>")), $messageObj);
     }
-	public function testAddBccRecipient(){
+
+    public function testAddBccRecipient()
+    {
         $message = $this->client->MessageBuilder();
         $message->addBccRecipient("test@samples.mailgun.org", array("first" => "Test", "last" => "User"));
         $messageObj = $message->getMessage();
         $this->assertEquals(array("bcc" => array("'Test User' <test@samples.mailgun.org>")), $messageObj);
     }
-    public function testToRecipientCount() {
+
+    public function testToRecipientCount()
+    {
         $message = $this->client->MessageBuilder();
         $message->addToRecipient("test-user@samples.mailgun.org", array("first" => "Test", "last" => "User"));
 
@@ -56,7 +70,9 @@ class MessageBuilderTest extends \Mailgun\Tests\MailgunTestCase{
         $array = $property->getValue($message);
         $this->assertEquals(1, $array['recipients']['to']);
     }
-    public function testCcRecipientCount() {
+
+    public function testCcRecipientCount()
+    {
         $message = $this->client->MessageBuilder();
         $message->addCcRecipient("test-user@samples.mailgun.org", array("first" => "Test", "last" => "User"));
 
@@ -66,7 +82,9 @@ class MessageBuilderTest extends \Mailgun\Tests\MailgunTestCase{
         $array = $property->getValue($message);
         $this->assertEquals(1, $array['recipients']['cc']);
     }
-    public function testBccRecipientCount() {
+
+    public function testBccRecipientCount()
+    {
         $message = $this->client->MessageBuilder();
         $message->addBccRecipient("test-user@samples.mailgun.org", array("first" => "Test", "last" => "User"));
 
@@ -76,83 +94,141 @@ class MessageBuilderTest extends \Mailgun\Tests\MailgunTestCase{
         $array = $property->getValue($message);
         $this->assertEquals(1, $array['recipients']['bcc']);
     }
-	public function testSetFromAddress(){
+
+    public function testSetFromAddress()
+    {
         $message = $this->client->MessageBuilder();
         $message->setFromAddress("test@samples.mailgun.org", array("first" => "Test", "last" => "User"));
         $messageObj = $message->getMessage();
         $this->assertEquals(array("from" => array("'Test User' <test@samples.mailgun.org>")), $messageObj);
     }
-	public function testSetReplyTo(){
+
+    public function testSetReplyTo()
+    {
         $message = $this->client->MessageBuilder();
         $message->setReplyToAddress("test@samples.mailgun.org", array("first" => "Test", "last" => "User"));
         $messageObj = $message->getMessage();
         $this->assertEquals(array("h:reply-to" => "'Test User' <test@samples.mailgun.org>"), $messageObj);
     }
-	public function testSetSubject(){
+
+    public function testSetSubject()
+    {
         $message = $this->client->MessageBuilder();
         $message->setSubject("Test Subject");
         $messageObj = $message->getMessage();
         $this->assertEquals(array("subject" => "Test Subject"), $messageObj);
     }
-	public function testAddCustomHeader(){
+
+    public function testAddCustomHeader()
+    {
         $message = $this->client->MessageBuilder();
         $message->addCustomHeader("My-Header", "123");
         $messageObj = $message->getMessage();
         $this->assertEquals(array("h:My-Header" => array("123")), $messageObj);
     }
-	public function testSetTextBody(){
+
+    public function testSetTextBody()
+    {
         $message = $this->client->MessageBuilder();
         $message->setTextBody("This is the text body!");
         $messageObj = $message->getMessage();
         $this->assertEquals(array("text" => "This is the text body!"), $messageObj);
     }
-	public function testSetHtmlBody(){
+
+    public function testSetHtmlBody()
+    {
         $message = $this->client->MessageBuilder();
         $message->setHtmlBody("<html><body>This is an awesome email</body></html>");
         $messageObj = $message->getMessage();
         $this->assertEquals(array("html" => "<html><body>This is an awesome email</body></html>"), $messageObj);
     }
-	public function testAddAttachments(){
+
+    public function testAddAttachments()
+    {
         $message = $this->client->MessageBuilder();
         $message->addAttachment("@../TestAssets/mailgun_icon.png");
         $message->addAttachment("@../TestAssets/rackspace_logo.png");
         $messageObj = $message->getFiles();
-		$this->assertEquals(array(array('filePath' => "@../TestAssets/mailgun_icon.png",
+        $this->assertEquals(
-								  'remoteName' => null), 
+            array(
-							array('filePath' => "@../TestAssets/rackspace_logo.png",
+                array(
-								  'remoteName' => null)), $messageObj["attachment"]);
+                    'filePath'   => "@../TestAssets/mailgun_icon.png",
+                    'remoteName' => null
+                ),
+                array(
+                    'filePath'   => "@../TestAssets/rackspace_logo.png",
+                    'remoteName' => null
+                )
+            ),
+            $messageObj["attachment"]
+        );
     }
-	public function testAddInlineImages(){
+
+    public function testAddInlineImages()
+    {
         $message = $this->client->MessageBuilder();
         $message->addInlineImage("@../TestAssets/mailgun_icon.png");
         $message->addInlineImage("@../TestAssets/rackspace_logo.png");
         $messageObj = $message->getFiles();
-		$this->assertEquals(array(array('filePath' => "@../TestAssets/mailgun_icon.png",
+        $this->assertEquals(
-										'remoteName' => null), 
+            array(
-							array('filePath' => "@../TestAssets/rackspace_logo.png",
+                array(
-								  'remoteName' => null)), $messageObj['inline']);
+                    'filePath'   => "@../TestAssets/mailgun_icon.png",
+                    'remoteName' => null
+                ),
+                array(
+                    'filePath'   => "@../TestAssets/rackspace_logo.png",
+                    'remoteName' => null
+                )
+            ),
+            $messageObj['inline']
+        );
     }
-	public function testAddAttachmentsPostName(){
+
+    public function testAddAttachmentsPostName()
+    {
         $message = $this->client->MessageBuilder();
         $message->addAttachment('@../TestAssets/mailgun_icon.png', 'mg_icon.png');
         $message->addAttachment('@../TestAssets/rackspace_logo.png', 'rs_logo.png');
         $messageObj = $message->getFiles();
-		$this->assertEquals(array(array('filePath' => '@../TestAssets/mailgun_icon.png',
+        $this->assertEquals(
-								  'remoteName' => 'mg_icon.png'), 
+            array(
-							array('filePath' => '@../TestAssets/rackspace_logo.png',
+                array(
-								  'remoteName' => 'rs_logo.png')), $messageObj["attachment"]);
+                    'filePath'   => '@../TestAssets/mailgun_icon.png',
+                    'remoteName' => 'mg_icon.png'
+                ),
+                array(
+                    'filePath'   => '@../TestAssets/rackspace_logo.png',
+                    'remoteName' => 'rs_logo.png'
+                )
+            ),
+            $messageObj["attachment"]
+        );
     }
-	public function testAddInlineImagePostName(){
+
+    public function testAddInlineImagePostName()
+    {
         $message = $this->client->MessageBuilder();
         $message->addInlineImage('@../TestAssets/mailgun_icon.png', 'mg_icon.png');
         $message->addInlineImage('@../TestAssets/rackspace_logo.png', 'rs_logo.png');
         $messageObj = $message->getFiles();
-		$this->assertEquals(array(array('filePath' => '@../TestAssets/mailgun_icon.png',
+        $this->assertEquals(
-										'remoteName' => 'mg_icon.png'), 
+            array(
-							array('filePath' => '@../TestAssets/rackspace_logo.png',
+                array(
-								  'remoteName' => 'rs_logo.png')), $messageObj['inline']);
+                    'filePath'   => '@../TestAssets/mailgun_icon.png',
+                    'remoteName' => 'mg_icon.png'
+                ),
+                array(
+                    'filePath'   => '@../TestAssets/rackspace_logo.png',
+                    'remoteName' => 'rs_logo.png'
+                )
+            ),
+            $messageObj['inline']
+        );
     }
-	public function testsetTestMode(){
+
+    public function testsetTestMode()
+    {
         $message = $this->client->MessageBuilder();
         $message->setTestMode(true);
         $messageObj = $message->getMessage();
@@ -167,7 +243,9 @@ class MessageBuilderTest extends \Mailgun\Tests\MailgunTestCase{
         $messageObj = $message->getMessage();
         $this->assertEquals(array("o:testmode" => "no"), $messageObj);
     }
-	public function addCampaignId(){
+
+    public function addCampaignId()
+    {
         $message = $this->client->MessageBuilder();
         $message->addCampaignId("ABC123");
         $message->addCampaignId("XYZ987");
@@ -176,7 +254,9 @@ class MessageBuilderTest extends \Mailgun\Tests\MailgunTestCase{
         $messageObj = $message->getMessage();
         $this->assertEquals(array("o:campaign" => array("ABC123", "XYZ987", "TUV456")), $messageObj);
     }
-	public function testSetDkim(){
+
+    public function testSetDkim()
+    {
         $message = $this->client->MessageBuilder();
         $message->setDkim(true);
         $messageObj = $message->getMessage();
@@ -191,7 +271,9 @@ class MessageBuilderTest extends \Mailgun\Tests\MailgunTestCase{
         $messageObj = $message->getMessage();
         $this->assertEquals(array("o:dkim" => "no"), $messageObj);
     }
-	public function testSetClickTracking(){
+
+    public function testSetClickTracking()
+    {
         $message = $this->client->MessageBuilder();
         $message->setClickTracking(true);
         $messageObj = $message->getMessage();
@@ -206,7 +288,9 @@ class MessageBuilderTest extends \Mailgun\Tests\MailgunTestCase{
         $messageObj = $message->getMessage();
         $this->assertEquals(array("o:tracking-clicks" => "no"), $messageObj);
     }
-	public function testSetOpenTracking(){
+
+    public function testSetOpenTracking()
+    {
         $message = $this->client->MessageBuilder();
         $message->setOpenTracking(true);
         $messageObj = $message->getMessage();
@@ -221,7 +305,9 @@ class MessageBuilderTest extends \Mailgun\Tests\MailgunTestCase{
         $messageObj = $message->getMessage();
         $this->assertEquals(array("o:tracking-opens" => "no"), $messageObj);
     }
-	public function testSetDeliveryTime(){
+
+    public function testSetDeliveryTime()
+    {
         $message = $this->client->MessageBuilder();
         $message->setDeliveryTime("January 15, 2014 8:00AM", "CST");
         $messageObj = $message->getMessage();
@@ -241,19 +327,32 @@ class MessageBuilderTest extends \Mailgun\Tests\MailgunTestCase{
         //$messageObj = $message->getMessage();
         //$this->assertEquals(array("o:deliverytime" => "Sat, 06 Jul 2013 08:00:00 -0500"), $messageObj);
     }
-	public function testAddCustomData(){
+
+    public function testAddCustomData()
+    {
         $message = $this->client->MessageBuilder();
         $message->addCustomData("My-Super-Awesome-Data", array("What" => "Mailgun Rocks!"));
         $messageObj = $message->getMessage();
         $this->assertEquals(array("v:My-Super-Awesome-Data" => "{\"What\":\"Mailgun Rocks!\"}"), $messageObj);
     }
-	public function testAddCustomParameter(){
+
+    public function testAddCustomParameter()
+    {
         $message = $this->client->MessageBuilder();
         $message->addCustomParameter("my-option", "yes");
         $message->addCustomParameter("o:my-other-option", "no");
         $messageObj = $message->getMessage();
         $this->assertEquals(array("my-option" => array("yes"), "o:my-other-option" => array("no")), $messageObj);
     }
+
+    public function testSetMessage()
+    {
+        $message        = array(1, 2, 3, 4, 5);
+        $messageBuilder = $this->client->MessageBuilder();
+        $messageBuilder->setMessage($message);
+
+        $this->assertEquals($message, $messageBuilder->getMessage());
+    }
 }
 
 ?>

tests/Mailgun/Tests/Messages/StandardMessageTest.php

@@ -3,15 +3,19 @@ namespace Mailgun\Tests\Messages;
 
 use Mailgun\Tests\Mock\Mailgun;
 
-class StandardMessageTest extends \Mailgun\Tests\MailgunTestCase{
+class StandardMessageTest extends \Mailgun\Tests\MailgunTestCase
+{
 
     private $client;
     private $sampleDomain = "samples.mailgun.org";
 
-	public function setUp(){ 
+    public function setUp()
+    {
         $this->client = new Mailgun("My-Super-Awesome-API-Key");
     }
-	public function testSendMIMEMessage(){
+
+    public function testSendMIMEMessage()
+    {
         $customMime     = "Received: by luna.mailgun.net with SMTP mgrt 8728174999085; Mon, 10 Jun 2013 09:50:58 +0000
 					Mime-Version: 1.0
 					Content-Type: text/plain; charset=\"ascii\"
@@ -30,11 +34,17 @@ class StandardMessageTest extends \Mailgun\Tests\MailgunTestCase{
         $this->assertEquals("test.mailgun.org/messages.mime", $result->http_endpoint_url);
     }
 
-	public function testSendMessage(){
+    public function testSendMessage()
-		$message = array('to' => 'test@test.mailgun.org', 'from' => 'sender@test.mailgun.org', 'subject' => 'This is my test subject', 'text' => 'Testing!');
+    {
+        $message = array('to'      => 'test@test.mailgun.org',
+                         'from'    => 'sender@test.mailgun.org',
+                         'subject' => 'This is my test subject',
+                         'text'    => 'Testing!'
+        );
         $result  = $this->client->sendMessage("test.mailgun.org", $message);
         $this->assertEquals("test.mailgun.org/messages", $result->http_endpoint_url);
 
     }
 }
+
 ?>

tests/Mailgun/Tests/Mock/Connection/TestBroker.php

@@ -3,30 +3,40 @@ namespace Mailgun\Tests\Mock\Connection;
 
 use Mailgun\Connection\RestClient;
 
-class TestBroker extends RestClient {
+class TestBroker extends RestClient
+{
     private $apiKey;
 
     protected $apiEndpoint;
 
-	public function __construct($apiKey = null, $apiEndpoint = "api.mailgun.net", $apiVersion = "v2"){
+    public function __construct($apiKey = null, $apiEndpoint = "api.mailgun.net", $apiVersion = "v2")
+    {
         $this->apiKey      = $apiKey;
         $this->apiEndpoint = $apiEndpoint;
     }
 
-	public function post($endpointUrl, $postData = array(), $files = array()){
+    public function post($endpointUrl, $postData = array(), $files = array())
-		return $this->responseHandler($endpointUrl, $httpResponseCode = 200);
+    {
-	}
-	public function get($endpointUrl, $queryString = array()){
-		return $this->responseHandler($endpointUrl, $httpResponseCode = 200);
-	}
-	public function delete($endpointUrl){
-		return $this->responseHandler($endpointUrl, $httpResponseCode = 200);
-	}
-	public function put($endpointUrl, $queryString){
         return $this->responseHandler($endpointUrl, $httpResponseCode = 200);
     }
 
-	public function responseHandler($endpointUrl, $httpResponseCode = 200){
+    public function get($endpointUrl, $queryString = array())
+    {
+        return $this->responseHandler($endpointUrl, $httpResponseCode = 200);
+    }
+
+    public function delete($endpointUrl)
+    {
+        return $this->responseHandler($endpointUrl, $httpResponseCode = 200);
+    }
+
+    public function put($endpointUrl, $queryString)
+    {
+        return $this->responseHandler($endpointUrl, $httpResponseCode = 200);
+    }
+
+    public function responseHandler($endpointUrl, $httpResponseCode = 200)
+    {
         if ($httpResponseCode === 200) {
             $result                     = new \stdClass();
             $result->http_response_body = new \stdClass();
@@ -34,25 +44,22 @@ class TestBroker extends RestClient {
             foreach ($jsonResponseData as $key => $value) {
                 $result->http_response_body->$key = $value;
             }
-		}
+        } elseif ($httpStatusCode == 400) {
-		elseif($httpStatusCode == 400){
             throw new MissingRequiredMIMEParameters(EXCEPTION_MISSING_REQUIRED_MIME_PARAMETERS);
-		}
+        } elseif ($httpStatusCode == 401) {
-		elseif($httpStatusCode == 401){
             throw new InvalidCredentials(EXCEPTION_INVALID_CREDENTIALS);
-		}
+        } elseif ($httpStatusCode == 401) {
-		elseif($httpStatusCode == 401){
             throw new GenericHTTPError(EXCEPTION_INVALID_CREDENTIALS);
-		}
+        } elseif ($httpStatusCode == 404) {
-		elseif($httpStatusCode == 404){
             throw new MissingEndpoint(EXCEPTION_MISSING_ENDPOINT);
-		}
+        } else {
-		else{
             throw new GenericHTTPError(EXCEPTION_GENERIC_HTTP_ERROR);
+
             return false;
         }
         $result->http_response_code = $httpResponseCode;
         $result->http_endpoint_url  = $endpointUrl;
+
         return $result;
     }
 

tests/Mailgun/Tests/Mock/Mailgun.php

@@ -10,7 +10,8 @@ class Mailgun extends Base
     protected $debug;
     protected $restClient;
 
-	public function __construct($apiKey = null, $apiEndpoint = "api.mailgun.net", $apiVersion = "v2"){
+    public function __construct($apiKey = null, $apiEndpoint = "api.mailgun.net", $apiVersion = "v2")
+    {
         $this->restClient = new TestBroker($apiKey, $apiEndpoint, $apiVersion);
     }
 }