Ticket #33654: 33654.4.diff

src/wp-admin/includes/user.php

@@ -176 +176 @@
                 $user_id = wp_update_user( $user );
         } else {
                 $user_id = wp_insert_user( $user );
-                wp_new_user_notification( $user_id, 'both' );
+                wp_new_user_notification( $user_id, null, 'both' );
         }
         return $user_id;
 }

src/wp-admin/js/common.js

@@ -73 +73 @@
 $(document).ready(function(){columns.init();});
 
 validateForm = function( form ) {
-        return !$( form )
+        return ! $( form )
                 .find( '.form-required' )
                 .filter( function() { return $( 'input:visible', this ).val() === ''; } )
                 .addClass( 'form-invalid' )

src/wp-admin/network/site-new.php

@@ -94 +94 @@
                 if ( false === $user_id )
                         wp_die( __( 'There was an error creating the user.' ) );
                 else
-                        wp_new_user_notification( $user_id, 'both' );
+                        wp_new_user_notification( $user_id, null, 'both' );
         }
 
         $wpdb->hide_errors();

src/wp-admin/network/site-users.php

@@ -77 +77 @@
                                 if ( false === $user_id ) {
                                         $update = 'err_new_dup';
                                 } else {
-                                        wp_new_user_notification( $user_id, 'both' );
+                                        wp_new_user_notification( $user_id, null, 'both' );
                                         add_user_to_blog( $id, $user_id, $_POST['new_role'] );
                                         $update = 'newuser';
                                 }

src/wp-admin/network/user-new.php

@@ -51 +51 @@
                 if ( ! $user_id ) {
                         $add_user_errors = new WP_Error( 'add_user_fail', __( 'Cannot add user.' ) );
                 } else {
-                        wp_new_user_notification( $user_id, 'both' );
+                        wp_new_user_notification( $user_id, null, 'both' );
                         wp_redirect( add_query_arg( array('update' => 'added'), 'user-new.php' ) );
                         exit;
                 }

src/wp-includes/pluggable.php

@@ -1690 +1690 @@
  *
  * @since 2.0.0
  * @since 4.3.0 The `$plaintext_pass` parameter was changed to `$notify`.
+ * @since 4.3.1 The `$plaintext_pass` deprecated. `$notify` added as a third argument.
  *
  * @param int    $user_id User ID.
+ * @param null   $deprecated Not used (argument deprecated).
  * @param string $notify  Optional. Type of notification that should happen. Accepts 'admin' or an empty
  *                        string (admin only), or 'both' (admin and user). The empty string value was kept
  *                        for backward-compatibility purposes with the renamed parameter. Default empty.
  */
-function wp_new_user_notification( $user_id, $notify = '' ) {
+function wp_new_user_notification( $user_id, $deprecated = null, $notify = '' ) {
+        if ( $deprecated !== null ) {
+                _deprecated_argument( __FUNCTION__, '4.3.1' );
+        }
+
         global $wpdb;
         $user = get_userdata( $user_id );
 

src/wp-includes/user-functions.php

@@ -2004 +2004 @@
 
         update_user_option( $user_id, 'default_password_nag', true, true ); //Set up the Password change nag.
 
-        wp_new_user_notification( $user_id, 'both' );
+        wp_new_user_notification( $user_id, null, 'both' );
 
         return $user_id;
 }

tests/phpunit/tests/user.php

@@ -679 +679 @@
                 $this->assertEquals( $user->user_email, 'test2@test.com' );
         }
 
+        /**
+         * Testing wp_new_user_notification email statuses.
+         *
+         * Be sure when writing tests to unset any old instances of
+         * $GLOBALS['phpmailer'] or depending on array indices will be
+         * inaccurate.
+         *
+         * @dataProvider data_wp_new_user_notifications
+         *
+         * @ticket 33654
+         *
+         *
+         */
+        function test_wp_new_user_notification( $notify, $admin_email_sent_expected, $user_email_sent_expected ) {
+
+                //unset any old instance of phpmailer
+                unset( $GLOBALS['phpmailer']->mock_sent );
+
+                $was_admin_email_sent = false;
+                $was_user_email_sent = false;
+
+                $user = $this->factory->user->create( $this->user_data );
+
+                wp_new_user_notification( $user, null, $notify );
+
+                /**
+                 * Check to see if a notification email was sent to the
+                 * post author `blackburn@battlefield3.com` and and site admin `admin@example.org`.
+                 */
+                if ( isset( $GLOBALS['phpmailer']->mock_sent ) && ! empty( $GLOBALS['phpmailer']->mock_sent ) ) {
+                        $was_admin_email_sent = ( isset( $GLOBALS['phpmailer']->mock_sent[0] ) && 'admin@example.org' == $GLOBALS['phpmailer']->mock_sent[0]['to'][0][0] ) ? true : false;
+                        $was_user_email_sent = ( isset( $GLOBALS['phpmailer']->mock_sent[1] ) && 'blackburn@battlefield3.com' == $GLOBALS['phpmailer']->mock_sent[1]['to'][0][0] ) ? true : false;
+                }
+
+                $this->assertSame( $admin_email_sent_expected, $was_admin_email_sent, 'Admin email result was not as expected in test_wp_new_user_notification' );
+                $this->assertSame( $user_email_sent_expected , $was_user_email_sent, 'User email result was not as expected in test_wp_new_user_notification' );
+        }
+
+        /**
+         * Data provider.
+         *
+         * Passes the three available options for the $notify parameter and the expected email
+         * emails sent status as a bool.
+         *
+         * @since 4.4.0
+         *
+         * @return array {
+         *     @type array {
+         *         @type string $post_args               The arguments that will merged with the $_POST array.
+         *         @type bool $admin_email_sent_expected The expected result of whether an email was sent to the admin.
+         *         @type bool $user_email_sent_expected  The expected result of whether an email was sent to the user.
+         *     }
+         * }
+         */
+        function data_wp_new_user_notifications() {
+
+                return array(
+                        array(
+                                '',
+                                true,
+                                false,
+                        ),
+                        array(
+                                'admin',
+                                true,
+                                false,
+                        ),
+                        array(
+                                'both',
+                                true,
+                                true,
+                        ),
+                );
+        }
+
+        /**
+         * @ticket 33654
+         * @expectedDeprecated wp_new_user_notification
+         */
+        function test_wp_new_user_notification_old_signature_throws_deprecated_warning() {
+
+                $this->deprecated_called = false;
+
+                /**
+                 * Catch if the_deprecated_argument is called.
+                 */
+                add_action(
+                        'deprecated_argument_run',
+                        function( $message, $version ) {
+                                $this->deprecated_called = 'wp_new_user_notification' === $message;
+                        },
+                        10,
+                        2
+                );
+
+                /**
+                 * Set up a user and try sending a notification using the old, deprecated
+                 * function signature `wp_new_user_notification( $user, 'plaintext_password' );`
+                 */
+                $user = $this->factory->user->create(
+                        array(
+                                'role'       => 'author',
+                                'user_login' => 'test_wp_new_user_notification',
+                                'user_pass'  => 'password',
+                                'user_email' => 'test@test.com',
+                        )
+                );
+
+                wp_new_user_notification( $user, 'this_is_deprecated' );
+
+        $this->assertTrue( $this->deprecated_called );
+        }
 }