cast arrays to objects instead of the other way around

the advantage is that objects that have magic methods don't need special
handling

diff --git a/php/commands/user.php b/php/commands/user.php
index 3f81692..3e8bcd4 100644 (file)
--- a/php/commands/user.php
+++ b/php/commands/user.php
@@ -70,10 +70,9 @@ class User_Command extends \WP_CLI\CommandWithDBObject {
                        if ( !is_object( $user ) )
                                return $user;
 
-                       $new_user = $user->to_array();
-                       $new_user['roles'] = implode( ',', $user->roles );
+                       $user->roles = implode( ',', $user->roles );
 
-                       return $new_user;
+                       return $user;
                } );
 
                WP_CLI\Utils\format_items( $params['format'], $it, $fields );

diff --git a/php/utils.php b/php/utils.php
index 70d5937..9c94504 100644 (file)
--- a/php/utils.php
+++ b/php/utils.php
@@ -278,7 +278,7 @@ function format_items( $format, $items, $fields ) {
                        $table->setHeaders( $fields );
 
                        foreach ( $items as $item ) {
-                               $table->addRow( array_values( array_pick( $item, $fields ) ) );
+                               $table->addRow( array_values( pick_fields( $item, $fields ) ) );
                        }
 
                        $table->display();
@@ -291,7 +291,7 @@ function format_items( $format, $items, $fields ) {
                case 'json':
                        $out = array();
                        foreach ( $items as $item ) {
-                               $out[] = array_pick( $item, $fields );
+                               $out[] = pick_fields( $item, $fields );
                        }
 
                        echo json_encode( $out );
@@ -313,7 +313,7 @@ function write_csv( $fd, $rows, $headers = array() ) {
 
        foreach ( $rows as $row ) {
                if ( ! empty( $headers ) ) {
-                       $row = array_pick( $row, $headers );
+                       $row = pick_fields( $row, $headers );
                }
 
                fputcsv( $fd, array_values( $row ) );
@@ -321,15 +321,19 @@ function write_csv( $fd, $rows, $headers = array() ) {
 }
 
 /**
- * Like array_slice(), but for associative arrays.
+ * Pick fields from an associative array or object.
+ *
+ * @param array|object Associative array or object to pick fields from
+ * @param array List of fields to pick
+ * @return array
  */
-function array_pick( $item, $fields ) {
-       $item = (array) $item;
+function pick_fields( $item, $fields ) {
+       $item = (object) $item;
 
        $values = array();
 
        foreach ( $fields as $field ) {
-               $values[ $field ] = isset( $item[ $field ] ) ? $item[ $field ] : null;
+               $values[ $field ] = isset( $item->$field ) ? $item->$field : null;
        }
 
        return $values;