From 0ba53993a2a0ba3dd12d1a411d59a257fb913bce Mon Sep 17 00:00:00 2001 From: "Florin T. Radica" Date: Wed, 29 Jan 2025 12:34:45 +0000 Subject: [PATCH 1/2] Make default_selector a fallback rather than an override (#3950) (#4009) --- src/Command/SelectCommand.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Command/SelectCommand.php b/src/Command/SelectCommand.php index 23a07a7c8..a5d4328a9 100644 --- a/src/Command/SelectCommand.php +++ b/src/Command/SelectCommand.php @@ -51,7 +51,8 @@ protected function selectHosts(Input $input, Output $output): array if (!$output->isDecorated() && !defined('NO_ANSI')) { define('NO_ANSI', 'true'); } - $selector = Deployer::get()->config->get('default_selector', $input->getArgument('selector')); + $selector = $input->getArgument('selector'); + $selector = empty($selector) ? Deployer::get()->config->get('default_selector') : $selector; $selectExpression = is_array($selector) ? implode(',', $selector) : $selector; if (empty($selectExpression)) { From 6a451b7f526680a012a78cb7fc7ac06f35b89652 Mon Sep 17 00:00:00 2001 From: "Florin T. Radica" Date: Thu, 30 Jan 2025 17:01:21 +0000 Subject: [PATCH 2/2] Set default for default_selector (#4011) --- src/Command/SelectCommand.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Command/SelectCommand.php b/src/Command/SelectCommand.php index a5d4328a9..7445e7768 100644 --- a/src/Command/SelectCommand.php +++ b/src/Command/SelectCommand.php @@ -52,7 +52,7 @@ protected function selectHosts(Input $input, Output $output): array define('NO_ANSI', 'true'); } $selector = $input->getArgument('selector'); - $selector = empty($selector) ? Deployer::get()->config->get('default_selector') : $selector; + $selector = empty($selector) ? Deployer::get()->config->get('default_selector', '') : $selector; $selectExpression = is_array($selector) ? implode(',', $selector) : $selector; if (empty($selectExpression)) {