From 6a2d33a3a60cc84dff48a3b99d5fa75eb11185c8 Mon Sep 17 00:00:00 2001 From: Cristiano Oliveira Date: Tue, 22 Sep 2015 10:09:53 +0100 Subject: [PATCH 1/2] Added attachment to sendHtmlEmail method --- Service/SendGridTemplatingMailerService.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Service/SendGridTemplatingMailerService.php b/Service/SendGridTemplatingMailerService.php index 4d8f4d5..08d16a7 100644 --- a/Service/SendGridTemplatingMailerService.php +++ b/Service/SendGridTemplatingMailerService.php @@ -100,10 +100,10 @@ public function setThrowExceptionsOnFail($throwExceptionsOnFail) $this->throwExceptionsOnFail = ($throwExceptionsOnFail === true); } - public function sendHtmlEmail(array $from, array $to, $subject, $bodyHtml, array $additionalHeaders = array()) + public function sendHtmlEmail(array $from, array $to, $subject, $bodyHtml, array $additionalHeaders = array(), $attachments = null) { // - $email = static::buildBaseEmail($from, $to, $subject, $additionalHeaders); + $email = static::buildBaseEmail($from, $to, $subject, $additionalHeaders, $attachments); // If the given body is a TemplatedEmailBody object, populate and reassign the string value to itself if ($bodyHtml instanceof TemplatedEmailBody) { @@ -139,7 +139,7 @@ protected function processResponse(StdClass $response, $throwExceptionOnFail = t return $result; } - protected static function buildBaseEmail(array $from, array $to, $subject, array $additionalHeaders = array()) + protected static function buildBaseEmail(array $from, array $to, $subject, array $additionalHeaders = array(), $attachments = null) { $email = new Email(); @@ -168,6 +168,10 @@ protected static function buildBaseEmail(array $from, array $to, $subject, array if (isset($additionalHeaders["reply-to"])) { $email->setReplyTo($additionalHeaders["reply-to"]); } + + if (isset($attachments)) { + $email->setAttachments($attachments); + } return $email; } From c398a483c8bf5303895e48cf34e3e8f4dbc51689 Mon Sep 17 00:00:00 2001 From: Cristiano Oliveira Date: Tue, 22 Sep 2015 10:34:25 +0100 Subject: [PATCH 2/2] Type hint for attachments array --- Service/SendGridTemplatingMailerService.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Service/SendGridTemplatingMailerService.php b/Service/SendGridTemplatingMailerService.php index 08d16a7..f0e7f8c 100644 --- a/Service/SendGridTemplatingMailerService.php +++ b/Service/SendGridTemplatingMailerService.php @@ -100,7 +100,7 @@ public function setThrowExceptionsOnFail($throwExceptionsOnFail) $this->throwExceptionsOnFail = ($throwExceptionsOnFail === true); } - public function sendHtmlEmail(array $from, array $to, $subject, $bodyHtml, array $additionalHeaders = array(), $attachments = null) + public function sendHtmlEmail(array $from, array $to, $subject, $bodyHtml, array $additionalHeaders = array(), array $attachments = null) { // $email = static::buildBaseEmail($from, $to, $subject, $additionalHeaders, $attachments); @@ -139,7 +139,7 @@ protected function processResponse(StdClass $response, $throwExceptionOnFail = t return $result; } - protected static function buildBaseEmail(array $from, array $to, $subject, array $additionalHeaders = array(), $attachments = null) + protected static function buildBaseEmail(array $from, array $to, $subject, array $additionalHeaders = array(), array $attachments = null) { $email = new Email();