Use simpler approach to strip error message HTML tags

wp-cli · Feb 21, 2024 · 6622f87 · 6622f87
1 parent cb745de
commit 6622f87
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/features/user.feature b/features/user.feature
@@ -207,10 +207,8 @@ Feature: Manage WordPress users
       """
 
     When I try `wp user create bobjones1 bobjones@example.com`
-    Then STDERR should contain:
-      """
-      Error: This email address is already registered.
-      """
+    Then STDERR should not be empty
+    And the return code should be 1
 
   Scenario: Managing user roles
     Given a WP install

diff --git a/src/User_Command.php b/src/User_Command.php
@@ -430,10 +430,8 @@ public function create( $args, $assoc_args ) {
 			$result = wpmu_validate_user_signup( $user->user_login, $user->user_email );
 			if ( is_wp_error( $result['errors'] ) && ! empty( $result['errors']->errors ) ) {
 				$message = $result['errors']->get_error_message();
-				if ( false !== stripos( $message, '</strong>' ) ) {
-					$exploded = explode( '</strong>', $message );
-					$message  = trim( wp_strip_all_tags( $exploded[1] ) );
-				}
+				$message = trim( wp_strip_all_tags( $message ) );
+				$message = str_replace( 'Error: ', '', $message );
 				WP_CLI::error( $message );
 			}
 			$user_id = wpmu_create_user( $user->user_login, $user->user_pass, $user->user_email );