diff --git a/tests/phpunit/includes/mock-mailer.php b/tests/phpunit/includes/mock-mailer.php index 8e8f848c0f..c91a67aa19 100644 --- a/tests/phpunit/includes/mock-mailer.php +++ b/tests/phpunit/includes/mock-mailer.php @@ -84,3 +84,20 @@ function tests_retrieve_phpmailer_instance() { } return $mailer; } + +/** + * Helper method to reset the phpmailer instance. + * + * @since 4.6.0 + * + * @return bool + */ +function reset_phpmailer_instance() { + $mailer = tests_retrieve_phpmailer_instance(); + if ( $mailer && isset( $mailer->mock_sent ) ) { + unset( $mailer->mock_sent ); + return true; + } + + return false; +} diff --git a/tests/phpunit/tests/comment.php b/tests/phpunit/tests/comment.php index 296606108a..5b20528727 100644 --- a/tests/phpunit/tests/comment.php +++ b/tests/phpunit/tests/comment.php @@ -9,7 +9,7 @@ class Tests_Comment extends WP_UnitTestCase { public function setUp() { parent::setUp(); - unset( $GLOBALS['phpmailer']->mock_sent ); + reset_phpmailer_instance(); } public static function wpSetUpBeforeClass( $factory ) { @@ -558,7 +558,7 @@ class Tests_Comment extends WP_UnitTestCase { && WP_TESTS_EMAIL == $GLOBALS['phpmailer']->mock_sent[0]['to'][0][0] ) { $email_sent_when_comment_added = true; - unset( $GLOBALS['phpmailer']->mock_sent ); + reset_phpmailer_instance(); } else { $email_sent_when_comment_added = false; } @@ -589,7 +589,7 @@ class Tests_Comment extends WP_UnitTestCase { } else { $email_sent_when_comment_approved = false; } - unset( $GLOBALS['phpmailer']->mock_sent ); + reset_phpmailer_instance(); // Post authors are notified when a new comment is added to their post. $data = array( @@ -607,7 +607,7 @@ class Tests_Comment extends WP_UnitTestCase { ! 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_phpmailer_instance(); } else { $email_sent_when_comment_added = false; } diff --git a/tests/phpunit/tests/mail.php b/tests/phpunit/tests/mail.php index 120147cfc5..5142c72d92 100644 --- a/tests/phpunit/tests/mail.php +++ b/tests/phpunit/tests/mail.php @@ -6,11 +6,11 @@ class Tests_Mail extends WP_UnitTestCase { function setUp() { parent::setUp(); - unset( $GLOBALS['phpmailer']->mock_sent ); + reset_phpmailer_instance(); } function tearDown() { - unset( $GLOBALS['phpmailer']->mock_sent ); + reset_phpmailer_instance(); parent::tearDown(); } diff --git a/tests/phpunit/tests/user.php b/tests/phpunit/tests/user.php index 4f5816fec9..00964676fb 100644 --- a/tests/phpunit/tests/user.php +++ b/tests/phpunit/tests/user.php @@ -1024,7 +1024,7 @@ class Tests_User extends WP_UnitTestCase { * @ticket 36009 */ function test_wp_new_user_notification( $notify, $admin_email_sent_expected, $user_email_sent_expected ) { - unset( $GLOBALS['phpmailer']->mock_sent ); + reset_phpmailer_instance(); $was_admin_email_sent = false; $was_user_email_sent = false; @@ -1100,7 +1100,7 @@ class Tests_User extends WP_UnitTestCase { * @expectedDeprecated wp_new_user_notification */ function test_wp_new_user_notification_old_signature_throws_deprecated_warning_but_sends() { - unset( $GLOBALS['phpmailer']->mock_sent ); + reset_phpmailer_instance(); $was_admin_email_sent = false; $was_user_email_sent = false; @@ -1125,7 +1125,7 @@ class Tests_User extends WP_UnitTestCase { * @ticket 34377 */ function test_wp_new_user_notification_old_signature_no_password() { - unset( $GLOBALS['phpmailer']->mock_sent ); + reset_phpmailer_instance(); $was_admin_email_sent = false; $was_user_email_sent = false;