From aec54c690ef9bc8184bebe5ce34fa20a1df3ba14 Mon Sep 17 00:00:00 2001
From: Daniel Bachhuber <d@danielbachhuber.com>
Date: Fri, 19 Apr 2013 14:27:20 -0700
Subject: [PATCH] Convert `wp user list --ids` to `wp user list --format=ids`

Also, dropped the formatting of the `$output_items`, as a user is already a WP_User object and the formatting is handled within our `format_items()` util
---
 man-src/user-list.txt |  6 +-----
 man/user-list.1       | 10 ++--------
 php/commands/user.php | 38 ++++++++++++++++----------------------
 3 files changed, 19 insertions(+), 35 deletions(-)

diff --git a/man-src/user-list.txt b/man-src/user-list.txt
index 8fc98a01..f675f25a 100644
--- a/man-src/user-list.txt
+++ b/man-src/user-list.txt
@@ -4,13 +4,9 @@
 
 	Only display users with a certain role.
 
-* `--ids`:
-
-	Return only the IDs of the found users, separated by spaces.
-
 * `--format`=<format>:
 
-	Output list as table, CSV or JSON. Defaults to table.
+	Output list as table, CSV, JSON, or simply IDs. Defaults to table.
 
 ## EXAMPLES
 
diff --git a/man/user-list.1 b/man/user-list.1
index 251e9f25..73c72ba3 100644
--- a/man/user-list.1
+++ b/man/user-list.1
@@ -7,7 +7,7 @@
 \fBwp\-user\-list\fR \- List users\.
 .
 .SH "SYNOPSIS"
-wp user list [\-\-role=\fIrole\fR] [\-\-ids] [\-\-format=\fIformat\fR]
+wp user list [\-\-role=\fIrole\fR] [\-\-format=\fIformat\fR] [\-\-ids]
 .
 .SH "OPTIONS"
 .
@@ -18,16 +18,10 @@ wp user list [\-\-role=\fIrole\fR] [\-\-ids] [\-\-format=\fIformat\fR]
 Only display users with a certain role\.
 .
 .TP
-\fB\-\-ids\fR:
-.
-.IP
-Return only the IDs of the found users, separated by spaces\.
-.
-.TP
 \fB\-\-format\fR=\fIformat\fR:
 .
 .IP
-Output list as table, CSV or JSON\. Defaults to table\.
+Output list as table, CSV, JSON, or simply IDs\. Defaults to table\.
 .
 .SH "EXAMPLES"
 .
diff --git a/php/commands/user.php b/php/commands/user.php
index b2fdc791..f59583ff 100644
--- a/php/commands/user.php
+++ b/php/commands/user.php
@@ -13,7 +13,7 @@ class User_Command extends \WP_CLI\CommandWithDBObject {
 	 * List users.
 	 *
 	 * @subcommand list
-	 * @synopsis [--role=<role>] [--ids] [--format=<format>]
+	 * @synopsis [--role=<role>] [--format=<format>] [--ids]
 	 */
 	public function _list( $args, $assoc_args ) {
 
@@ -28,38 +28,32 @@ class User_Command extends \WP_CLI\CommandWithDBObject {
 			$params['role'] = $assoc_args['role'];
 		}
 
-		$users = get_users( $params );
-
-		if ( isset( $assoc_args['ids'] ) ) {
-			WP_CLI::out( implode( ' ', $users ) );
-			exit;
+		// --ids is deprecated
+		if ( isset( $params['ids'] ) ) {
+			$params['format'] = 'ids';
+			unset( $params['ids'] );
 		}
 
+		if ( 'ids' == $params['format'] )
+			$params['fields'] = 'ids';
+
+		$users = get_users( $params );
+
 		$fields = array(
 			'ID',
 			'user_login',
 			'display_name',
 			'user_email',
-			'user_registered'
+			'user_registered',
+			'roles'
 		);
-
-		$output_users = array();
-
-		foreach ( $users as $user ) {
-			$output_user = new stdClass;
-
-			foreach ( $fields as $field ) {
-				$output_user->$field = $user->$field;
+		if ( 'ids' != $params['format'] ) {
+			foreach ( $users as $user ) {
+				$user->roles = implode( ',', $user->roles );
 			}
-
-			$output_user->roles = implode( ',', $user->roles );
-
-			$output_users[] = $output_user;
 		}
 
-		$fields[] = 'roles';
-
-		WP_CLI\Utils\format_items( $params['format'], $fields, $output_users );
+		WP_CLI\Utils\format_items( $params['format'], $fields, $users );
 	}
 
 	/**
-- 
2.11.0