Cavemanon/piratepoet
8
Fork 0
Code Pull Requests Actions Releases 16 Activity

Allow reply-to with only address

Browse Source 
[MAILPOET-3812]
This commit is contained in:
Brezo Cordero
2021-09-29 12:36:03 -05:00
committed by Veljko V
parent da5e590428
commit 7f7903e55c
2 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Mailer/Methods/MailPoet.php
View File

@@ -118,7 +118,7 @@ class MailPoet {
return $body; return $body;
} }
private function composeBody($newsletter, $subscriber, $unsubscribeUrl, $meta) { private function composeBody($newsletter, $subscriber, $unsubscribeUrl, $meta): array {
$body = [ $body = [
'to' => ([ 'to' => ([
'address' => $subscriber['email'], 'address' => $subscriber['email'],
@@ -130,10 +130,12 @@ class MailPoet {
]), ]),
'reply_to' => ([ 'reply_to' => ([
'address' => $this->replyTo['reply_to_email'], 'address' => $this->replyTo['reply_to_email'],
'name' => $this->replyTo['reply_to_name'],
]), ]),
'subject' => $newsletter['subject'], 'subject' => $newsletter['subject'],
]; ];
if (!empty($this->replyTo['reply_to_name'])) {
$body['reply_to']['name'] = $this->replyTo['reply_to_name'];
}
if (!empty($newsletter['body']['html'])) { if (!empty($newsletter['body']['html'])) {
$body['html'] = $newsletter['body']['html']; $body['html'] = $newsletter['body']['html'];
} }

18
tests/integration/Mailer/Methods/MailPoetAPITest.php
View File

@@ -75,6 +75,24 @@ class MailPoetAPITest extends \MailPoetTest {
expect($body[0]['text'])->equals($this->newsletter['body']['text']); expect($body[0]['text'])->equals($this->newsletter['body']['text']);
} }
public function testItRemovesReplyToNameIfEmpty() {
$replyTo = [
'reply_to_email' => 'reply-to@mailpoet.com',
'reply_to_name_email' => '<reply-to@mailpoet.com>',
];
$mailer = new MailPoet(
$this->settings['api_key'],
$this->sender,
$replyTo,
new MailPoetMapper(),
$this->makeEmpty(AuthorizedEmailsController::class)
);
$body = $mailer->getBody($this->newsletter, $this->subscriber);
expect($body[0]['reply_to'])->equals([
'address' => 'reply-to@mailpoet.com',
]);
}
public function testItCanGenerateBodyForMultipleMessages() { public function testItCanGenerateBodyForMultipleMessages() {
$newsletters = array_fill(0, 10, $this->newsletter); $newsletters = array_fill(0, 10, $this->newsletter);
$subscribers = array_fill(0, 10, $this->subscriber); $subscribers = array_fill(0, 10, $this->subscriber);