use format_items() utility in wp user list

diff --git a/php/commands/user.php b/php/commands/user.php
index 7ded949..7c71e42 100644 (file)
--- a/php/commands/user.php
+++ b/php/commands/user.php
@@ -41,45 +41,23 @@ class User_Command extends \WP_CLI\CommandWithDBObject {
                        'user_registered'
                );
 
-               switch( $params['format'] ) {
-                       case 'table':
-                               $table = new \cli\Table();
+               $output_users = array();
 
-                               $table->setHeaders( array_merge( $fields, array('roles') ) );
+               foreach ( $users as $user ) {
+                       $output_user = new stdClass;
 
-                               foreach ( $users as $user ) {
-                                       $line = array();
-
-                                       foreach ( $fields as $field ) {
-                                               $line[] = $user->$field;
-                                       }
-                                       $line[] = implode( ',', $user->roles );
-
-                                       $table->addRow( $line );
-                               }
+                       foreach ( $fields as $field ) {
+                               $output_user->$field = $user->$field;
+                       }
 
-                               $table->display();
+                       $output_user->roles = implode( ',', $user->roles );
 
-                               WP_CLI::line( 'Total: ' . count( $users ) . ' users' );
-                               break;
-                       case 'json':
-                       case 'csv':
-                               $output_users = array();
+                       $output_users[] = $output_user;
+               }
 
-                               foreach( $users as $user ) {
-                                       $output_user = new stdClass;
-                                       foreach( $fields as $field ) {
-                                               $output_user->$field = $user->$field;
-                                       }
-                                       $output_users[] = $output_user;
-                               }
+               $fields[] = 'roles';
 
-                               if ( 'json' == $params['format'] )
-                                       echo json_encode( $output_users );
-                               else
-                                       WP_CLI\Utils\output_csv( $output_users, $fields );
-                               break;
-               }
+               WP_CLI\Utils\format_items( $params['format'], $fields, $output_users );
        }
 
        /**