Skip to content

Commit cfdcc6d

Browse files
authored
Merge pull request #1546 from kirtangajjar/feature/ssl-off
✨️ Add feature to remove SSL from site command
2 parents 12e535d + 8484c2a commit cfdcc6d

File tree

2 files changed

+4
-10
lines changed

2 files changed

+4
-10
lines changed

php/EE/DocParser.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ public function get_param_desc( $key ) {
163163
* @return mixed|null
164164
*/
165165
public function get_param_args( $key ) {
166-
return $this->get_arg_or_param_args( "/^\[?--{$key}=.*/" );
166+
return $this->get_arg_or_param_args( "/^\[?--{$key}\[?=.*/" );
167167
}
168168

169169
/**

php/utils.php

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1737,13 +1737,12 @@ function random_name_generator() {
17371737
/**
17381738
* @param array $assoc_args Arguments array.
17391739
* @param string $flag Flag to get the value.
1740-
* @param array $supported_flag_values array of supported flag values.
17411740
* @param string $default_value default flag value if flag is passed without value.
17421741
*
17431742
* @return string
17441743
* @throws EE\ExitException
17451744
*/
1746-
function get_value_if_flag_isset( $assoc_args, $flag, $supported_flag_values = [], $default_value = '' ) {
1745+
function get_value_if_flag_isset( $assoc_args, $flag, $default_value = '' ) {
17471746

17481747
$flag_value = get_flag_value( $assoc_args, $flag );
17491748
$value = '';
@@ -1752,14 +1751,9 @@ function get_value_if_flag_isset( $assoc_args, $flag, $supported_flag_values = [
17521751
/**
17531752
* Set default flag value if flag is passed without value.
17541753
*/
1755-
$value = ( empty( $flag_value ) || true === $flag_value ) ? $default_value : $flag_value;
1756-
1757-
if ( empty( $value ) ) {
1758-
return $value;
1759-
} elseif ( ! in_array( $value, $supported_flag_values, true ) ) {
1760-
EE::error( sprintf( 'Invalid flag value passed %s', $value ) );
1761-
}
1754+
$value = ( ! empty( $default_value ) && ( empty( $flag_value ) || true === $flag_value ) ) ? $default_value : $flag_value;
17621755
}
1756+
17631757
return $value;
17641758
}
17651759

0 commit comments

Comments
 (0)