Release 3.37.3

[MAILPOET-2448]

mailpoet.php

@@ -2,7 +2,7 @@
 
 /*
  * Plugin Name: MailPoet 3 (New)
- * Version: 3.37.2
+ * Version: 3.37.3
  * Plugin URI: http://www.mailpoet.com
  * Description: Create and send newsletters, post notifications and welcome emails from your WordPress.
  * Author: MailPoet
@@ -16,7 +16,7 @@
  */
 
 $mailpoet_plugin = array(
-  'version' => '3.37.2',
+  'version' => '3.37.3',
   'filename' => __FILE__,
   'path' => dirname(__FILE__),
   'autoloader' => dirname(__FILE__) . '/vendor/autoload.php',

prefixer/fix-swiftmailer.php

@@ -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
@@ -29,4 +31,4 @@ foreach ($files as $file) {
 }
 
 # remove unused PHP file that starts with shebang line instead of <?php and causes PHP lint on WP repo to fail
-exec('rm -r ' . __DIR__ . '/../vendor-prefixed/swiftmailer/swiftmailer/lib/swiftmailer_generate_mimes_config.php');
+exec('rm -f ' . __DIR__ . '/../vendor-prefixed/swiftmailer/swiftmailer/lib/swiftmailer_generate_mimes_config.php');

readme.txt

@@ -3,7 +3,7 @@ Contributors: mailpoet, wysija
 Tags: email, email marketing, post notification, woocommerce emails, email automation, newsletter, newsletter builder, newsletter subscribers
 Requires at least: 4.7
 Tested up to: 5.2
-Stable tag: 3.37.2
+Stable tag: 3.37.3
 Requires PHP: 5.6
 License: GPLv3
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
@@ -164,6 +164,9 @@ Check our [Knowledge Base](https://kb.mailpoet.com) or contact us through our [s
 
 == Changelog ==
 
+= 3.37.3 - 2019-10-09 =
+* Fixed: fatal error when sending with special characters in the subject line.
+
 = 3.37.2 - 2019-10-08 =
 * Improved: TinyMCE toolbar user experience;
 * Improved: faster loading of the template page when creating a new email;

tests/acceptance/ReceiveStandardEmailCest.php

@@ -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"]';

tests/integration/Mailer/Methods/AmazonSESTest.php

@@ -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',

tests/integration/Mailer/Methods/MailPoetAPITest.php

@@ -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',

tests/integration/Mailer/Methods/PHPMailTest.php

@@ -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',

tests/integration/Mailer/Methods/SMTPTest.php

@@ -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',

tests/integration/Mailer/Methods/SendGridTest.php

@@ -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',