Merge branch 'main' into copilot/add-font-library-commands

Author: swissspidy

README.md

@@ -1776,6 +1776,21 @@ wp option
 
 See the [Plugin Settings API](https://developer.wordpress.org/plugins/settings/settings-api/) and the [Theme Options](https://developer.wordpress.org/themes/customize-api/) for more information on adding customized options.
 
+**COMMON OPTIONS**
+
+These are some of the most commonly used WordPress options:
+
+* `siteurl` - Site URL, e.g. http://example.com
+* `blogname` - Site title
+* `blogdescription` - Site tagline
+* `admin_email` - Administration email address
+* `default_role` - Default role for new users
+* `timezone_string` - Local timezone, e.g. "America/New_York"
+* `home` - Home URL, e.g. http://example.com
+* `blog_public` - Discourage search engines when set to 0
+
+For the full list of available options, see the [Option Reference](https://developer.wordpress.org/apis/options/).
+
 **EXAMPLES**
 
     # Get site URL.

features/user.feature

@@ -352,7 +352,10 @@ Feature: Manage WordPress users
       | roles | author |
 
     When I run `wp user remove-role 1`
-    Then STDOUT should not be empty
+    Then STDOUT should contain:
+      """
+      Success: Removed all roles from admin (1) on
+      """
 
     When I run `wp user get 1`
     Then STDOUT should be a table containing rows:

src/Option_Command.php

@@ -9,6 +9,21 @@
  *
  * See the [Plugin Settings API](https://developer.wordpress.org/plugins/settings/settings-api/) and the [Theme Options](https://developer.wordpress.org/themes/customize-api/) for more information on adding customized options.
  *
+ * ## COMMON OPTIONS
+ *
+ * These are some of the most commonly used WordPress options:
+ *
+ * * `siteurl` - Site URL, e.g. http://example.com
+ * * `blogname` - Site title
+ * * `blogdescription` - Site tagline
+ * * `admin_email` - Administration email address
+ * * `default_role` - Default role for new users
+ * * `timezone_string` - Local timezone, e.g. "America/New_York"
+ * * `home` - Home URL, e.g. http://example.com
+ * * `blog_public` - Discourage search engines when set to 0
+ *
+ * For the full list of available options, see the [Option Reference](https://developer.wordpress.org/apis/options/).
+ *
  * ## EXAMPLES
  *
  *     # Get site URL.

src/User_Command.php

@@ -807,15 +807,25 @@ public function add_role( $args, $assoc_args ) {
 	 * : User ID, user email, or user login.
 	 *
 	 * [<role>...]
-	 * : Remove the specified role(s) from the user.
+	 * : Remove the specified role(s) from the user. If not passed, all roles are
+	 * removed from the user; on multisite, this removes the user from the current
+	 * site/blog.
 	 *
 	 * ## EXAMPLES
 	 *
 	 *     $ wp user remove-role 12 author
-	 *     Success: Removed 'author' role for johndoe (12).
+	 *     Success: Removed 'author' role from johndoe (12).
 	 *
 	 *     $ wp user remove-role 12 author editor
-	 *     Success: Removed 'author', 'editor' roles for johndoe (12).
+	 *     Success: Removed 'author', 'editor' roles from johndoe (12).
+	 *
+	 *     # On single-site: removes all roles from the user
+	 *     $ wp user remove-role 12
+	 *     Success: Removed all roles from johndoe (12) on http://example.com.
+	 *
+	 *     # On multisite: removes the user from the current site/blog
+	 *     $ wp user remove-role 12
+	 *     Success: Removed johndoe (12) from http://example.com.
 	 *
 	 * @subcommand remove-role
 	 */
@@ -837,14 +847,14 @@ public function remove_role( $args, $assoc_args ) {
 			$label   = count( $roles ) > 1 ? 'roles' : 'role';
 			WP_CLI::success( "Removed '{$message}' {$label} from {$user->user_login} ({$user->ID})." );
 		} else {
-			// Multisite
+			$site_url = site_url();
 			if ( function_exists( 'remove_user_from_blog' ) ) {
 				remove_user_from_blog( $user->ID, get_current_blog_id() );
+				WP_CLI::success( "Removed {$user->user_login} ({$user->ID}) from {$site_url}." );
 			} else {
 				$user->remove_all_caps();
+				WP_CLI::success( "Removed all roles from {$user->user_login} ({$user->ID}) on {$site_url}." );
 			}
-
-			WP_CLI::success( "Removed {$user->user_login} ({$user->ID}) from " . site_url() . '.' );
 		}
 	}