Ticket #36658: 36658.2.diff

tests/phpunit/includes/mock-mailer.php

@@ -84 +84 @@
         }
         return $mailer;
 }
+
+
+/**
+ * Helper method to reset the phpmailer instance.
+ *
+ * @since 4.6.0
+ *
+ * @return bool
+ */
+function reset_php_mailer_instance() {
+        $mailer = tests_retrieve_phpmailer_instance();
+        if ( $mailer && isset( $mailer->mock_sent ) ) {
+                unset( $mailer->mock_sent );
+                return true;
+        }
+
+        return false;
+}

tests/phpunit/tests/comment.php

@@ -9 +9 @@
 
         public function setUp() {
                 parent::setUp();
-                unset( $GLOBALS['phpmailer']->mock_sent );
+                reset_php_mailer_instance();
         }
 
         public static function wpSetUpBeforeClass( $factory ) {
@@ -558 +558 @@
                         && WP_TESTS_EMAIL == $GLOBALS['phpmailer']->mock_sent[0]['to'][0][0]
                 ) {
                         $email_sent_when_comment_added = true;
-                        unset( $GLOBALS['phpmailer']->mock_sent );
+                        reset_php_mailer_instance();
                 } else {
                         $email_sent_when_comment_added = false;
                 }
@@ -589 +589 @@
                 } else {
                         $email_sent_when_comment_approved = false;
                 }
-                unset( $GLOBALS['phpmailer']->mock_sent );
+                reset_php_mailer_instance();
 
                 // Post authors are notified when a new comment is added to their post.
                 $data = array(
@@ -607 +607 @@
                      ! empty( $GLOBALS['phpmailer']->mock_sent ) &&
                      'test@test.com' == $GLOBALS['phpmailer']->mock_sent[0]['to'][0][0] ) {
                         $email_sent_when_comment_added = true;
-                        unset( $GLOBALS['phpmailer']->mock_sent );
+                        reset_php_mailer_instance();
                 } else {
                         $email_sent_when_comment_added = false;
                 }

tests/phpunit/tests/mail.php

@@ -6 +6 @@
 class Tests_Mail extends WP_UnitTestCase {
         function setUp() {
                 parent::setUp();
-                unset( $GLOBALS['phpmailer']->mock_sent );
+                reset_php_mailer_instance();
         }
 
         function tearDown() {
-                unset( $GLOBALS['phpmailer']->mock_sent );
                 parent::tearDown();
+                reset_php_mailer_instance();
         }
 
         /**

tests/phpunit/tests/user.php

@@ -1024 +1024 @@
          * @ticket 36009
          */
         function test_wp_new_user_notification( $notify, $admin_email_sent_expected, $user_email_sent_expected ) {
-                unset( $GLOBALS['phpmailer']->mock_sent );
+                reset_php_mailer_instance();
 
                 $was_admin_email_sent = false;
                 $was_user_email_sent = false;
@@ -1100 +1100 @@
          * @expectedDeprecated wp_new_user_notification
          */
         function test_wp_new_user_notification_old_signature_throws_deprecated_warning_but_sends() {
-                unset( $GLOBALS['phpmailer']->mock_sent );
+                reset_php_mailer_instance();
 
                 $was_admin_email_sent = false;
                 $was_user_email_sent = false;
@@ -1125 +1125 @@
          * @ticket 34377
          */
         function test_wp_new_user_notification_old_signature_no_password() {
-                unset( $GLOBALS['phpmailer']->mock_sent );
+                reset_php_mailer_instance();
 
                 $was_admin_email_sent = false;
                 $was_user_email_sent = false;