Use `wp_parse_args()` where we can

diff --git a/php/WP_CLI/CommandWithUpgrade.php b/php/WP_CLI/CommandWithUpgrade.php
index aaac62e..6331de3 100644 (file)
--- a/php/WP_CLI/CommandWithUpgrade.php
+++ b/php/WP_CLI/CommandWithUpgrade.php
@@ -219,19 +219,12 @@ abstract class CommandWithUpgrade extends \WP_CLI_Command {
                }
        }
 
-       protected function _list( $_, $format ) {
+       protected function _list( $_, $assoc_args ) {
                $values = array(
                        'format' => 'table',
                        'fields' => $this->fields
                );
-
-               foreach ( $values as $key => &$value ) {
-                       if ( isset( $format[ $key ] ) ) {
-                               $value = $format[ $key ];
-                               unset( $format[ $key ] );
-                       }
-               }
-               unset( $value );
+               $values = wp_parse_args( $assoc_args, $values );
 
                $all_items = $this->get_all_items();
                $items = $this->create_objects( $all_items );

diff --git a/php/commands/post.php b/php/commands/post.php
index 1792830..7465cc5 100644 (file)
--- a/php/commands/post.php
+++ b/php/commands/post.php
@@ -168,14 +168,7 @@ class Post_Command extends \WP_CLI\CommandWithDBObject {
                        'format' => 'table',
                        'fields' => $this->fields
                );
-
-               foreach ( $values as $key => &$value ) {
-                       if ( isset( $assoc_args[ $key ] ) ) {
-                               $value = $assoc_args[ $key ];
-                               unset( $assoc_args[ $key ] );
-                       }
-               }
-               unset( $value );
+               $values = wp_parse_args( $assoc_args, $values );
 
                foreach ( $assoc_args as $key => $value ) {
                        if ( true === $value )