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

Add using List-Unsubscribe-Post header to PHPMailerMethod

Browse Source 
[MAILPOET-5983]
This commit is contained in:
Jan Lysý
2024-03-27 13:17:36 +01:00
committed by Aschepikov
parent 5bcc77765c
commit fc03639aff
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mailpoet/lib/Mailer/Methods/PHPMailerMethod.php
View File

@@ -75,6 +75,7 @@ abstract class PHPMailerMethod implements MailerMethod {
} }
$mailer->Sender = $this->returnPath; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps $mailer->Sender = $this->returnPath; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
if (!empty($extraParams['unsubscribe_url'])) { if (!empty($extraParams['unsubscribe_url'])) {
$this->mailer->addCustomHeader('List-Unsubscribe-Post', 'List-Unsubscribe=One-Click');
$this->mailer->addCustomHeader('List-Unsubscribe', '<' . $extraParams['unsubscribe_url'] . '>'); $this->mailer->addCustomHeader('List-Unsubscribe', '<' . $extraParams['unsubscribe_url'] . '>');
} }

8
mailpoet/tests/integration/Mailer/Methods/AmazonSESTest.php
View File

@@ -129,10 +129,10 @@ class AmazonSESTest extends \MailPoetTest {
verify($mailer->Subject)->equals($this->newsletter['subject']); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps verify($mailer->Subject)->equals($this->newsletter['subject']); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
verify($mailer->Body)->equals($this->newsletter['body']['html']); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps verify($mailer->Body)->equals($this->newsletter['body']['html']); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
verify($mailer->AltBody)->equals($this->newsletter['body']['text']); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps verify($mailer->AltBody)->equals($this->newsletter['body']['text']); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
verify($mailer->getCustomHeaders())->equals([[ verify($mailer->getCustomHeaders())->equals([
'List-Unsubscribe', ['List-Unsubscribe-Post', 'List-Unsubscribe=One-Click'],
'<https://www.mailpoet.com>', ['List-Unsubscribe', '<https://www.mailpoet.com>'],
]]); ]);
} }
public function testItCanCreateRequest() { public function testItCanCreateRequest() {

12
mailpoet/tests/integration/Mailer/Methods/PHPMailTest.php
View File

@@ -90,14 +90,10 @@ class PHPMailTest extends \MailPoetTest {
->equals($this->newsletter['body']['html']); ->equals($this->newsletter['body']['html']);
verify($mailer->AltBody) // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps verify($mailer->AltBody) // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
->equals($this->newsletter['body']['text']); ->equals($this->newsletter['body']['text']);
verify($mailer->getCustomHeaders())->equals( verify($mailer->getCustomHeaders())->equals([
[ ['List-Unsubscribe-Post', 'List-Unsubscribe=One-Click'],
[ ['List-Unsubscribe', '<https://www.mailpoet.com>'],
'List-Unsubscribe', ]);
'<https://www.mailpoet.com>',
],
]
);
} }
public function testItCanConfigureMailerWithTextEmail() { public function testItCanConfigureMailerWithTextEmail() {

5
mailpoet/tests/integration/Mailer/Methods/SMTPTest.php
View File

@@ -107,7 +107,10 @@ class SMTPTest extends \MailPoetTest {
verify($mailer->Subject)->equals($this->newsletter['subject']); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps verify($mailer->Subject)->equals($this->newsletter['subject']); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
verify($mailer->Body)->equals($this->newsletter['body']['html']); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps verify($mailer->Body)->equals($this->newsletter['body']['html']); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
verify($mailer->AltBody)->equals($this->newsletter['body']['text']); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps verify($mailer->AltBody)->equals($this->newsletter['body']['text']); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
verify($mailer->getCustomHeaders())->equals([['List-Unsubscribe', '<https://www.mailpoet.com>']]); verify($mailer->getCustomHeaders())->equals([
['List-Unsubscribe-Post', 'List-Unsubscribe=One-Click'],
['List-Unsubscribe', '<https://www.mailpoet.com>'],
]);
} }
public function testItCanProcessSubscriber() { public function testItCanProcessSubscriber() {