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

Prefix Swiftmailer class strings missed by PHPScoper, add tests

Browse Source 
[MAILPOET-2448]
This commit is contained in:
Jan Jakeš
2019-10-09 10:16:23 +02:00
committed by Jack Kitterhing
parent ae7ee6f0ed
commit 3c3baeb9a9
7 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
prefixer/fix-swiftmailer.php
View File

@ -14,6 +14,8 @@ foreach ($files as $file) {
$data = preg_replace("/'(Swift_[^']*?::)/", "'MailPoetVendor\\\\\\\\$1", $data);
$data = preg_replace("/InstanceOf\('(Swift_[^']*?')/", "InstanceOf('MailPoetVendor\\\\\\\\$1", $data);
$data = preg_replace("/registerAutoload\('(_swift[^']*?')/", "registerAutoload('MailPoetVendor\\\\\\\\$1", $data);
$data = preg_replace("/'(Swift_[^']*?Listener)/", "'MailPoetVendor\\\\\\\\$1", $data);
$data = str_replace("'Swift_CharacterReader_", "'MailPoetVendor\\\\Swift_CharacterReader_", $data);
$data = str_replace('SWIFT_INIT_LOADED', 'MAILPOET_SWIFT_INIT_LOADED', $data);
// require-once 'swift_init.php' in classes since prefixed version won't use Swift's autoloader

5
tests/acceptance/ReceiveStandardEmailCest.php
View File

@ -17,7 +17,10 @@ class ReceiveStandardEmailCest {
function receiveStandardEmail(\AcceptanceTester $I) {
$this->settings->withCronTriggerMethod('WordPress');
$newsletter_title = 'Receive Test' . \MailPoet\Util\Security::generateRandomString();
// try some special characters in the subject to ensure they are received correctly
$special_chars = '… © & ěščřžýáíéůėꀿąß∂‍‍‍';
$newsletter_title = 'Receive Test ' . $special_chars;
$standard_template = '[data-automation-id=\'select_template_0\']';
$title_element = '[data-automation-id=\'newsletter_title\']';
$send_form_element = '[data-automation-id="newsletter_send_form"]';

2
tests/integration/Mailer/Methods/AmazonSESTest.php
View File

@ -45,7 +45,7 @@ class AmazonSESTest extends \MailPoetTest {
);
$this->subscriber = 'Recipient <mailpoet-phoenix-test@mailinator.com>';
$this->newsletter = [
'subject' => 'testing AmazonSES',
'subject' => 'testing AmazonSES … © & ěščřžýáíéůėꀿąß∂ 😊👨‍👩‍👧‍👧', // try some special chars
'body' => [
'html' => 'HTML body',
'text' => 'TEXT body',

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

@ -40,7 +40,7 @@ class MailPoetAPITest extends \MailPoetTest {
);
$this->subscriber = 'Recipient <mailpoet-phoenix-test@mailinator.com>';
$this->newsletter = [
'subject' => 'testing MailPoet',
'subject' => 'testing MailPoet … © & ěščřžýáíéůėꀿąß∂ 😊👨‍👩‍👧‍👧', // try some special chars
'body' => [
'html' => 'HTML body',
'text' => 'TEXT body',

2
tests/integration/Mailer/Methods/PHPMailTest.php
View File

@ -30,7 +30,7 @@ class PHPMailTest extends \MailPoetTest {
);
$this->subscriber = 'Recipient <mailpoet-phoenix-test@mailinator.com>';
$this->newsletter = [
'subject' => 'testing local method (PHP mail)',
'subject' => 'testing local method (PHP mail) … © & ěščřžýáíéůėꀿąß∂ 😊👨‍👩‍👧‍👧', // try some special chars
'body' => [
'html' => 'HTML body',
'text' => 'TEXT body',

2
tests/integration/Mailer/Methods/SMTPTest.php
View File

@ -52,7 +52,7 @@ class SMTPTest extends \MailPoetTest {
);
$this->subscriber = 'Recipient <mailpoet-phoenix-test@mailinator.com>';
$this->newsletter = [
'subject' => 'testing SMTP',
'subject' => 'testing SMTP … © & ěščřžýáíéůėꀿąß∂ 😊👨‍👩‍👧‍👧', // try some special chars
'body' => [
'html' => 'HTML body',
'text' => 'TEXT body',

2
tests/integration/Mailer/Methods/SendGridTest.php
View File

@ -35,7 +35,7 @@ class SendGridTest extends \MailPoetTest {
);
$this->subscriber = 'Recipient <mailpoet-phoenix-test@mailinator.com>';
$this->newsletter = [
'subject' => 'testing SendGrid',
'subject' => 'testing SendGrid … © & ěščřžýáíéůėꀿąß∂ 😊👨‍👩‍👧‍👧', // try some special chars
'body' => [
'html' => 'HTML body',
'text' => 'TEXT body',