Ticket #28618: 28618.diff

src/wp-includes/pluggable.php

@@ -265 +265 @@
                 require_once ABSPATH . WPINC . '/class-phpmailer.php';
                 require_once ABSPATH . WPINC . '/class-smtp.php';
                 $phpmailer = new PHPMailer( true );
+                /**
+                 * Filters the PHPMailer object.
+                 *
+                 * Allows plugins to override the PHPMailer class with one of their own if required.
+                 *
+                 * @since 4.0
+                 *
+                 * @param object $phpmailer A PHPMailer (or compatible) class.
+                 */
+                $phpmailer = apply_filters( 'wp_phpmailer', $phpmailer );
         }
 
         // Headers

tests/phpunit/includes/bootstrap.php

@@ -45 +45 @@
         $multisite = false;
 }
 
-// Override the PHPMailer
+// Override the PHPMailer up front
 require_once( dirname( __FILE__ ) . '/mock-mailer.php' );
 $phpmailer = new MockPHPMailer();
 
@@ -67 +67 @@
 
 require_once dirname( __FILE__ ) . '/functions.php';
 
+// Ensure that PHPMailer is alwways a MockPHPMailer
+tests_add_filter( 'wp_phpmailer', '_wp_phpmailer' );
+
 $GLOBALS['_wp_die_disabled'] = false;
 // Allow tests to override wp_die
 tests_add_filter( 'wp_die_handler', '_wp_die_handler_filter' );

tests/phpunit/includes/functions.php

@@ -102 +102 @@
                         echo "\t $k : $v\n";
                 }
         }
-}
- No newline at end of file
+}
+
+function _wp_phpmailer( $phpmailer ) {
+        return new MockPHPMailer();
+}