From 4fc145153689b3c8a38253bda5e974d7e56058d6 Mon Sep 17 00:00:00 2001 From: scribu Date: Fri, 29 Nov 2013 23:40:00 +0200 Subject: [PATCH] make validate_args() always return an array see #883 --- php/WP_CLI/Dispatcher/Subcommand.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php/WP_CLI/Dispatcher/Subcommand.php b/php/WP_CLI/Dispatcher/Subcommand.php index 41b7a135..8f112c86 100644 --- a/php/WP_CLI/Dispatcher/Subcommand.php +++ b/php/WP_CLI/Dispatcher/Subcommand.php @@ -146,10 +146,13 @@ class Subcommand extends CompositeCommand { return array( $args, $assoc_args ); } + /** + * @return array list of invalid $assoc_args keys to unset + */ private function validate_args( $args, $assoc_args, $extra_args ) { $synopsis = $this->get_synopsis(); if ( !$synopsis ) - return; + return array(); $validator = new \WP_CLI\SynopsisValidator( $synopsis ); -- 2.11.0