From 1ae554bbecebded595b2f05fd13c88205fbb8e8e Mon Sep 17 00:00:00 2001 From: scribu Date: Sat, 23 Nov 2013 12:23:32 +0200 Subject: [PATCH] runtime config can be set after file config --- php/WP_CLI/Runner.php | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/php/WP_CLI/Runner.php b/php/WP_CLI/Runner.php index 76e716f5..25f6c0b0 100644 --- a/php/WP_CLI/Runner.php +++ b/php/WP_CLI/Runner.php @@ -359,18 +359,25 @@ class Runner { private function init_config() { $configurator = \WP_CLI::get_configurator(); - list( $args, $assoc_args, $runtime_config ) = $configurator->parse_args( - array_slice( $GLOBALS['argv'], 1 ) ); + // File config + { + $this->global_config_path = self::get_global_config_path(); + $this->project_config_path = self::get_project_config_path(); - list( $this->arguments, $this->assoc_args ) = self::back_compat_conversions( - $args, $assoc_args ); + $configurator->merge_yml( $this->global_config_path ); + $configurator->merge_yml( $this->project_config_path ); + } + + // Runtime config and args + { + list( $args, $assoc_args, $runtime_config ) = $configurator->parse_args( + array_slice( $GLOBALS['argv'], 1 ) ); - $this->global_config_path = self::get_global_config_path(); - $this->project_config_path = self::get_project_config_path(); + list( $this->arguments, $this->assoc_args ) = self::back_compat_conversions( + $args, $assoc_args ); - $configurator->merge_yml( $this->global_config_path ); - $configurator->merge_yml( $this->project_config_path ); - $configurator->merge_array( $runtime_config ); + $configurator->merge_array( $runtime_config ); + } $this->config = $configurator->to_array(); -- 2.11.0