Reset user password send error when no user is found (#271)

Reset user password send error when no user is found
wp-cli · Nov 12, 2019 · 3c31e7e · 3c31e7e
2 parents 4ad5a52 + 9f94eca
commit 3c31e7e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -5216,7 +5216,7 @@ wp user reset-password <user>... [--skip-email]
     $ wp user reset-password admin editor
     Reset password for admin.
     Reset password for editor.
-    Success: Passwords reset.
+    Success: Passwords reset for 2 users.
 
 
 

diff --git a/features/user-reset-password.feature b/features/user-reset-password.feature
@@ -11,7 +11,7 @@ Feature: Reset passwords for one or more WordPress users.
     Then STDOUT should contain:
       """
       Reset password for admin.
-      Success: Password reset.
+      Success: Password reset for 1 user.
       """
     And an email should be sent
 
@@ -32,7 +32,7 @@ Feature: Reset passwords for one or more WordPress users.
     Then STDOUT should contain:
       """
       Reset password for admin.
-      Success: Password reset.
+      Success: Password reset for 1 user.
       """
     And an email should not be sent
 

diff --git a/src/User_Command.php b/src/User_Command.php
@@ -1079,7 +1079,7 @@ public function import_csv( $args, $assoc_args ) {
 	 *     $ wp user reset-password admin editor
 	 *     Reset password for admin.
 	 *     Reset password for editor.
-	 *     Success: Passwords reset.
+	 *     Success: Passwords reset for 2 users.
 	 *
 	 * @subcommand reset-password
 	 */
@@ -1102,7 +1102,15 @@ public function reset_password( $args, $assoc_args ) {
 		if ( $skip_email ) {
 			remove_filter( 'send_password_change_email', '__return_false' );
 		}
-		WP_CLI::success( count( $users ) > 1 ? 'Passwords reset.' : 'Password reset.' );
+
+		$reset_user_count = count( $users );
+		if ( 1 === $reset_user_count ) {
+			WP_CLI::success( "Password reset for {$reset_user_count} user." );
+		} elseif ( $reset_user_count > 1 ) {
+			WP_CLI::success( "Passwords reset for {$reset_user_count} users." );
+		} else {
+			WP_CLI::error( 'No user found to reset password.' );
+		}
 	}
 
 	/**