Fix date format assertion in sending queue newsletter task integration test

[MAILPOET-2244]

lib/Doctrine/ConnectionFactory.php

@@ -43,7 +43,9 @@ class ConnectionFactory {
     $driver_options = [
       "@@session.time_zone = '$timezone_offset'",
       '@@session.sql_mode = REPLACE(@@sql_mode, "ONLY_FULL_GROUP_BY", "")',
-      "@@session.wait_timeout = GREATEST(@@wait_timeout, $this->min_wait_timeout)",
+      // We need to use CONVERT for MySQL 8, Maria DB bug which triggers #1232 - Incorrect argument type to variable 'wait_timeout`
+      // https://stackoverflow.com/questions/35187378/mariadb-type-error-when-setting-session-variable
+      "@@session.wait_timeout = GREATEST(CONVERT(COALESCE(@@wait_timeout, 0), SIGNED), $this->min_wait_timeout)",
     ];
 
     if (!empty(Env::$db_charset)) {

mailpoet.php

@@ -4,7 +4,7 @@ if (!defined('ABSPATH')) exit;
 
 /*
  * Plugin Name: MailPoet 3 (New)
- * Version: 3.34.3
+ * Version: 3.34.4
  * Plugin URI: http://www.mailpoet.com
  * Description: Create and send newsletters, post notifications and welcome emails from your WordPress.
  * Author: MailPoet
@@ -18,7 +18,7 @@ if (!defined('ABSPATH')) exit;
  */
 
 $mailpoet_plugin = array(
-  'version' => '3.34.3',
+  'version' => '3.34.4',
   'filename' => __FILE__,
   'path' => dirname(__FILE__),
   'autoloader' => dirname(__FILE__) . '/vendor/autoload.php',

readme.txt

@@ -3,7 +3,7 @@ Contributors: mailpoet, wysija
 Tags: email marketing, newsletter, newsletter subscribers, email, welcome email, post notification, WooCommerce emails, newsletter builder
 Requires at least: 4.7
 Tested up to: 5.2
-Stable tag: 3.34.3
+Stable tag: 3.34.4
 License: GPLv3
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
 
@@ -147,6 +147,9 @@ Stop by our [support site](https://www.mailpoet.com/support).
 
 == Changelog ==
 
+= 3.34.4 - 2019-08-01 =
+* Fixed: database connection error with MariaDB and MySQL 8 users.
+
 = 3.34.3 - 2019-07-31 =
 * Fixed: some users were experiencing a database issue after latest update.
 

tests/integration/Cron/Workers/SendingQueue/Tasks/NewsletterTest.php

@@ -244,7 +244,7 @@ class NewsletterTest extends \MailPoetTest {
     $queue = SendingTask::getByNewsletterId($newsletter->id);
     $wp = new WPFunctions();
     expect($queue->newsletter_rendered_subject)
-      ->contains(date_i18n('dS', $wp->currentTime('timestamp')));
+      ->contains(date_i18n('jS', $wp->currentTime('timestamp')));
   }
 
   function testItUsesADefaultSubjectIfRenderedSubjectIsEmptyWhenPreprocessingNewsletter() {