Changeset 32839

Timestamp:

06/18/2015 01:52:29 PM (11 years ago)

Author:

boonebgorges

Message:

Make sure $_SERVER['SERVER_NAME'] is set whenever wp_mail() is called in PHPUnit tests.

This eliminates PHP notices when wp_mail() needs to determine its own From header.

See [25381] for a previous fix, which focused only on the mail-specific tests.

Fixes #32702.

Location:

trunk/tests/phpunit

Files:

• includes/testcase.php (modified) (2 diffs)
• tests/mail.php (modified) (1 diff)

trunk/tests/phpunit/includes/testcase.php

@@ -54 +54 @@
                 $this->expectDeprecated();
                 add_filter( 'wp_die_handler', array( $this, 'get_wp_die_handler' ) );
+
+                add_filter( 'wp_mail', array( $this, 'set_wp_mail_globals' ) );
         }
 
@@ -570 +572 @@
                 return array_sum( $time_array );
         }
+
+        /**
+         * When `wp_mail()` is called, make sure `$_SERVER['SERVER_NAME']` is faked.
+         *
+         * @since 4.3.0
+         *
+         * @param array $args `wp_mail()` arguments.
+         * @return array $args
+         */
+        public function set_wp_mail_globals( $args ) {
+                if ( ! isset( $_SERVER['SERVER_NAME'] ) ) {
+                        $_SERVER['SERVER_NAME'] = 'example.com';
+                        add_action( 'phpmailer_init', array( $this, 'tear_down_wp_mail_globals' ) );
+                }
+
+                return $args;
+        }
+
+        /**
+         * Tear down the faked `$_SERVER['SERVER_NAME']` global used in `wp_mail()`.
+         *
+         * @since 4.3.0
+         */
+        public function tear_down_wp_mail_globals() {
+                unset( $_SERVER['SERVER_NAME'] );
+        }
 }

trunk/tests/phpunit/tests/mail.php

@@ -7 +7 @@
         function setUp() {
                 parent::setUp();
-                $_SERVER['SERVER_NAME'] = 'example.com';
                 unset( $GLOBALS['phpmailer']->mock_sent );
-        }
-
-        function tearDown() {
-                unset( $_SERVER['SERVER_NAME'] );
-                parent::tearDown();
         }