diff options
Diffstat (limited to 'crates/shirabe/src/console')
| -rw-r--r-- | crates/shirabe/src/console/application.rs | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/crates/shirabe/src/console/application.rs b/crates/shirabe/src/console/application.rs index c6674c77..5dff0e61 100644 --- a/crates/shirabe/src/console/application.rs +++ b/crates/shirabe/src/console/application.rs @@ -97,7 +97,7 @@ use shirabe_php_shim::{ LogicException as ShimLogicException, PHP_VERSION, PHP_VERSION_ID, PhpMixed, RuntimeException, bin2hex, chdir, date_default_timezone_get, date_default_timezone_set, defined, dirname, disk_free_space, extension_loaded, file_exists, file_get_contents, file_put_contents, - function_exists, getcwd, getmypid, glob, in_array, ini_set, is_array, is_dir, is_file, + function_exists, getcwd, getmypid, glob, in_array_strict, ini_set, is_array, is_dir, is_file, is_string, is_subclass_of, json_decode, memory_get_peak_usage, memory_get_usage, microtime, php_regex, php_uname, posix_getuid, random_bytes, realpath, restore_error_handler, round, str_contains, str_replace, strpos, strtoupper, sys_get_temp_dir, time, unlink, @@ -2081,17 +2081,14 @@ impl ApplicationHandle { ]; let use_parent_dir_if_no_json_available = application.borrow().get_use_parent_dir_config_value(); - let no_composer_json_commands_pm = PhpMixed::List( - no_composer_json_commands - .iter() - .map(|s| PhpMixed::String(s.clone())) - .collect(), - ); + let no_composer_json_commands_pm: Vec<PhpMixed> = no_composer_json_commands + .iter() + .map(|s| PhpMixed::String(s.clone())) + .collect(); if new_work_dir.is_none() - && !in_array( - command_name.as_deref().unwrap_or("").into(), + && !in_array_strict( + command_name.as_deref().unwrap_or(""), &no_composer_json_commands_pm, - true, ) && !file_exists(Factory::get_composer_file().unwrap_or_default()) && use_parent_dir_if_no_json_available.as_bool() != Some(false) @@ -2183,20 +2180,16 @@ impl ApplicationHandle { // avoid loading plugins/initializing the Composer instance earlier than necessary if no plugin command is needed // if showing the version, we never need plugin commands - let mnp_list = PhpMixed::List(vec![ + let mnp_list = vec![ PhpMixed::String("".to_string()), PhpMixed::String("list".to_string()), PhpMixed::String("help".to_string()), - ]); + ]; let may_need_plugin_command = !input .borrow() .has_parameter_option(PhpMixed::from(vec!["--version", "-V"]), false) && (command_name.is_none() - || in_array( - command_name.as_deref().unwrap_or("").into(), - &mnp_list, - true, - ) + || in_array_strict(command_name.as_deref().unwrap_or(""), &mnp_list) || (command_name.as_deref() == Some("_complete") && !is_non_allowed_root)); let may_need_script_command = may_need_plugin_command |