Revert parts of 3500a184e5ca652370fdaa7e2c2217290fadf69c.

Changing the order in which arguments are passed will break community use of this helper function.

See https://github.com/wp-cli/wp-cli/commit/3500a184e5ca652370fdaa7e2c2217290fadf69c#commitcomment-3174323

diff --git a/php/commands/post.php b/php/commands/post.php
index d9d182f..7952a8b 100644 (file)
--- a/php/commands/post.php
+++ b/php/commands/post.php
@@ -123,7 +123,7 @@ class Post_Command extends \WP_CLI\CommandWithDBObject {
                                $items[] = $item;
                        }
 
-                       \WP_CLI\Utils\format_items( $items, $format, array( 'Field', 'Value' ) );
+                       \WP_CLI\Utils\format_items( $format, $items, array( 'Field', 'Value' ) );
                        break;
 
                case 'json':
@@ -200,7 +200,7 @@ class Post_Command extends \WP_CLI\CommandWithDBObject {
 
                $query = new WP_Query( $query_args );
 
-               WP_CLI\Utils\format_items( $query->posts, $values['format'], $values['fields'] );
+               WP_CLI\Utils\format_items( $values['format'], $query->posts, $values['fields'] );
        }
 
        /**

diff --git a/php/commands/role.php b/php/commands/role.php
index 2f88e4d..bfd974b 100644 (file)
--- a/php/commands/role.php
+++ b/php/commands/role.php
@@ -40,7 +40,7 @@ class Role_Command extends WP_CLI_Command {
                        $output_roles[] = $output_role;
                }
 
-               WP_CLI\Utils\format_items( $output_roles, $params['format'], $fields );
+               WP_CLI\Utils\format_items( $params['format'], $output_roles, $fields );
        }
 
        /**

diff --git a/php/commands/term.php b/php/commands/term.php
index 5c9c724..5cbaf0a 100644 (file)
--- a/php/commands/term.php
+++ b/php/commands/term.php
@@ -41,7 +41,7 @@ class Term_Command extends WP_CLI_Command {
                if ( 'ids' == $assoc_args['format'] )
                        $terms = wp_list_pluck( $terms, 'term_id' );
 
-               WP_CLI\Utils\format_items( $terms, $assoc_args['format'], $fields, $terms );
+               WP_CLI\Utils\format_items( $assoc_args['format'], $terms, $fields );
        }
 
        /**

diff --git a/php/commands/user.php b/php/commands/user.php
index 1880a29..23b68f3 100644 (file)
--- a/php/commands/user.php
+++ b/php/commands/user.php
@@ -53,7 +53,7 @@ class User_Command extends \WP_CLI\CommandWithDBObject {
                        }
                }
 
-               WP_CLI\Utils\format_items( $users, $params['format'], $fields );
+               WP_CLI\Utils\format_items( $params['format'], $users, $fields );
        }
 
        /**

diff --git a/php/utils.php b/php/utils.php
index acb259d..39ff8e7 100644 (file)
--- a/php/utils.php
+++ b/php/utils.php
@@ -255,11 +255,11 @@ function recursive_unserialize_replace( $from = '', $to = '', $data = '', $seria
 /**
  * Output items in a table, JSON, or CSV
  *
+ * @param string        $format     Format to use: 'table', 'json', 'csv', 'ids'
  * @param array         $items      Data to output
- * @param string        $format     Format to use: 'table', 'json', 'csv'
  * @param array|string  $fields     Named fields for each item of data. Can be array or comma-separated list
  */
-function format_items( $items, $format, $fields ) {
+function format_items( $format, $items, $fields ) {
        if ( 'ids' == $format )
                \WP_CLI::out( implode( ' ', $items ) );