Merge branch 'master' of github.com:yoye/mailgun-php

This commit is contained in:
yoye 2013-09-05 15:19:07 +02:00
commit 947267e935
3 changed files with 11 additions and 2 deletions

1
.gitignore vendored
View File

@ -6,3 +6,4 @@ rackspace_logo.jpg
mailgun_icon.png mailgun_icon.png
build build
composer.lock composer.lock
nbproject/*

View File

@ -38,7 +38,6 @@ class BatchMessage extends MessageBuilder{
$this->addRecipient("to", $address, $variables); $this->addRecipient("to", $address, $variables);
$attributes["id"] = $this->toRecipientCount; $attributes["id"] = $this->toRecipientCount;
$this->batchRecipientAttributes["$address"] = $variables; $this->batchRecipientAttributes["$address"] = $variables;
$this->toRecipientCount++;
} }
public function sendMessage($message = array(), $files = array()){ public function sendMessage($message = array(), $files = array()){
@ -59,7 +58,7 @@ class BatchMessage extends MessageBuilder{
throw new MissingRequiredMIMEParameters(EXCEPTION_MISSING_REQUIRED_MIME_PARAMETERS); throw new MissingRequiredMIMEParameters(EXCEPTION_MISSING_REQUIRED_MIME_PARAMETERS);
} }
else{ else{
$this->message["recipient-variables"] = json_encode($this->batchRecipientAttributes); $message["recipient-variables"] = json_encode($this->batchRecipientAttributes);
$response = $this->restClient->post($this->endpointUrl, $message, $files); $response = $this->restClient->post($this->endpointUrl, $message, $files);
$this->batchRecipientAttributes = array(); $this->batchRecipientAttributes = array();
$this->toRecipientCount = 0; $this->toRecipientCount = 0;

View File

@ -50,6 +50,15 @@ class BatchMessageTest extends \Mailgun\Tests\MailgunTestCase{
$messageObj= $message->getMessage(); $messageObj= $message->getMessage();
$this->assertTrue(true, empty($messageObj)); $this->assertTrue(true, empty($messageObj));
} }
public function testToRecipientCount() {
$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('toRecipientCount');
$property->setAccessible(true);
$this->assertEquals(1, $property->getValue($message));
}
} }
?> ?>