diff options
Diffstat (limited to 'crates/shirabe/src/command')
37 files changed, 268 insertions, 278 deletions
diff --git a/crates/shirabe/src/command/about_command.rs b/crates/shirabe/src/command/about_command.rs index 764ecf5f..0d680727 100644 --- a/crates/shirabe/src/command/about_command.rs +++ b/crates/shirabe/src/command/about_command.rs @@ -4,10 +4,10 @@ use crate::command::BaseCommand; use crate::command::BaseCommandData; use crate::command::base_command::base_command_initialize; use crate::composer; -use shirabe_external_packages::symfony::console::command::command::Command; -use shirabe_external_packages::symfony::console::input::InputInterface; -use shirabe_external_packages::symfony::console::output::OutputInterface; use shirabe_php_shim::impl_php_class; +use shirabe_symfony_console::command::command::Command; +use shirabe_symfony_console::input::InputInterface; +use shirabe_symfony_console::output::OutputInterface; #[derive(Debug)] pub struct AboutCommand { @@ -69,13 +69,13 @@ impl Command for AboutCommand { fn complete( &self, - input: &shirabe_external_packages::symfony::console::completion::completion_input::CompletionInput, - suggestions: &mut shirabe_external_packages::symfony::console::completion::completion_suggestions::CompletionSuggestions, + input: &shirabe_symfony_console::completion::completion_input::CompletionInput, + suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions, ) -> anyhow::Result<()> { crate::command::base_command::base_command_complete(self, input, suggestions) } - shirabe_external_packages::delegate_command_trait_impls_to_inner!(base_command_data); + shirabe_symfony_console::delegate_command_trait_impls_to_inner!(base_command_data); } impl BaseCommand for AboutCommand { diff --git a/crates/shirabe/src/command/archive_command.rs b/crates/shirabe/src/command/archive_command.rs index 659ab9c2..d863b8b3 100644 --- a/crates/shirabe/src/command/archive_command.rs +++ b/crates/shirabe/src/command/archive_command.rs @@ -26,11 +26,11 @@ use crate::util::Platform; use crate::util::ProcessExecutor; use crate::util::r#loop::Loop; use indexmap::IndexMap; -use shirabe_external_packages::symfony::console::command::command::Command; -use shirabe_external_packages::symfony::console::input::InputInterface; -use shirabe_external_packages::symfony::console::output::OutputInterface; use shirabe_pcre::{CaptureKey, Preg}; use shirabe_php_shim::{LogicException, get_debug_type, impl_php_class, php_regex}; +use shirabe_symfony_console::command::command::Command; +use shirabe_symfony_console::input::InputInterface; +use shirabe_symfony_console::output::OutputInterface; #[derive(Debug)] pub struct ArchiveCommand { @@ -451,13 +451,13 @@ impl Command for ArchiveCommand { fn complete( &self, - input: &shirabe_external_packages::symfony::console::completion::completion_input::CompletionInput, - suggestions: &mut shirabe_external_packages::symfony::console::completion::completion_suggestions::CompletionSuggestions, + input: &shirabe_symfony_console::completion::completion_input::CompletionInput, + suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions, ) -> anyhow::Result<()> { crate::command::base_command::base_command_complete(self, input, suggestions) } - shirabe_external_packages::delegate_command_trait_impls_to_inner!(base_command_data); + shirabe_symfony_console::delegate_command_trait_impls_to_inner!(base_command_data); } impl BaseCommand for ArchiveCommand { diff --git a/crates/shirabe/src/command/audit_command.rs b/crates/shirabe/src/command/audit_command.rs index 268984d6..c631a870 100644 --- a/crates/shirabe/src/command/audit_command.rs +++ b/crates/shirabe/src/command/audit_command.rs @@ -13,13 +13,13 @@ use crate::repository::InstalledRepository; use crate::repository::RepositoryInterface; use crate::repository::RepositorySet; use crate::repository::RepositoryUtils; -use shirabe_external_packages::symfony::console::command::command::Command; -use shirabe_external_packages::symfony::console::input::InputInterface; -use shirabe_external_packages::symfony::console::output::OutputInterface; use shirabe_php_shim::{ InvalidArgumentException, PhpMixed, UnexpectedValueException, impl_php_class, implode, in_array_strict, }; +use shirabe_symfony_console::command::command::Command; +use shirabe_symfony_console::input::InputInterface; +use shirabe_symfony_console::output::OutputInterface; #[derive(Debug)] pub struct AuditCommand { @@ -287,13 +287,13 @@ impl Command for AuditCommand { fn complete( &self, - input: &shirabe_external_packages::symfony::console::completion::completion_input::CompletionInput, - suggestions: &mut shirabe_external_packages::symfony::console::completion::completion_suggestions::CompletionSuggestions, + input: &shirabe_symfony_console::completion::completion_input::CompletionInput, + suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions, ) -> anyhow::Result<()> { crate::command::base_command::base_command_complete(self, input, suggestions) } - shirabe_external_packages::delegate_command_trait_impls_to_inner!(base_command_data); + shirabe_symfony_console::delegate_command_trait_impls_to_inner!(base_command_data); } impl BaseCommand for AuditCommand { diff --git a/crates/shirabe/src/command/base_command.rs b/crates/shirabe/src/command/base_command.rs index a1de9783..ceb71bf1 100644 --- a/crates/shirabe/src/command/base_command.rs +++ b/crates/shirabe/src/command/base_command.rs @@ -18,18 +18,16 @@ use crate::plugin::PluginEvents; use crate::plugin::PreCommandRunEvent; use crate::util::Platform; use indexmap::IndexMap; -use shirabe_external_packages::symfony::console::Terminal; -use shirabe_external_packages::symfony::console::command::command::{ - Command, CommandData, SetDefinitionArg, -}; -use shirabe_external_packages::symfony::console::helper::Table; -use shirabe_external_packages::symfony::console::helper::TableSeparator; -use shirabe_external_packages::symfony::console::input::InputInterface; -use shirabe_external_packages::symfony::console::output::OutputInterface; use shirabe_php_shim::{ InvalidArgumentException, LogicException, PhpClass, PhpMixed, RuntimeException, UnexpectedValueException, count, explode, in_array_strict, is_string, }; +use shirabe_symfony_console::Terminal; +use shirabe_symfony_console::command::command::{Command, CommandData, SetDefinitionArg}; +use shirabe_symfony_console::helper::Table; +use shirabe_symfony_console::helper::TableSeparator; +use shirabe_symfony_console::input::InputInterface; +use shirabe_symfony_console::output::OutputInterface; pub const SUCCESS: i64 = 0; pub const FAILURE: i64 = 1; @@ -251,26 +249,26 @@ pub trait BaseCommand: Command { #[macro_export] macro_rules! delegate_base_command_trait_impls_to_inner { ($field:ident) => { - shirabe_external_packages::delegate_to_inner!($field, fn require_composer(&self, disable_plugins: Option<bool>, disable_scripts: Option<bool>) -> anyhow::Result<$crate::composer::PartialComposerHandle>); - shirabe_external_packages::delegate_to_inner!($field, fn try_composer(&self, disable_plugins: Option<bool>, disable_scripts: Option<bool>) -> Option<$crate::composer::PartialComposerHandle>); - shirabe_external_packages::delegate_to_inner!($field, fn set_composer(&self, composer: $crate::composer::PartialComposerHandle)); - shirabe_external_packages::delegate_to_inner!($field, fn reset_composer(&self) -> anyhow::Result<()>); - shirabe_external_packages::delegate_to_inner!($field, fn get_io(&self) -> std::rc::Rc<std::cell::RefCell<dyn $crate::io::IOInterface>>); - shirabe_external_packages::delegate_to_inner!($field, fn set_io(&self, io: std::rc::Rc<std::cell::RefCell<dyn $crate::io::IOInterface>>)); - shirabe_external_packages::delegate_to_inner!($field, fn create_composer_instance(&self, input: std::rc::Rc<std::cell::RefCell<dyn shirabe_external_packages::symfony::console::input::InputInterface>>, io: std::rc::Rc<std::cell::RefCell<dyn $crate::io::IOInterface>>, config: Option<indexmap::IndexMap<String, shirabe_php_shim::PhpMixed>>, disable_plugins: bool, disable_scripts: Option<bool>) -> anyhow::Result<$crate::composer::PartialComposerHandle>); - shirabe_external_packages::delegate_to_inner!($field, fn get_preferred_install_options(&self, config: &$crate::config::Config, input: std::rc::Rc<std::cell::RefCell<dyn shirabe_external_packages::symfony::console::input::InputInterface>>, keep_vcs_requires_prefer_source: bool) -> anyhow::Result<(bool, bool)>); - shirabe_external_packages::delegate_to_inner!($field, fn get_platform_requirement_filter(&self, input: std::rc::Rc<std::cell::RefCell<dyn shirabe_external_packages::symfony::console::input::InputInterface>>) -> anyhow::Result<std::rc::Rc<dyn $crate::filter::platform_requirement_filter::PlatformRequirementFilterInterface>>); - shirabe_external_packages::delegate_to_inner!($field, fn format_requirements(&self, requirements: Vec<String>) -> anyhow::Result<indexmap::IndexMap<String, String>>); - shirabe_external_packages::delegate_to_inner!($field, fn normalize_requirements(&self, requirements: Vec<String>) -> anyhow::Result<Vec<indexmap::IndexMap<String, String>>>); - shirabe_external_packages::delegate_to_inner!($field, fn render_table(&self, table: Vec<shirabe_php_shim::PhpMixed>, output: std::rc::Rc<std::cell::RefCell<dyn shirabe_external_packages::symfony::console::output::OutputInterface>>)); - shirabe_external_packages::delegate_to_inner!($field, fn get_terminal_width(&self) -> i64); - shirabe_external_packages::delegate_to_inner!($field, fn get_audit_format(&self, input: std::rc::Rc<std::cell::RefCell<dyn shirabe_external_packages::symfony::console::input::InputInterface>>, opt_name: &str) -> anyhow::Result<String>); - shirabe_external_packages::delegate_to_inner!($field, fn create_audit_config(&self, config: &mut $crate::config::Config, input: std::rc::Rc<std::cell::RefCell<dyn shirabe_external_packages::symfony::console::input::InputInterface>>) -> anyhow::Result<$crate::advisory::AuditConfig>); + shirabe_symfony_console::delegate_to_inner!($field, fn require_composer(&self, disable_plugins: Option<bool>, disable_scripts: Option<bool>) -> anyhow::Result<$crate::composer::PartialComposerHandle>); + shirabe_symfony_console::delegate_to_inner!($field, fn try_composer(&self, disable_plugins: Option<bool>, disable_scripts: Option<bool>) -> Option<$crate::composer::PartialComposerHandle>); + shirabe_symfony_console::delegate_to_inner!($field, fn set_composer(&self, composer: $crate::composer::PartialComposerHandle)); + shirabe_symfony_console::delegate_to_inner!($field, fn reset_composer(&self) -> anyhow::Result<()>); + shirabe_symfony_console::delegate_to_inner!($field, fn get_io(&self) -> std::rc::Rc<std::cell::RefCell<dyn $crate::io::IOInterface>>); + shirabe_symfony_console::delegate_to_inner!($field, fn set_io(&self, io: std::rc::Rc<std::cell::RefCell<dyn $crate::io::IOInterface>>)); + shirabe_symfony_console::delegate_to_inner!($field, fn create_composer_instance(&self, input: std::rc::Rc<std::cell::RefCell<dyn shirabe_symfony_console::input::InputInterface>>, io: std::rc::Rc<std::cell::RefCell<dyn $crate::io::IOInterface>>, config: Option<indexmap::IndexMap<String, shirabe_php_shim::PhpMixed>>, disable_plugins: bool, disable_scripts: Option<bool>) -> anyhow::Result<$crate::composer::PartialComposerHandle>); + shirabe_symfony_console::delegate_to_inner!($field, fn get_preferred_install_options(&self, config: &$crate::config::Config, input: std::rc::Rc<std::cell::RefCell<dyn shirabe_symfony_console::input::InputInterface>>, keep_vcs_requires_prefer_source: bool) -> anyhow::Result<(bool, bool)>); + shirabe_symfony_console::delegate_to_inner!($field, fn get_platform_requirement_filter(&self, input: std::rc::Rc<std::cell::RefCell<dyn shirabe_symfony_console::input::InputInterface>>) -> anyhow::Result<std::rc::Rc<dyn $crate::filter::platform_requirement_filter::PlatformRequirementFilterInterface>>); + shirabe_symfony_console::delegate_to_inner!($field, fn format_requirements(&self, requirements: Vec<String>) -> anyhow::Result<indexmap::IndexMap<String, String>>); + shirabe_symfony_console::delegate_to_inner!($field, fn normalize_requirements(&self, requirements: Vec<String>) -> anyhow::Result<Vec<indexmap::IndexMap<String, String>>>); + shirabe_symfony_console::delegate_to_inner!($field, fn render_table(&self, table: Vec<shirabe_php_shim::PhpMixed>, output: std::rc::Rc<std::cell::RefCell<dyn shirabe_symfony_console::output::OutputInterface>>)); + shirabe_symfony_console::delegate_to_inner!($field, fn get_terminal_width(&self) -> i64); + shirabe_symfony_console::delegate_to_inner!($field, fn get_audit_format(&self, input: std::rc::Rc<std::cell::RefCell<dyn shirabe_symfony_console::input::InputInterface>>, opt_name: &str) -> anyhow::Result<String>); + shirabe_symfony_console::delegate_to_inner!($field, fn create_audit_config(&self, config: &mut $crate::config::Config, input: std::rc::Rc<std::cell::RefCell<dyn shirabe_symfony_console::input::InputInterface>>) -> anyhow::Result<$crate::advisory::AuditConfig>); }; } impl Command for BaseCommandData { - shirabe_external_packages::delegate_command_trait_impls_to_inner!(inner); + shirabe_symfony_console::delegate_command_trait_impls_to_inner!(inner); } impl PhpClass for BaseCommandData { @@ -299,7 +297,8 @@ impl BaseCommand for BaseCommandData { }; let composer = { let mut app_ref = application.borrow_mut(); - let app_dyn: &mut dyn shirabe_external_packages::symfony::console::application::Application = &mut *app_ref; + let app_dyn: &mut dyn shirabe_symfony_console::application::Application = + &mut *app_ref; let app = app_dyn .as_any_mut() .downcast_mut::<Application>() @@ -326,7 +325,8 @@ impl BaseCommand for BaseCommandData { { let result = { let mut app_ref = application.borrow_mut(); - let app_dyn: &mut dyn shirabe_external_packages::symfony::console::application::Application = &mut *app_ref; + let app_dyn: &mut dyn shirabe_symfony_console::application::Application = + &mut *app_ref; let app = app_dyn .as_any_mut() .downcast_mut::<Application>() @@ -349,7 +349,7 @@ impl BaseCommand for BaseCommandData { *self.composer.borrow_mut() = None; if let Some(application) = self.get_application() { let mut app_ref = application.borrow_mut(); - let app_dyn: &mut dyn shirabe_external_packages::symfony::console::application::Application = &mut *app_ref; + let app_dyn: &mut dyn shirabe_symfony_console::application::Application = &mut *app_ref; let app = app_dyn .as_any_mut() .downcast_mut::<Application>() @@ -365,7 +365,8 @@ impl BaseCommand for BaseCommandData { Some(application) => { let io = { let app_ref = application.borrow(); - let app_dyn: &dyn shirabe_external_packages::symfony::console::application::Application = &*app_ref; + let app_dyn: &dyn shirabe_symfony_console::application::Application = + &*app_ref; let app = app_dyn .as_any() .downcast_ref::<Application>() @@ -717,19 +718,14 @@ impl BaseCommand for BaseCommandData { /// (same for `getDisableScriptsByDefault()`), ORed into the caller's flags. fn apply_application_defaults( application: Option< - std::rc::Rc< - std::cell::RefCell< - dyn shirabe_external_packages::symfony::console::application::Application, - >, - >, + std::rc::Rc<std::cell::RefCell<dyn shirabe_symfony_console::application::Application>>, >, mut disable_plugins: bool, mut disable_scripts: bool, ) -> (bool, bool) { if let Some(application) = application { let app_ref = application.borrow(); - let app_dyn: &dyn shirabe_external_packages::symfony::console::application::Application = - &*app_ref; + let app_dyn: &dyn shirabe_symfony_console::application::Application = &*app_ref; let app = app_dyn .as_any() .downcast_ref::<Application>() @@ -745,10 +741,10 @@ fn apply_application_defaults( /// each command's `Command::complete` forwards here. pub fn base_command_complete( cmd: &dyn BaseCommand, - input: &shirabe_external_packages::symfony::console::completion::completion_input::CompletionInput, - suggestions: &mut shirabe_external_packages::symfony::console::completion::completion_suggestions::CompletionSuggestions, + input: &shirabe_symfony_console::completion::completion_input::CompletionInput, + suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions, ) -> anyhow::Result<()> { - use shirabe_external_packages::symfony::console::completion::completion_input::CompletionInput; + use shirabe_symfony_console::completion::completion_input::CompletionInput; // PHP: (string) $input->getCompletionName() let name = input.get_completion_name().unwrap_or_default(); diff --git a/crates/shirabe/src/command/base_config_command.rs b/crates/shirabe/src/command/base_config_command.rs index a2a51d4b..3be49394 100644 --- a/crates/shirabe/src/command/base_config_command.rs +++ b/crates/shirabe/src/command/base_config_command.rs @@ -9,9 +9,9 @@ use crate::json::JsonFile; use crate::util::Platform; use crate::util::Silencer; use indexmap::IndexMap; -use shirabe_external_packages::symfony::console::input::InputInterface; -use shirabe_external_packages::symfony::console::output::OutputInterface; use shirabe_php_shim::{PhpMixed, chmod, touch}; +use shirabe_symfony_console::input::InputInterface; +use shirabe_symfony_console::output::OutputInterface; pub trait BaseConfigCommand: BaseCommand { fn config(&self) -> Option<std::rc::Rc<std::cell::RefCell<Config>>>; diff --git a/crates/shirabe/src/command/base_dependency_command.rs b/crates/shirabe/src/command/base_dependency_command.rs index e46cac8c..6dc049ff 100644 --- a/crates/shirabe/src/command/base_dependency_command.rs +++ b/crates/shirabe/src/command/base_dependency_command.rs @@ -14,13 +14,13 @@ use crate::repository::{DependentsEntry, InstalledRepository, NeedleInput}; use crate::repository::{FindPackageConstraint, RepositoryInterface}; use crate::util::PackageInfo; use indexmap::IndexMap; -use shirabe_external_packages::symfony::console::formatter::OutputFormatter; -use shirabe_external_packages::symfony::console::formatter::OutputFormatterStyle; -use shirabe_external_packages::symfony::console::input::InputInterface; -use shirabe_external_packages::symfony::console::output::OutputInterface; use shirabe_php_shim::{InvalidArgumentException, PhpMixed, UnexpectedValueException}; use shirabe_semver::constraint::AnyConstraint; use shirabe_semver::constraint::Bound; +use shirabe_symfony_console::formatter::OutputFormatter; +use shirabe_symfony_console::formatter::OutputFormatterStyle; +use shirabe_symfony_console::input::InputInterface; +use shirabe_symfony_console::output::OutputInterface; pub const ARGUMENT_PACKAGE: &str = "package"; pub const ARGUMENT_CONSTRAINT: &str = "version"; @@ -90,7 +90,7 @@ pub trait BaseDependencyCommand: BaseCommand { { output.borrow().writeln( &["<warning>No dependencies installed. Try running composer install or update, or use --locked.</warning>".to_string()], - shirabe_external_packages::symfony::console::output::OUTPUT_NORMAL, + shirabe_symfony_console::output::OUTPUT_NORMAL, ); return Ok(1); diff --git a/crates/shirabe/src/command/bump_command.rs b/crates/shirabe/src/command/bump_command.rs index 63793c8a..99761b18 100644 --- a/crates/shirabe/src/command/bump_command.rs +++ b/crates/shirabe/src/command/bump_command.rs @@ -16,14 +16,14 @@ use crate::package::version::VersionBumper; use crate::repository::PlatformRepository; use crate::util::Filesystem; use crate::util::Silencer; -use shirabe_external_packages::symfony::console::command::command::Command; -use shirabe_external_packages::symfony::console::input::InputInterface; -use shirabe_external_packages::symfony::console::output::OutputInterface; use shirabe_pcre::Preg; use shirabe_php_shim::{ PhpMixed, file_get_contents, file_put_contents, impl_php_class, is_writable, php_regex, strtolower, }; +use shirabe_symfony_console::command::command::Command; +use shirabe_symfony_console::input::InputInterface; +use shirabe_symfony_console::output::OutputInterface; #[derive(Debug)] pub struct BumpCommand { @@ -442,13 +442,13 @@ impl Command for BumpCommand { fn complete( &self, - input: &shirabe_external_packages::symfony::console::completion::completion_input::CompletionInput, - suggestions: &mut shirabe_external_packages::symfony::console::completion::completion_suggestions::CompletionSuggestions, + input: &shirabe_symfony_console::completion::completion_input::CompletionInput, + suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions, ) -> anyhow::Result<()> { crate::command::base_command::base_command_complete(self, input, suggestions) } - shirabe_external_packages::delegate_command_trait_impls_to_inner!(base_command_data); + shirabe_symfony_console::delegate_command_trait_impls_to_inner!(base_command_data); } impl BaseCommand for BumpCommand { diff --git a/crates/shirabe/src/command/check_platform_reqs_command.rs b/crates/shirabe/src/command/check_platform_reqs_command.rs index 4e105e69..b69f4190 100644 --- a/crates/shirabe/src/command/check_platform_reqs_command.rs +++ b/crates/shirabe/src/command/check_platform_reqs_command.rs @@ -12,12 +12,12 @@ use crate::repository::PlatformRepository; use crate::repository::RepositoryInterface; use crate::repository::RootPackageRepository; use indexmap::IndexMap; -use shirabe_external_packages::symfony::console::command::command::Command; -use shirabe_external_packages::symfony::console::input::InputInterface; -use shirabe_external_packages::symfony::console::output::OutputInterface; use shirabe_php_shim::{PhpMixed, array_merge_map, impl_php_class, strip_tags}; use shirabe_semver::constraint::AnyConstraint; use shirabe_semver::constraint::SimpleConstraint; +use shirabe_symfony_console::command::command::Command; +use shirabe_symfony_console::input::InputInterface; +use shirabe_symfony_console::output::OutputInterface; struct CheckResult { platform_package: String, @@ -413,13 +413,13 @@ impl Command for CheckPlatformReqsCommand { fn complete( &self, - input: &shirabe_external_packages::symfony::console::completion::completion_input::CompletionInput, - suggestions: &mut shirabe_external_packages::symfony::console::completion::completion_suggestions::CompletionSuggestions, + input: &shirabe_symfony_console::completion::completion_input::CompletionInput, + suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions, ) -> anyhow::Result<()> { crate::command::base_command::base_command_complete(self, input, suggestions) } - shirabe_external_packages::delegate_command_trait_impls_to_inner!(base_command_data); + shirabe_symfony_console::delegate_command_trait_impls_to_inner!(base_command_data); } impl BaseCommand for CheckPlatformReqsCommand { diff --git a/crates/shirabe/src/command/clear_cache_command.rs b/crates/shirabe/src/command/clear_cache_command.rs index 430352b9..fcc237af 100644 --- a/crates/shirabe/src/command/clear_cache_command.rs +++ b/crates/shirabe/src/command/clear_cache_command.rs @@ -8,10 +8,10 @@ use crate::config::Config; use crate::console::input::InputOption; use crate::factory::Factory; use crate::io::IOInterfaceImmutable; -use shirabe_external_packages::symfony::console::command::command::Command; -use shirabe_external_packages::symfony::console::input::InputInterface; -use shirabe_external_packages::symfony::console::output::OutputInterface; use shirabe_php_shim::{impl_php_class, realpath}; +use shirabe_symfony_console::command::command::Command; +use shirabe_symfony_console::input::InputInterface; +use shirabe_symfony_console::output::OutputInterface; #[derive(Debug)] pub struct ClearCacheCommand { @@ -188,13 +188,13 @@ impl Command for ClearCacheCommand { fn complete( &self, - input: &shirabe_external_packages::symfony::console::completion::completion_input::CompletionInput, - suggestions: &mut shirabe_external_packages::symfony::console::completion::completion_suggestions::CompletionSuggestions, + input: &shirabe_symfony_console::completion::completion_input::CompletionInput, + suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions, ) -> anyhow::Result<()> { crate::command::base_command::base_command_complete(self, input, suggestions) } - shirabe_external_packages::delegate_command_trait_impls_to_inner!(base_command_data); + shirabe_symfony_console::delegate_command_trait_impls_to_inner!(base_command_data); } impl BaseCommand for ClearCacheCommand { diff --git a/crates/shirabe/src/command/config_command.rs b/crates/shirabe/src/command/config_command.rs index a1e332be..a0660aca 100644 --- a/crates/shirabe/src/command/config_command.rs +++ b/crates/shirabe/src/command/config_command.rs @@ -18,9 +18,6 @@ use crate::util::Filesystem; use crate::util::Platform; use crate::util::Silencer; use indexmap::IndexMap; -use shirabe_external_packages::symfony::console::command::command::Command; -use shirabe_external_packages::symfony::console::input::InputInterface; -use shirabe_external_packages::symfony::console::output::OutputInterface; use shirabe_pcre::{CaptureKey, Preg}; use shirabe_php_shim::{ InvalidArgumentException, PhpMixed, RuntimeException, array_is_list, array_merge, @@ -29,6 +26,9 @@ use shirabe_php_shim::{ php_regex, str_replace, strpos, strtolower, system, touch, var_export, }; use shirabe_semver::VersionParser; +use shirabe_symfony_console::command::command::Command; +use shirabe_symfony_console::input::InputInterface; +use shirabe_symfony_console::output::OutputInterface; #[derive(Debug)] pub struct ConfigCommand { @@ -333,9 +333,7 @@ impl ConfigCommand { // PHP passes the CompletionInput itself; the accessors only read from it, so a // clone behind a fresh handle is equivalent. let input_handle: std::rc::Rc< - std::cell::RefCell< - dyn shirabe_external_packages::symfony::console::input::InputInterface, - >, + std::cell::RefCell<dyn shirabe_symfony_console::input::InputInterface>, > = std::rc::Rc::new(std::cell::RefCell::new(input.clone())); // initialize configuration @@ -1580,13 +1578,13 @@ impl Command for ConfigCommand { fn complete( &self, - input: &shirabe_external_packages::symfony::console::completion::completion_input::CompletionInput, - suggestions: &mut shirabe_external_packages::symfony::console::completion::completion_suggestions::CompletionSuggestions, + input: &shirabe_symfony_console::completion::completion_input::CompletionInput, + suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions, ) -> anyhow::Result<()> { crate::command::base_command::base_command_complete(self, input, suggestions) } - shirabe_external_packages::delegate_command_trait_impls_to_inner!(base_command_data); + shirabe_symfony_console::delegate_command_trait_impls_to_inner!(base_command_data); } impl BaseCommand for ConfigCommand { diff --git a/crates/shirabe/src/command/create_project_command.rs b/crates/shirabe/src/command/create_project_command.rs index 7a11e44e..a0a4aa2e 100644 --- a/crates/shirabe/src/command/create_project_command.rs +++ b/crates/shirabe/src/command/create_project_command.rs @@ -37,9 +37,6 @@ use crate::util::Platform; use crate::util::ProcessExecutor; use indexmap::IndexMap; use shirabe_external_packages::seld::signal::SignalHandler; -use shirabe_external_packages::symfony::console::command::command::Command; -use shirabe_external_packages::symfony::console::input::InputInterface; -use shirabe_external_packages::symfony::console::output::OutputInterface; use shirabe_pcre::{CaptureKey, Preg}; use shirabe_php_shim::Catch as _; use shirabe_php_shim::{ @@ -47,6 +44,9 @@ use shirabe_php_shim::{ chdir, explode_with_limit, file_exists, getcwd, impl_php_class, implode, is_dir, is_file, mkdir, realpath, rtrim, strtolower, unlink, }; +use shirabe_symfony_console::command::command::Command; +use shirabe_symfony_console::input::InputInterface; +use shirabe_symfony_console::output::OutputInterface; use shirabe_symfony_finder::Finder; use std::path::PathBuf; @@ -1021,13 +1021,13 @@ impl Command for CreateProjectCommand { fn complete( &self, - input: &shirabe_external_packages::symfony::console::completion::completion_input::CompletionInput, - suggestions: &mut shirabe_external_packages::symfony::console::completion::completion_suggestions::CompletionSuggestions, + input: &shirabe_symfony_console::completion::completion_input::CompletionInput, + suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions, ) -> anyhow::Result<()> { crate::command::base_command::base_command_complete(self, input, suggestions) } - shirabe_external_packages::delegate_command_trait_impls_to_inner!(base_command_data); + shirabe_symfony_console::delegate_command_trait_impls_to_inner!(base_command_data); } impl BaseCommand for CreateProjectCommand { diff --git a/crates/shirabe/src/command/depends_command.rs b/crates/shirabe/src/command/depends_command.rs index 974e55b1..7ffa9281 100644 --- a/crates/shirabe/src/command/depends_command.rs +++ b/crates/shirabe/src/command/depends_command.rs @@ -7,10 +7,10 @@ use crate::command::CompletionTrait; use crate::command::base_command::base_command_initialize; use crate::console::input::InputArgument; use crate::console::input::InputOption; -use shirabe_external_packages::symfony::console::command::command::Command; -use shirabe_external_packages::symfony::console::input::InputInterface; -use shirabe_external_packages::symfony::console::output::OutputInterface; use shirabe_php_shim::impl_php_class; +use shirabe_symfony_console::command::command::Command; +use shirabe_symfony_console::input::InputInterface; +use shirabe_symfony_console::output::OutputInterface; #[derive(Debug)] pub struct DependsCommand { @@ -119,13 +119,13 @@ impl Command for DependsCommand { fn complete( &self, - input: &shirabe_external_packages::symfony::console::completion::completion_input::CompletionInput, - suggestions: &mut shirabe_external_packages::symfony::console::completion::completion_suggestions::CompletionSuggestions, + input: &shirabe_symfony_console::completion::completion_input::CompletionInput, + suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions, ) -> anyhow::Result<()> { crate::command::base_command::base_command_complete(self, input, suggestions) } - shirabe_external_packages::delegate_command_trait_impls_to_inner!(base_command_data); + shirabe_symfony_console::delegate_command_trait_impls_to_inner!(base_command_data); } impl BaseCommand for DependsCommand { diff --git a/crates/shirabe/src/command/diagnose_command.rs b/crates/shirabe/src/command/diagnose_command.rs index b6b1ffad..eade37fc 100644 --- a/crates/shirabe/src/command/diagnose_command.rs +++ b/crates/shirabe/src/command/diagnose_command.rs @@ -33,9 +33,6 @@ use crate::util::ProcessExecutor; use crate::util::http::ProxyManager; use crate::util::http::RequestProxy; use indexmap::IndexMap; -use shirabe_external_packages::symfony::console::command::command::Command; -use shirabe_external_packages::symfony::console::input::InputInterface; -use shirabe_external_packages::symfony::console::output::OutputInterface; use shirabe_pcre::{CaptureKey, Preg}; use shirabe_php_shim::Catch as _; use shirabe_php_shim::{ @@ -44,6 +41,9 @@ use shirabe_php_shim::{ is_string, php_regex, rtrim, str_contains, str_replace, str_starts_with, strpos, strstr, strstr3, strtolower, trim, version_compare, }; +use shirabe_symfony_console::command::command::Command; +use shirabe_symfony_console::input::InputInterface; +use shirabe_symfony_console::output::OutputInterface; use shirabe_symfony_process::ExecutableFinder; #[derive(Debug)] @@ -634,13 +634,12 @@ impl DiagnoseCommand { )?); repo_set.add_repository(composer_repo_as_repo)?; - let io: std::rc::Rc<std::cell::RefCell<dyn IOInterface>> = std::rc::Rc::new( - std::cell::RefCell::new(BufferIO::new( + let io: std::rc::Rc<std::cell::RefCell<dyn IOInterface>> = + std::rc::Rc::new(std::cell::RefCell::new(BufferIO::new( String::new(), - shirabe_external_packages::symfony::console::output::output_interface::VERBOSITY_NORMAL, + shirabe_symfony_console::output::output_interface::VERBOSITY_NORMAL, None, - )?), - ); + )?)); let result = match auditor.audit( &io, &repo_set, @@ -1503,13 +1502,13 @@ impl Command for DiagnoseCommand { fn complete( &self, - input: &shirabe_external_packages::symfony::console::completion::completion_input::CompletionInput, - suggestions: &mut shirabe_external_packages::symfony::console::completion::completion_suggestions::CompletionSuggestions, + input: &shirabe_symfony_console::completion::completion_input::CompletionInput, + suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions, ) -> anyhow::Result<()> { crate::command::base_command::base_command_complete(self, input, suggestions) } - shirabe_external_packages::delegate_command_trait_impls_to_inner!(base_command_data); + shirabe_symfony_console::delegate_command_trait_impls_to_inner!(base_command_data); } impl BaseCommand for DiagnoseCommand { diff --git a/crates/shirabe/src/command/dump_autoload_command.rs b/crates/shirabe/src/command/dump_autoload_command.rs index f9be4cff..8bf491cb 100644 --- a/crates/shirabe/src/command/dump_autoload_command.rs +++ b/crates/shirabe/src/command/dump_autoload_command.rs @@ -7,10 +7,10 @@ use crate::console::input::InputOption; use crate::io::IOInterfaceImmutable; use crate::plugin::CommandEvent; use crate::plugin::PluginEvents; -use shirabe_external_packages::symfony::console::command::command::Command; -use shirabe_external_packages::symfony::console::input::InputInterface; -use shirabe_external_packages::symfony::console::output::OutputInterface; use shirabe_php_shim::{InvalidArgumentException, PhpMixed, file_exists, impl_php_class}; +use shirabe_symfony_console::command::command::Command; +use shirabe_symfony_console::input::InputInterface; +use shirabe_symfony_console::output::OutputInterface; #[derive(Debug)] pub struct DumpAutoloadCommand { @@ -303,13 +303,13 @@ impl Command for DumpAutoloadCommand { fn complete( &self, - input: &shirabe_external_packages::symfony::console::completion::completion_input::CompletionInput, - suggestions: &mut shirabe_external_packages::symfony::console::completion::completion_suggestions::CompletionSuggestions, + input: &shirabe_symfony_console::completion::completion_input::CompletionInput, + suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions, ) -> anyhow::Result<()> { crate::command::base_command::base_command_complete(self, input, suggestions) } - shirabe_external_packages::delegate_command_trait_impls_to_inner!(base_command_data); + shirabe_symfony_console::delegate_command_trait_impls_to_inner!(base_command_data); } impl BaseCommand for DumpAutoloadCommand { diff --git a/crates/shirabe/src/command/exec_command.rs b/crates/shirabe/src/command/exec_command.rs index 61391117..e5825e3b 100644 --- a/crates/shirabe/src/command/exec_command.rs +++ b/crates/shirabe/src/command/exec_command.rs @@ -7,10 +7,10 @@ use crate::console::Application; use crate::console::input::InputArgument; use crate::console::input::InputOption; use crate::io::IOInterfaceImmutable; -use shirabe_external_packages::symfony::console::command::command::Command; -use shirabe_external_packages::symfony::console::input::InputInterface; -use shirabe_external_packages::symfony::console::output::OutputInterface; use shirabe_php_shim::{PhpMixed, RuntimeException, basename, chdir, getcwd, glob, impl_php_class}; +use shirabe_symfony_console::command::command::Command; +use shirabe_symfony_console::input::InputInterface; +use shirabe_symfony_console::output::OutputInterface; #[derive(Debug)] pub struct ExecCommand { @@ -208,8 +208,7 @@ impl Command for ExecCommand { let initial_working_directory = self.get_application().and_then(|application| { let application = application.borrow(); - let app_dyn: &dyn shirabe_external_packages::symfony::console::application::Application = - &*application; + let app_dyn: &dyn shirabe_symfony_console::application::Application = &*application; app_dyn .as_any() .downcast_ref::<Application>() @@ -257,13 +256,13 @@ impl Command for ExecCommand { fn complete( &self, - input: &shirabe_external_packages::symfony::console::completion::completion_input::CompletionInput, - suggestions: &mut shirabe_external_packages::symfony::console::completion::completion_suggestions::CompletionSuggestions, + input: &shirabe_symfony_console::completion::completion_input::CompletionInput, + suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions, ) -> anyhow::Result<()> { crate::command::base_command::base_command_complete(self, input, suggestions) } - shirabe_external_packages::delegate_command_trait_impls_to_inner!(base_command_data); + shirabe_symfony_console::delegate_command_trait_impls_to_inner!(base_command_data); } impl BaseCommand for ExecCommand { diff --git a/crates/shirabe/src/command/fund_command.rs b/crates/shirabe/src/command/fund_command.rs index fe4914cc..1151c365 100644 --- a/crates/shirabe/src/command/fund_command.rs +++ b/crates/shirabe/src/command/fund_command.rs @@ -10,14 +10,14 @@ use crate::package::base_package::{self}; use crate::repository::CompositeRepository; use crate::repository::RepositoryInterface; use indexmap::IndexMap; -use shirabe_external_packages::symfony::console::command::command::Command; -use shirabe_external_packages::symfony::console::formatter::OutputFormatter; -use shirabe_external_packages::symfony::console::input::InputInterface; -use shirabe_external_packages::symfony::console::output::OutputInterface; use shirabe_pcre::Preg; use shirabe_php_shim::{PhpMixed, impl_php_class, php_regex}; use shirabe_semver::constraint::AnyConstraint; use shirabe_semver::constraint::MatchAllConstraint; +use shirabe_symfony_console::command::command::Command; +use shirabe_symfony_console::formatter::OutputFormatter; +use shirabe_symfony_console::input::InputInterface; +use shirabe_symfony_console::output::OutputInterface; #[derive(Debug)] pub struct FundCommand { @@ -229,13 +229,13 @@ impl Command for FundCommand { fn complete( &self, - input: &shirabe_external_packages::symfony::console::completion::completion_input::CompletionInput, - suggestions: &mut shirabe_external_packages::symfony::console::completion::completion_suggestions::CompletionSuggestions, + input: &shirabe_symfony_console::completion::completion_input::CompletionInput, + suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions, ) -> anyhow::Result<()> { crate::command::base_command::base_command_complete(self, input, suggestions) } - shirabe_external_packages::delegate_command_trait_impls_to_inner!(base_command_data); + shirabe_symfony_console::delegate_command_trait_impls_to_inner!(base_command_data); } impl BaseCommand for FundCommand { diff --git a/crates/shirabe/src/command/global_command.rs b/crates/shirabe/src/command/global_command.rs index e122dd06..f60cc4a0 100644 --- a/crates/shirabe/src/command/global_command.rs +++ b/crates/shirabe/src/command/global_command.rs @@ -8,18 +8,18 @@ use crate::console::input::InputArgument; use crate::factory::Factory; use crate::util::Filesystem; use crate::util::Platform; -use shirabe_external_packages::symfony::console::command::command::Command; -use shirabe_external_packages::symfony::console::completion::completion_input::CompletionInput; -use shirabe_external_packages::symfony::console::completion::completion_suggestions::{ - CompletionSuggestions, StringOrSuggestion, -}; -use shirabe_external_packages::symfony::console::input::ArgvInput; -use shirabe_external_packages::symfony::console::input::ArrayInput; -use shirabe_external_packages::symfony::console::input::InputInterface; -use shirabe_external_packages::symfony::console::input::StringInput; -use shirabe_external_packages::symfony::console::output::OutputInterface; use shirabe_pcre::Preg; use shirabe_php_shim::{LogicException, RuntimeException, chdir, impl_php_class, php_regex}; +use shirabe_symfony_console::command::command::Command; +use shirabe_symfony_console::completion::completion_input::CompletionInput; +use shirabe_symfony_console::completion::completion_suggestions::{ + CompletionSuggestions, StringOrSuggestion, +}; +use shirabe_symfony_console::input::ArgvInput; +use shirabe_symfony_console::input::ArrayInput; +use shirabe_symfony_console::input::InputInterface; +use shirabe_symfony_console::input::StringInput; +use shirabe_symfony_console::output::OutputInterface; use std::path::Path; #[derive(Debug)] @@ -270,7 +270,7 @@ impl Command for GlobalCommand { base_command_initialize(self, input, output) } - shirabe_external_packages::delegate_command_trait_impls_to_inner!(base_command_data); + shirabe_symfony_console::delegate_command_trait_impls_to_inner!(base_command_data); } impl BaseCommand for GlobalCommand { diff --git a/crates/shirabe/src/command/home_command.rs b/crates/shirabe/src/command/home_command.rs index 9a7902ae..226872d5 100644 --- a/crates/shirabe/src/command/home_command.rs +++ b/crates/shirabe/src/command/home_command.rs @@ -12,11 +12,11 @@ use crate::repository::RepositoryFactory; use crate::repository::RootPackageRepository; use crate::util::Platform; use crate::util::ProcessExecutor; -use shirabe_external_packages::symfony::console::command::command::Command; -use shirabe_external_packages::symfony::console::input::InputInterface; -use shirabe_external_packages::symfony::console::output::OutputInterface; use shirabe_php_shim::filter_var_url; use shirabe_php_shim::{PhpMixed, impl_php_class}; +use shirabe_symfony_console::command::command::Command; +use shirabe_symfony_console::input::InputInterface; +use shirabe_symfony_console::output::OutputInterface; #[derive(Debug)] pub struct HomeCommand { @@ -265,13 +265,13 @@ impl Command for HomeCommand { fn complete( &self, - input: &shirabe_external_packages::symfony::console::completion::completion_input::CompletionInput, - suggestions: &mut shirabe_external_packages::symfony::console::completion::completion_suggestions::CompletionSuggestions, + input: &shirabe_symfony_console::completion::completion_input::CompletionInput, + suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions, ) -> anyhow::Result<()> { crate::command::base_command::base_command_complete(self, input, suggestions) } - shirabe_external_packages::delegate_command_trait_impls_to_inner!(base_command_data); + shirabe_symfony_console::delegate_command_trait_impls_to_inner!(base_command_data); } impl BaseCommand for HomeCommand { diff --git a/crates/shirabe/src/command/init_command.rs b/crates/shirabe/src/command/init_command.rs index 8af9a37d..3a095416 100644 --- a/crates/shirabe/src/command/init_command.rs +++ b/crates/shirabe/src/command/init_command.rs @@ -19,11 +19,6 @@ use crate::util::Filesystem; use crate::util::ProcessExecutor; use crate::util::Silencer; use indexmap::IndexMap; -use shirabe_external_packages::symfony::console::command::command::Command; -use shirabe_external_packages::symfony::console::helper::FormatBlockMessages; -use shirabe_external_packages::symfony::console::input::ArrayInput; -use shirabe_external_packages::symfony::console::input::InputInterface; -use shirabe_external_packages::symfony::console::output::OutputInterface; use shirabe_pcre::{CaptureKey, Preg}; use shirabe_php_shim::Catch as _; use shirabe_php_shim::{ @@ -34,6 +29,11 @@ use shirabe_php_shim::{ ucwords, }; use shirabe_spdx_licenses::SpdxLicenses; +use shirabe_symfony_console::command::command::Command; +use shirabe_symfony_console::helper::FormatBlockMessages; +use shirabe_symfony_console::input::ArrayInput; +use shirabe_symfony_console::input::InputInterface; +use shirabe_symfony_console::output::OutputInterface; #[derive(Debug)] pub struct InitCommand { @@ -1250,13 +1250,13 @@ impl Command for InitCommand { fn complete( &self, - input: &shirabe_external_packages::symfony::console::completion::completion_input::CompletionInput, - suggestions: &mut shirabe_external_packages::symfony::console::completion::completion_suggestions::CompletionSuggestions, + input: &shirabe_symfony_console::completion::completion_input::CompletionInput, + suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions, ) -> anyhow::Result<()> { crate::command::base_command::base_command_complete(self, input, suggestions) } - shirabe_external_packages::delegate_command_trait_impls_to_inner!(base_command_data); + shirabe_symfony_console::delegate_command_trait_impls_to_inner!(base_command_data); } impl BaseCommand for InitCommand { diff --git a/crates/shirabe/src/command/install_command.rs b/crates/shirabe/src/command/install_command.rs index 944df2dd..264cbbeb 100644 --- a/crates/shirabe/src/command/install_command.rs +++ b/crates/shirabe/src/command/install_command.rs @@ -13,10 +13,10 @@ use crate::io::IOInterfaceImmutable; use crate::plugin::CommandEvent; use crate::plugin::PluginEvents; use crate::util::HttpDownloader; -use shirabe_external_packages::symfony::console::command::command::Command; -use shirabe_external_packages::symfony::console::input::InputInterface; -use shirabe_external_packages::symfony::console::output::OutputInterface; use shirabe_php_shim::{PhpMixed, impl_php_class}; +use shirabe_symfony_console::command::command::Command; +use shirabe_symfony_console::input::InputInterface; +use shirabe_symfony_console::output::OutputInterface; #[derive(Debug)] pub struct InstallCommand { @@ -274,13 +274,13 @@ impl Command for InstallCommand { fn complete( &self, - input: &shirabe_external_packages::symfony::console::completion::completion_input::CompletionInput, - suggestions: &mut shirabe_external_packages::symfony::console::completion::completion_suggestions::CompletionSuggestions, + input: &shirabe_symfony_console::completion::completion_input::CompletionInput, + suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions, ) -> anyhow::Result<()> { crate::command::base_command::base_command_complete(self, input, suggestions) } - shirabe_external_packages::delegate_command_trait_impls_to_inner!(base_command_data); + shirabe_symfony_console::delegate_command_trait_impls_to_inner!(base_command_data); } impl BaseCommand for InstallCommand { diff --git a/crates/shirabe/src/command/licenses_command.rs b/crates/shirabe/src/command/licenses_command.rs index 1b2ec6b6..ed64061a 100644 --- a/crates/shirabe/src/command/licenses_command.rs +++ b/crates/shirabe/src/command/licenses_command.rs @@ -13,14 +13,14 @@ use crate::repository::RepositoryUtils; use crate::util::PackageInfo; use crate::util::PackageSorter; use indexmap::IndexMap; -use shirabe_external_packages::symfony::console::command::command::Command; -use shirabe_external_packages::symfony::console::formatter::OutputFormatter; -use shirabe_external_packages::symfony::console::helper::Table; -use shirabe_external_packages::symfony::console::input::InputInterface; -use shirabe_external_packages::symfony::console::output::OutputInterface; -use shirabe_external_packages::symfony::console::style::StyleInterface; -use shirabe_external_packages::symfony::console::style::SymfonyStyle; use shirabe_php_shim::{PhpMixed, RuntimeException, UnexpectedValueException, impl_php_class}; +use shirabe_symfony_console::command::command::Command; +use shirabe_symfony_console::formatter::OutputFormatter; +use shirabe_symfony_console::helper::Table; +use shirabe_symfony_console::input::InputInterface; +use shirabe_symfony_console::output::OutputInterface; +use shirabe_symfony_console::style::StyleInterface; +use shirabe_symfony_console::style::SymfonyStyle; #[derive(Debug)] pub struct LicensesCommand { @@ -332,13 +332,13 @@ impl Command for LicensesCommand { fn complete( &self, - input: &shirabe_external_packages::symfony::console::completion::completion_input::CompletionInput, - suggestions: &mut shirabe_external_packages::symfony::console::completion::completion_suggestions::CompletionSuggestions, + input: &shirabe_symfony_console::completion::completion_input::CompletionInput, + suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions, ) -> anyhow::Result<()> { crate::command::base_command::base_command_complete(self, input, suggestions) } - shirabe_external_packages::delegate_command_trait_impls_to_inner!(base_command_data); + shirabe_symfony_console::delegate_command_trait_impls_to_inner!(base_command_data); } impl BaseCommand for LicensesCommand { diff --git a/crates/shirabe/src/command/outdated_command.rs b/crates/shirabe/src/command/outdated_command.rs index fe865dac..6d062d97 100644 --- a/crates/shirabe/src/command/outdated_command.rs +++ b/crates/shirabe/src/command/outdated_command.rs @@ -8,11 +8,11 @@ use crate::console::input::InputArgument; use crate::console::input::InputOption; use crate::console::input::SuggestedValues; use indexmap::IndexMap; -use shirabe_external_packages::symfony::console::command::command::Command; -use shirabe_external_packages::symfony::console::input::ArrayInput; -use shirabe_external_packages::symfony::console::input::InputInterface; -use shirabe_external_packages::symfony::console::output::OutputInterface; use shirabe_php_shim::{PhpMixed, impl_php_class}; +use shirabe_symfony_console::command::command::Command; +use shirabe_symfony_console::input::ArrayInput; +use shirabe_symfony_console::input::InputInterface; +use shirabe_symfony_console::output::OutputInterface; #[derive(Debug)] pub struct OutdatedCommand { @@ -235,13 +235,13 @@ impl Command for OutdatedCommand { fn complete( &self, - input: &shirabe_external_packages::symfony::console::completion::completion_input::CompletionInput, - suggestions: &mut shirabe_external_packages::symfony::console::completion::completion_suggestions::CompletionSuggestions, + input: &shirabe_symfony_console::completion::completion_input::CompletionInput, + suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions, ) -> anyhow::Result<()> { crate::command::base_command::base_command_complete(self, input, suggestions) } - shirabe_external_packages::delegate_command_trait_impls_to_inner!(base_command_data); + shirabe_symfony_console::delegate_command_trait_impls_to_inner!(base_command_data); } impl BaseCommand for OutdatedCommand { diff --git a/crates/shirabe/src/command/package_discovery_trait.rs b/crates/shirabe/src/command/package_discovery_trait.rs index 5d3072d6..b68be252 100644 --- a/crates/shirabe/src/command/package_discovery_trait.rs +++ b/crates/shirabe/src/command/package_discovery_trait.rs @@ -19,8 +19,6 @@ use crate::repository::RepositorySet; use crate::repository::{RepositoryInterface, SearchResult}; use crate::util::Filesystem; use indexmap::IndexMap; -use shirabe_external_packages::symfony::console::input::InputInterface; -use shirabe_external_packages::symfony::console::output::OutputInterface; use shirabe_pcre::{CaptureKey, Preg}; use shirabe_php_shim::Catch as _; use shirabe_php_shim::{ @@ -28,6 +26,8 @@ use shirabe_php_shim::{ array_slice, asort, explode, file_get_contents, implode, in_array_strict, is_array, is_file, is_numeric, json_decode, levenshtein, php_regex, strlen, strpos, trim, }; +use shirabe_symfony_console::input::InputInterface; +use shirabe_symfony_console::output::OutputInterface; /// @internal pub trait PackageDiscoveryTrait: BaseCommand { diff --git a/crates/shirabe/src/command/prohibits_command.rs b/crates/shirabe/src/command/prohibits_command.rs index da853f49..893c4f4a 100644 --- a/crates/shirabe/src/command/prohibits_command.rs +++ b/crates/shirabe/src/command/prohibits_command.rs @@ -6,10 +6,10 @@ use crate::command::base_command::base_command_initialize; use crate::command::{BaseCommand, BaseCommandData}; use crate::console::input::InputArgument; use crate::console::input::InputOption; -use shirabe_external_packages::symfony::console::command::command::Command; -use shirabe_external_packages::symfony::console::input::InputInterface; -use shirabe_external_packages::symfony::console::output::OutputInterface; use shirabe_php_shim::impl_php_class; +use shirabe_symfony_console::command::command::Command; +use shirabe_symfony_console::input::InputInterface; +use shirabe_symfony_console::output::OutputInterface; #[derive(Debug)] pub struct ProhibitsCommand { @@ -126,13 +126,13 @@ impl Command for ProhibitsCommand { fn complete( &self, - input: &shirabe_external_packages::symfony::console::completion::completion_input::CompletionInput, - suggestions: &mut shirabe_external_packages::symfony::console::completion::completion_suggestions::CompletionSuggestions, + input: &shirabe_symfony_console::completion::completion_input::CompletionInput, + suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions, ) -> anyhow::Result<()> { crate::command::base_command::base_command_complete(self, input, suggestions) } - shirabe_external_packages::delegate_command_trait_impls_to_inner!(base_command_data); + shirabe_symfony_console::delegate_command_trait_impls_to_inner!(base_command_data); } impl BaseCommand for ProhibitsCommand { diff --git a/crates/shirabe/src/command/reinstall_command.rs b/crates/shirabe/src/command/reinstall_command.rs index e79e72ff..c9a1d2ea 100644 --- a/crates/shirabe/src/command/reinstall_command.rs +++ b/crates/shirabe/src/command/reinstall_command.rs @@ -15,11 +15,11 @@ use crate::plugin::CommandEvent; use crate::plugin::PluginEvents; use crate::script::ScriptEvents; use crate::util::Platform; -use shirabe_external_packages::symfony::console::command::command::Command; -use shirabe_external_packages::symfony::console::input::InputInterface; -use shirabe_external_packages::symfony::console::output::OutputInterface; use shirabe_pcre::Preg; use shirabe_php_shim::{InvalidArgumentException, impl_php_class}; +use shirabe_symfony_console::command::command::Command; +use shirabe_symfony_console::input::InputInterface; +use shirabe_symfony_console::output::OutputInterface; #[derive(Debug)] pub struct ReinstallCommand { @@ -344,13 +344,13 @@ impl Command for ReinstallCommand { fn complete( &self, - input: &shirabe_external_packages::symfony::console::completion::completion_input::CompletionInput, - suggestions: &mut shirabe_external_packages::symfony::console::completion::completion_suggestions::CompletionSuggestions, + input: &shirabe_symfony_console::completion::completion_input::CompletionInput, + suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions, ) -> anyhow::Result<()> { crate::command::base_command::base_command_complete(self, input, suggestions) } - shirabe_external_packages::delegate_command_trait_impls_to_inner!(base_command_data); + shirabe_symfony_console::delegate_command_trait_impls_to_inner!(base_command_data); } impl BaseCommand for ReinstallCommand { diff --git a/crates/shirabe/src/command/remove_command.rs b/crates/shirabe/src/command/remove_command.rs index 3015ed95..50e68045 100644 --- a/crates/shirabe/src/command/remove_command.rs +++ b/crates/shirabe/src/command/remove_command.rs @@ -17,12 +17,12 @@ use crate::json::JsonFile; use crate::package::base_package; use crate::repository::RepositoryInterface; use indexmap::IndexMap; -use shirabe_external_packages::symfony::console::command::command::Command; -use shirabe_external_packages::symfony::console::exception::InvalidArgumentException; -use shirabe_external_packages::symfony::console::input::InputInterface; -use shirabe_external_packages::symfony::console::output::OutputInterface; use shirabe_pcre::Preg; use shirabe_php_shim::{PhpMixed, UnexpectedValueException, impl_php_class, strtolower}; +use shirabe_symfony_console::command::command::Command; +use shirabe_symfony_console::exception::InvalidArgumentException; +use shirabe_symfony_console::input::InputInterface; +use shirabe_symfony_console::output::OutputInterface; #[derive(Debug)] pub struct RemoveCommand { @@ -715,13 +715,13 @@ impl Command for RemoveCommand { fn complete( &self, - input: &shirabe_external_packages::symfony::console::completion::completion_input::CompletionInput, - suggestions: &mut shirabe_external_packages::symfony::console::completion::completion_suggestions::CompletionSuggestions, + input: &shirabe_symfony_console::completion::completion_input::CompletionInput, + suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions, ) -> anyhow::Result<()> { crate::command::base_command::base_command_complete(self, input, suggestions) } - shirabe_external_packages::delegate_command_trait_impls_to_inner!(base_command_data); + shirabe_symfony_console::delegate_command_trait_impls_to_inner!(base_command_data); } impl BaseCommand for RemoveCommand { diff --git a/crates/shirabe/src/command/repository_command.rs b/crates/shirabe/src/command/repository_command.rs index 38484bc4..b03c0133 100644 --- a/crates/shirabe/src/command/repository_command.rs +++ b/crates/shirabe/src/command/repository_command.rs @@ -10,14 +10,14 @@ use crate::console::input::InputOption; use crate::io::IOInterfaceImmutable; use crate::json::JsonFile; use indexmap::IndexMap; -use shirabe_external_packages::symfony::console::command::command::Command; -use shirabe_external_packages::symfony::console::input::InputInterface; -use shirabe_external_packages::symfony::console::output::OutputInterface; use shirabe_pcre::Preg; use shirabe_php_shim::{ InvalidArgumentException, PHP_URL_HOST, PhpMixed, RuntimeException, impl_php_class, parse_url, php_regex, strtolower, }; +use shirabe_symfony_console::command::command::Command; +use shirabe_symfony_console::input::InputInterface; +use shirabe_symfony_console::output::OutputInterface; #[derive(Debug)] pub struct RepositoryCommand { @@ -160,9 +160,7 @@ impl RepositoryCommand { // PHP passes the CompletionInput itself; the accessors only read from it, so a // clone behind a fresh handle is equivalent. let input_handle: std::rc::Rc< - std::cell::RefCell< - dyn shirabe_external_packages::symfony::console::input::InputInterface, - >, + std::cell::RefCell<dyn shirabe_symfony_console::input::InputInterface>, > = std::rc::Rc::new(std::cell::RefCell::new(input.clone())); let config = crate::factory::Factory::create_config(None, None)?; let config_file = JsonFile::new( @@ -580,13 +578,13 @@ impl Command for RepositoryCommand { fn complete( &self, - input: &shirabe_external_packages::symfony::console::completion::completion_input::CompletionInput, - suggestions: &mut shirabe_external_packages::symfony::console::completion::completion_suggestions::CompletionSuggestions, + input: &shirabe_symfony_console::completion::completion_input::CompletionInput, + suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions, ) -> anyhow::Result<()> { crate::command::base_command::base_command_complete(self, input, suggestions) } - shirabe_external_packages::delegate_command_trait_impls_to_inner!(base_command_data); + shirabe_symfony_console::delegate_command_trait_impls_to_inner!(base_command_data); } impl BaseCommand for RepositoryCommand { diff --git a/crates/shirabe/src/command/require_command.rs b/crates/shirabe/src/command/require_command.rs index 88916175..44ebc54c 100644 --- a/crates/shirabe/src/command/require_command.rs +++ b/crates/shirabe/src/command/require_command.rs @@ -33,14 +33,14 @@ use crate::util::PackageSorter; use crate::util::Silencer; use indexmap::IndexMap; use shirabe_external_packages::seld::signal::SignalHandler; -use shirabe_external_packages::symfony::console::command::command::Command; -use shirabe_external_packages::symfony::console::input::InputInterface; -use shirabe_external_packages::symfony::console::output::OutputInterface; use shirabe_php_shim::{ PhpMixed, RuntimeException, array_fill_keys, array_intersect, array_keys, array_map, array_merge, array_unique, empty, file_exists, file_get_contents, file_put_contents, filesize, impl_php_class, implode, is_writable, strtolower, unlink, }; +use shirabe_symfony_console::command::command::Command; +use shirabe_symfony_console::input::InputInterface; +use shirabe_symfony_console::output::OutputInterface; #[derive(Debug)] pub struct RequireCommand { @@ -1289,13 +1289,13 @@ impl Command for RequireCommand { fn complete( &self, - input: &shirabe_external_packages::symfony::console::completion::completion_input::CompletionInput, - suggestions: &mut shirabe_external_packages::symfony::console::completion::completion_suggestions::CompletionSuggestions, + input: &shirabe_symfony_console::completion::completion_input::CompletionInput, + suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions, ) -> anyhow::Result<()> { crate::command::base_command::base_command_complete(self, input, suggestions) } - shirabe_external_packages::delegate_command_trait_impls_to_inner!(base_command_data); + shirabe_symfony_console::delegate_command_trait_impls_to_inner!(base_command_data); } impl BaseCommand for RequireCommand { diff --git a/crates/shirabe/src/command/run_script_command.rs b/crates/shirabe/src/command/run_script_command.rs index be50c4be..56833daa 100644 --- a/crates/shirabe/src/command/run_script_command.rs +++ b/crates/shirabe/src/command/run_script_command.rs @@ -11,14 +11,14 @@ use crate::script::ScriptEvents; use crate::util::Platform; use crate::util::ProcessExecutor; use indexmap::IndexMap; -use shirabe_external_packages::symfony::console::command::command::Command; -use shirabe_external_packages::symfony::console::exception::CommandNotFoundException; -use shirabe_external_packages::symfony::console::exception::namespace_not_found_exception::NamespaceNotFoundException; -use shirabe_external_packages::symfony::console::input::InputInterface; -use shirabe_external_packages::symfony::console::output::OutputInterface; use shirabe_php_shim::Catch as _; use shirabe_php_shim::{InvalidArgumentException, RuntimeException}; use shirabe_php_shim::{PhpMixed, impl_php_class}; +use shirabe_symfony_console::command::command::Command; +use shirabe_symfony_console::exception::CommandNotFoundException; +use shirabe_symfony_console::exception::namespace_not_found_exception::NamespaceNotFoundException; +use shirabe_symfony_console::input::InputInterface; +use shirabe_symfony_console::output::OutputInterface; #[derive(Debug)] pub struct RunScriptCommand { @@ -347,13 +347,13 @@ impl Command for RunScriptCommand { fn complete( &self, - input: &shirabe_external_packages::symfony::console::completion::completion_input::CompletionInput, - suggestions: &mut shirabe_external_packages::symfony::console::completion::completion_suggestions::CompletionSuggestions, + input: &shirabe_symfony_console::completion::completion_input::CompletionInput, + suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions, ) -> anyhow::Result<()> { crate::command::base_command::base_command_complete(self, input, suggestions) } - shirabe_external_packages::delegate_command_trait_impls_to_inner!(base_command_data); + shirabe_symfony_console::delegate_command_trait_impls_to_inner!(base_command_data); } impl BaseCommand for RunScriptCommand { diff --git a/crates/shirabe/src/command/script_alias_command.rs b/crates/shirabe/src/command/script_alias_command.rs index 5aa65109..214cb51f 100644 --- a/crates/shirabe/src/command/script_alias_command.rs +++ b/crates/shirabe/src/command/script_alias_command.rs @@ -6,13 +6,13 @@ use crate::command::base_command::base_command_initialize; use crate::console::input::InputArgument; use crate::console::input::InputOption; use crate::util::Platform; -use shirabe_external_packages::symfony::console::command::command::Command; -use shirabe_external_packages::symfony::console::input::InputInterface; -use shirabe_external_packages::symfony::console::output::OutputInterface; use shirabe_pcre::Preg; use shirabe_php_shim::{ InvalidArgumentException, LogicException, PhpMixed, impl_php_class, is_string, php_regex, }; +use shirabe_symfony_console::command::command::Command; +use shirabe_symfony_console::input::InputInterface; +use shirabe_symfony_console::output::OutputInterface; #[derive(Debug)] pub struct ScriptAliasCommand { @@ -171,13 +171,13 @@ impl Command for ScriptAliasCommand { fn complete( &self, - input: &shirabe_external_packages::symfony::console::completion::completion_input::CompletionInput, - suggestions: &mut shirabe_external_packages::symfony::console::completion::completion_suggestions::CompletionSuggestions, + input: &shirabe_symfony_console::completion::completion_input::CompletionInput, + suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions, ) -> anyhow::Result<()> { crate::command::base_command::base_command_complete(self, input, suggestions) } - shirabe_external_packages::delegate_command_trait_impls_to_inner!(base_command_data); + shirabe_symfony_console::delegate_command_trait_impls_to_inner!(base_command_data); } impl BaseCommand for ScriptAliasCommand { diff --git a/crates/shirabe/src/command/search_command.rs b/crates/shirabe/src/command/search_command.rs index 51432ed9..3f797551 100644 --- a/crates/shirabe/src/command/search_command.rs +++ b/crates/shirabe/src/command/search_command.rs @@ -14,13 +14,13 @@ use crate::repository::PlatformRepository; use crate::repository::RepositoryInterfaceHandle; use crate::repository::repository_interface::{self, AbandonedInfo, RepositoryInterface}; use indexmap::IndexMap; -use shirabe_external_packages::symfony::console::command::command::Command; -use shirabe_external_packages::symfony::console::formatter::OutputFormatter; -use shirabe_external_packages::symfony::console::input::InputInterface; -use shirabe_external_packages::symfony::console::output::OutputInterface; use shirabe_php_shim::{ InvalidArgumentException, PhpMixed, impl_php_class, implode, in_array_loose, preg_quote, substr, }; +use shirabe_symfony_console::command::command::Command; +use shirabe_symfony_console::formatter::OutputFormatter; +use shirabe_symfony_console::input::InputInterface; +use shirabe_symfony_console::output::OutputInterface; #[derive(Debug)] pub struct SearchCommand { @@ -307,13 +307,13 @@ impl Command for SearchCommand { fn complete( &self, - input: &shirabe_external_packages::symfony::console::completion::completion_input::CompletionInput, - suggestions: &mut shirabe_external_packages::symfony::console::completion::completion_suggestions::CompletionSuggestions, + input: &shirabe_symfony_console::completion::completion_input::CompletionInput, + suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions, ) -> anyhow::Result<()> { crate::command::base_command::base_command_complete(self, input, suggestions) } - shirabe_external_packages::delegate_command_trait_impls_to_inner!(base_command_data); + shirabe_symfony_console::delegate_command_trait_impls_to_inner!(base_command_data); } impl BaseCommand for SearchCommand { diff --git a/crates/shirabe/src/command/self_update_command.rs b/crates/shirabe/src/command/self_update_command.rs index 55aca0dc..6872730e 100644 --- a/crates/shirabe/src/command/self_update_command.rs +++ b/crates/shirabe/src/command/self_update_command.rs @@ -7,10 +7,10 @@ use crate::console::input::InputArgument; use crate::console::input::InputOption; use crate::io::IOInterfaceImmutable; use crate::io::io_interface; -use shirabe_external_packages::symfony::console::command::command::Command; -use shirabe_external_packages::symfony::console::input::InputInterface; -use shirabe_external_packages::symfony::console::output::OutputInterface; use shirabe_php_shim::{PhpMixed, impl_php_class}; +use shirabe_symfony_console::command::command::Command; +use shirabe_symfony_console::input::InputInterface; +use shirabe_symfony_console::output::OutputInterface; #[derive(Debug)] pub struct SelfUpdateCommand { @@ -95,13 +95,13 @@ impl Command for SelfUpdateCommand { fn complete( &self, - input: &shirabe_external_packages::symfony::console::completion::completion_input::CompletionInput, - suggestions: &mut shirabe_external_packages::symfony::console::completion::completion_suggestions::CompletionSuggestions, + input: &shirabe_symfony_console::completion::completion_input::CompletionInput, + suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions, ) -> anyhow::Result<()> { crate::command::base_command::base_command_complete(self, input, suggestions) } - shirabe_external_packages::delegate_command_trait_impls_to_inner!(base_command_data); + shirabe_symfony_console::delegate_command_trait_impls_to_inner!(base_command_data); } impl BaseCommand for SelfUpdateCommand { diff --git a/crates/shirabe/src/command/show_command.rs b/crates/shirabe/src/command/show_command.rs index 178d0947..c456f71a 100644 --- a/crates/shirabe/src/command/show_command.rs +++ b/crates/shirabe/src/command/show_command.rs @@ -36,11 +36,6 @@ use crate::repository::RepositoryUtils; use crate::repository::RootPackageRepository; use crate::util::PackageInfo; use indexmap::IndexMap; -use shirabe_external_packages::symfony::console::command::command::Command; -use shirabe_external_packages::symfony::console::formatter::OutputFormatter; -use shirabe_external_packages::symfony::console::formatter::OutputFormatterStyle; -use shirabe_external_packages::symfony::console::input::InputInterface; -use shirabe_external_packages::symfony::console::output::OutputInterface; use shirabe_pcre::{CaptureKey, Preg}; use shirabe_php_shim::{ CmpOp, DATE_ATOM, InvalidArgumentException, LogicException, PhpMixed, UnexpectedValueException, @@ -50,6 +45,11 @@ use shirabe_php_shim::{ use shirabe_semver::Semver; use shirabe_semver::constraint::AnyConstraint; use shirabe_spdx_licenses::SpdxLicenses; +use shirabe_symfony_console::command::command::Command; +use shirabe_symfony_console::formatter::OutputFormatter; +use shirabe_symfony_console::formatter::OutputFormatterStyle; +use shirabe_symfony_console::input::InputInterface; +use shirabe_symfony_console::output::OutputInterface; #[derive(Debug)] pub struct ShowCommand { @@ -2885,13 +2885,13 @@ impl Command for ShowCommand { fn complete( &self, - input: &shirabe_external_packages::symfony::console::completion::completion_input::CompletionInput, - suggestions: &mut shirabe_external_packages::symfony::console::completion::completion_suggestions::CompletionSuggestions, + input: &shirabe_symfony_console::completion::completion_input::CompletionInput, + suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions, ) -> anyhow::Result<()> { crate::command::base_command::base_command_complete(self, input, suggestions) } - shirabe_external_packages::delegate_command_trait_impls_to_inner!(base_command_data); + shirabe_symfony_console::delegate_command_trait_impls_to_inner!(base_command_data); } impl BaseCommand for ShowCommand { diff --git a/crates/shirabe/src/command/status_command.rs b/crates/shirabe/src/command/status_command.rs index 7a8ac04c..097d7a40 100644 --- a/crates/shirabe/src/command/status_command.rs +++ b/crates/shirabe/src/command/status_command.rs @@ -13,10 +13,10 @@ use crate::plugin::PluginEvents; use crate::script::ScriptEvents; use crate::util::ProcessExecutor; use indexmap::IndexMap; -use shirabe_external_packages::symfony::console::command::command::Command; -use shirabe_external_packages::symfony::console::input::InputInterface; -use shirabe_external_packages::symfony::console::output::OutputInterface; use shirabe_php_shim::impl_php_class; +use shirabe_symfony_console::command::command::Command; +use shirabe_symfony_console::input::InputInterface; +use shirabe_symfony_console::output::OutputInterface; #[derive(Debug)] pub struct StatusCommand { @@ -390,13 +390,13 @@ impl Command for StatusCommand { fn complete( &self, - input: &shirabe_external_packages::symfony::console::completion::completion_input::CompletionInput, - suggestions: &mut shirabe_external_packages::symfony::console::completion::completion_suggestions::CompletionSuggestions, + input: &shirabe_symfony_console::completion::completion_input::CompletionInput, + suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions, ) -> anyhow::Result<()> { crate::command::base_command::base_command_complete(self, input, suggestions) } - shirabe_external_packages::delegate_command_trait_impls_to_inner!(base_command_data); + shirabe_symfony_console::delegate_command_trait_impls_to_inner!(base_command_data); } impl BaseCommand for StatusCommand { diff --git a/crates/shirabe/src/command/suggests_command.rs b/crates/shirabe/src/command/suggests_command.rs index 96989dc0..fba93b79 100644 --- a/crates/shirabe/src/command/suggests_command.rs +++ b/crates/shirabe/src/command/suggests_command.rs @@ -12,10 +12,10 @@ use crate::repository::RepositoryInterface; use crate::repository::RepositoryInterfaceHandle; use crate::repository::RootPackageRepository; use indexmap::IndexMap; -use shirabe_external_packages::symfony::console::command::command::Command; -use shirabe_external_packages::symfony::console::input::InputInterface; -use shirabe_external_packages::symfony::console::output::OutputInterface; use shirabe_php_shim::{PhpMixed, empty, impl_php_class, in_array_loose}; +use shirabe_symfony_console::command::command::Command; +use shirabe_symfony_console::input::InputInterface; +use shirabe_symfony_console::output::OutputInterface; #[derive(Debug)] pub struct SuggestsCommand { @@ -228,13 +228,13 @@ impl Command for SuggestsCommand { fn complete( &self, - input: &shirabe_external_packages::symfony::console::completion::completion_input::CompletionInput, - suggestions: &mut shirabe_external_packages::symfony::console::completion::completion_suggestions::CompletionSuggestions, + input: &shirabe_symfony_console::completion::completion_input::CompletionInput, + suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions, ) -> anyhow::Result<()> { crate::command::base_command::base_command_complete(self, input, suggestions) } - shirabe_external_packages::delegate_command_trait_impls_to_inner!(base_command_data); + shirabe_symfony_console::delegate_command_trait_impls_to_inner!(base_command_data); } impl BaseCommand for SuggestsCommand { diff --git a/crates/shirabe/src/command/update_command.rs b/crates/shirabe/src/command/update_command.rs index 1aff73c5..abf9696a 100644 --- a/crates/shirabe/src/command/update_command.rs +++ b/crates/shirabe/src/command/update_command.rs @@ -27,10 +27,6 @@ use crate::repository::PlatformRepository; use crate::repository::RepositorySet; use crate::util::HttpDownloader; use indexmap::IndexMap; -use shirabe_external_packages::symfony::console::command::command::Command; -use shirabe_external_packages::symfony::console::helper::Table; -use shirabe_external_packages::symfony::console::input::InputInterface; -use shirabe_external_packages::symfony::console::output::OutputInterface; use shirabe_pcre::Preg; use shirabe_php_shim::{ InvalidArgumentException, PhpMixed, RuntimeException, array_filter, array_intersect, @@ -38,6 +34,10 @@ use shirabe_php_shim::{ }; use shirabe_semver::Intervals; use shirabe_semver::constraint::MultiConstraint; +use shirabe_symfony_console::command::command::Command; +use shirabe_symfony_console::helper::Table; +use shirabe_symfony_console::input::InputInterface; +use shirabe_symfony_console::output::OutputInterface; #[derive(Debug)] pub struct UpdateCommand { @@ -764,13 +764,13 @@ impl Command for UpdateCommand { fn complete( &self, - input: &shirabe_external_packages::symfony::console::completion::completion_input::CompletionInput, - suggestions: &mut shirabe_external_packages::symfony::console::completion::completion_suggestions::CompletionSuggestions, + input: &shirabe_symfony_console::completion::completion_input::CompletionInput, + suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions, ) -> anyhow::Result<()> { crate::command::base_command::base_command_complete(self, input, suggestions) } - shirabe_external_packages::delegate_command_trait_impls_to_inner!(base_command_data); + shirabe_symfony_console::delegate_command_trait_impls_to_inner!(base_command_data); } impl BaseCommand for UpdateCommand { diff --git a/crates/shirabe/src/command/validate_command.rs b/crates/shirabe/src/command/validate_command.rs index c663c868..116c0b27 100644 --- a/crates/shirabe/src/command/validate_command.rs +++ b/crates/shirabe/src/command/validate_command.rs @@ -13,10 +13,10 @@ use crate::plugin::CommandEvent; use crate::plugin::PluginEvents; use crate::util::ConfigValidator; use crate::util::Filesystem; -use shirabe_external_packages::symfony::console::command::command::Command; -use shirabe_external_packages::symfony::console::input::InputInterface; -use shirabe_external_packages::symfony::console::output::OutputInterface; use shirabe_php_shim::impl_php_class; +use shirabe_symfony_console::command::command::Command; +use shirabe_symfony_console::input::InputInterface; +use shirabe_symfony_console::output::OutputInterface; #[derive(Debug)] pub struct ValidateCommand { @@ -406,13 +406,13 @@ impl Command for ValidateCommand { fn complete( &self, - input: &shirabe_external_packages::symfony::console::completion::completion_input::CompletionInput, - suggestions: &mut shirabe_external_packages::symfony::console::completion::completion_suggestions::CompletionSuggestions, + input: &shirabe_symfony_console::completion::completion_input::CompletionInput, + suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions, ) -> anyhow::Result<()> { crate::command::base_command::base_command_complete(self, input, suggestions) } - shirabe_external_packages::delegate_command_trait_impls_to_inner!(base_command_data); + shirabe_symfony_console::delegate_command_trait_impls_to_inner!(base_command_data); } impl BaseCommand for ValidateCommand { |