From 5b3df74f8e6470da13d496ef74daea1f98fb443d Mon Sep 17 00:00:00 2001 From: karthick-murugan Date: Tue, 18 Mar 2025 20:13:29 +0530 Subject: [PATCH 1/4] Update non-user command --- src/User_Command.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/User_Command.php b/src/User_Command.php index 616f4123..8393719c 100644 --- a/src/User_Command.php +++ b/src/User_Command.php @@ -545,6 +545,10 @@ public function update( $args, $assoc_args ) { $user_ids[] = $user->ID; } + if ( empty( $user_ids ) ) { + exit( 1 ); + } + $skip_email = Utils\get_flag_value( $assoc_args, 'skip-email' ); if ( $skip_email ) { add_filter( 'send_email_change_email', '__return_false' ); From c00770893b83500b7d646d121fb0e996e76fc860 Mon Sep 17 00:00:00 2001 From: karthick-murugan Date: Wed, 19 Mar 2025 10:15:36 +0530 Subject: [PATCH 2/4] Adding tests and feedback --- features/user.feature | 8 ++++++++ src/User_Command.php | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/features/user.feature b/features/user.feature index a0a392ac..6a9977bf 100644 --- a/features/user.feature +++ b/features/user.feature @@ -728,4 +728,12 @@ Feature: Manage WordPress users """ newtestuser """ + Scenario: Updating an invalid user should return an error + Given a WP install + When I try `wp user update 9999 --user_pass=securepassword` + Then the return code should be 1 + And STDERR should contain: + """ + Error: No valid users found. + """ diff --git a/src/User_Command.php b/src/User_Command.php index 8393719c..bfc8382a 100644 --- a/src/User_Command.php +++ b/src/User_Command.php @@ -546,7 +546,7 @@ public function update( $args, $assoc_args ) { } if ( empty( $user_ids ) ) { - exit( 1 ); + WP_CLI::error( 'No valid users found.' ); } $skip_email = Utils\get_flag_value( $assoc_args, 'skip-email' ); From ba7b5f20b5de303f866fd609f1ae1d20c7e565b9 Mon Sep 17 00:00:00 2001 From: karthick-murugan Date: Wed, 19 Mar 2025 19:05:33 +0530 Subject: [PATCH 3/4] Feedback changes updated --- features/user.feature | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/features/user.feature b/features/user.feature index 6a9977bf..b3a929a1 100644 --- a/features/user.feature +++ b/features/user.feature @@ -147,6 +147,13 @@ Feature: Manage WordPress users 3 """ + When I try `wp user update 9999 --user_pass=securepassword` + Then the return code should be 1 + And STDERR should contain: + """ + Error: No valid users found. + """ + Scenario: Delete user with invalid reassign Given a WP install And a session_no file: @@ -728,12 +735,3 @@ Feature: Manage WordPress users """ newtestuser """ - Scenario: Updating an invalid user should return an error - Given a WP install - When I try `wp user update 9999 --user_pass=securepassword` - Then the return code should be 1 - And STDERR should contain: - """ - Error: No valid users found. - """ - From af2d210b1ff9884a62768a3bd1ed0bc006c0d8b0 Mon Sep 17 00:00:00 2001 From: karthick-murugan Date: Wed, 19 Mar 2025 19:10:22 +0530 Subject: [PATCH 4/4] Space removal update --- features/user.feature | 1 + 1 file changed, 1 insertion(+) diff --git a/features/user.feature b/features/user.feature index b3a929a1..2d315d45 100644 --- a/features/user.feature +++ b/features/user.feature @@ -735,3 +735,4 @@ Feature: Manage WordPress users """ newtestuser """ +