diff options
Diffstat (limited to 'crates/shirabe')
76 files changed, 427 insertions, 455 deletions
diff --git a/crates/shirabe/Cargo.toml b/crates/shirabe/Cargo.toml index b5b84f73..6623ba80 100644 --- a/crates/shirabe/Cargo.toml +++ b/crates/shirabe/Cargo.toml @@ -12,6 +12,7 @@ shirabe-php-rpc.workspace = true shirabe-php-shim.workspace = true shirabe-semver.workspace = true shirabe-spdx-licenses.workspace = true +shirabe-symfony-console.workspace = true shirabe-symfony-filesystem.workspace = true shirabe-symfony-finder.workspace = true shirabe-symfony-process.workspace = true diff --git a/crates/shirabe/src/advisory/auditor.rs b/crates/shirabe/src/advisory/auditor.rs index 3c010bd2..3c00d09e 100644 --- a/crates/shirabe/src/advisory/auditor.rs +++ b/crates/shirabe/src/advisory/auditor.rs @@ -12,12 +12,12 @@ use crate::package::base_package; use crate::repository::RepositorySet; use crate::util::PackageInfo; use indexmap::IndexMap; -use shirabe_external_packages::symfony::console::formatter::OutputFormatter; use shirabe_pcre::Preg; use shirabe_php_shim::{ DATE_ATOM, InvalidArgumentException, PhpMixed, array_all, array_any, array_key_exists, array_keys, array_reduce, get_class, str_starts_with, }; +use shirabe_symfony_console::formatter::OutputFormatter; /// Shape of the `--format=json` audit output. #[derive(serde::Serialize)] diff --git a/crates/shirabe/src/autoload/autoload_generator.rs b/crates/shirabe/src/autoload/autoload_generator.rs index 1aad6412..b21bfabe 100644 --- a/crates/shirabe/src/autoload/autoload_generator.rs +++ b/crates/shirabe/src/autoload/autoload_generator.rs @@ -21,7 +21,6 @@ use crate::util::Platform; use indexmap::IndexMap; use shirabe_class_map_generator::class_map::ClassMap; use shirabe_class_map_generator::class_map_generator::ClassMapGenerator; -use shirabe_external_packages::symfony::console::formatter::OutputFormatter; use shirabe_pcre::{CaptureKey, Preg}; use shirabe_php_shim::{ InvalidArgumentException, PhpMixed, array_keys, array_map, array_merge_map, @@ -31,6 +30,7 @@ use shirabe_php_shim::{ substr, substr_count, trim, unlink, var_export, }; use shirabe_semver::constraint::Bound; +use shirabe_symfony_console::formatter::OutputFormatter; #[derive(Debug)] pub struct AutoloadGenerator { 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 { diff --git a/crates/shirabe/src/console/application.rs b/crates/shirabe/src/console/application.rs index 8b60c988..2e93c33d 100644 --- a/crates/shirabe/src/console/application.rs +++ b/crates/shirabe/src/console/application.rs @@ -56,42 +56,6 @@ use crate::util::Silencer; use indexmap::IndexMap; use shirabe_external_packages::composer::xdebug_handler::XdebugHandler; use shirabe_external_packages::seld::json_lint::ParsingException; -use shirabe_external_packages::symfony::console::application::Application as BaseApplication; -use shirabe_external_packages::symfony::console::command::Command as SymfonyCommand; -use shirabe_external_packages::symfony::console::command::help_command::HelpCommand; -use shirabe_external_packages::symfony::console::command::signalable_command_interface::SignalableCommandInterface; -use shirabe_external_packages::symfony::console::command_loader::command_loader_interface::CommandLoaderInterface; -use shirabe_external_packages::symfony::console::completion::completion_input::CompletionInput; -use shirabe_external_packages::symfony::console::completion::completion_suggestions::CompletionSuggestions; -use shirabe_external_packages::symfony::console::exception::CommandNotFoundException; -use shirabe_external_packages::symfony::console::exception::invalid_argument_exception::InvalidArgumentException as ConsoleInvalidArgumentException; -use shirabe_external_packages::symfony::console::exception::invalid_option_exception::InvalidOptionException; -use shirabe_external_packages::symfony::console::exception::logic_exception::LogicException as ConsoleLogicException; -use shirabe_external_packages::symfony::console::exception::missing_input_exception::MissingInputException; -use shirabe_external_packages::symfony::console::exception::namespace_not_found_exception::NamespaceNotFoundException; -use shirabe_external_packages::symfony::console::exception::runtime_exception::RuntimeException as ConsoleRuntimeException; -use shirabe_external_packages::symfony::console::formatter::output_formatter::OutputFormatter; -use shirabe_external_packages::symfony::console::helper::HelperSet; -use shirabe_external_packages::symfony::console::helper::QuestionHelper; -use shirabe_external_packages::symfony::console::helper::formatter_helper::{ - FormatBlockMessages, FormatterHelper, -}; -use shirabe_external_packages::symfony::console::helper::helper::Helper; -use shirabe_external_packages::symfony::console::input::InputDefinition; -use shirabe_external_packages::symfony::console::input::InputInterface; -use shirabe_external_packages::symfony::console::input::InputOption; -use shirabe_external_packages::symfony::console::input::argv_input::ArgvInput; -use shirabe_external_packages::symfony::console::input::array_input::ArrayInput; -use shirabe_external_packages::symfony::console::input::input_argument::InputArgument; -use shirabe_external_packages::symfony::console::output::ConsoleOutputInterface; -use shirabe_external_packages::symfony::console::output::console_output::ConsoleOutput; -use shirabe_external_packages::symfony::console::output::output_interface::{ - self, OutputInterface, -}; -use shirabe_external_packages::symfony::console::signal_registry::signal_registry::SignalRegistry; -use shirabe_external_packages::symfony::console::style::style_interface::StyleInterface; -use shirabe_external_packages::symfony::console::style::symfony_style::SymfonyStyle; -use shirabe_external_packages::symfony::console::terminal::Terminal; use shirabe_php_shim::Catch as _; use shirabe_php_shim::{ LogicException as ShimLogicException, PHP_VERSION, PHP_VERSION_ID, PhpMixed, RuntimeException, @@ -102,6 +66,38 @@ use shirabe_php_shim::{ php_uname, posix_getuid, random_bytes, realpath, restore_error_handler, round, str_contains, str_replace, strpos, strtoupper, sys_get_temp_dir, time, unlink, }; +use shirabe_symfony_console::application::Application as BaseApplication; +use shirabe_symfony_console::command::Command as SymfonyCommand; +use shirabe_symfony_console::command::help_command::HelpCommand; +use shirabe_symfony_console::command::signalable_command_interface::SignalableCommandInterface; +use shirabe_symfony_console::command_loader::command_loader_interface::CommandLoaderInterface; +use shirabe_symfony_console::completion::completion_input::CompletionInput; +use shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions; +use shirabe_symfony_console::exception::CommandNotFoundException; +use shirabe_symfony_console::exception::invalid_argument_exception::InvalidArgumentException as ConsoleInvalidArgumentException; +use shirabe_symfony_console::exception::invalid_option_exception::InvalidOptionException; +use shirabe_symfony_console::exception::logic_exception::LogicException as ConsoleLogicException; +use shirabe_symfony_console::exception::missing_input_exception::MissingInputException; +use shirabe_symfony_console::exception::namespace_not_found_exception::NamespaceNotFoundException; +use shirabe_symfony_console::exception::runtime_exception::RuntimeException as ConsoleRuntimeException; +use shirabe_symfony_console::formatter::output_formatter::OutputFormatter; +use shirabe_symfony_console::helper::HelperSet; +use shirabe_symfony_console::helper::QuestionHelper; +use shirabe_symfony_console::helper::formatter_helper::{FormatBlockMessages, FormatterHelper}; +use shirabe_symfony_console::helper::helper::Helper; +use shirabe_symfony_console::input::InputDefinition; +use shirabe_symfony_console::input::InputInterface; +use shirabe_symfony_console::input::InputOption; +use shirabe_symfony_console::input::argv_input::ArgvInput; +use shirabe_symfony_console::input::array_input::ArrayInput; +use shirabe_symfony_console::input::input_argument::InputArgument; +use shirabe_symfony_console::output::ConsoleOutputInterface; +use shirabe_symfony_console::output::console_output::ConsoleOutput; +use shirabe_symfony_console::output::output_interface::{self, OutputInterface}; +use shirabe_symfony_console::signal_registry::signal_registry::SignalRegistry; +use shirabe_symfony_console::style::style_interface::StyleInterface; +use shirabe_symfony_console::style::symfony_style::SymfonyStyle; +use shirabe_symfony_console::terminal::Terminal; use shirabe_symfony_process::exception::ProcessTimedOutException; /// The PHP `Composer\Console\Application` and `Symfony\Component\Console\Application` are @@ -782,12 +778,12 @@ impl Application { } } // array_filter($commandNames) - let filtered: Vec<shirabe_external_packages::symfony::console::completion::completion_suggestions::StringOrSuggestion> = + let filtered: Vec<shirabe_symfony_console::completion::completion_suggestions::StringOrSuggestion> = command_names .into_iter() .filter(shirabe_php_shim::php_truthy) .map(|n| { - shirabe_external_packages::symfony::console::completion::completion_suggestions::StringOrSuggestion::String( + shirabe_symfony_console::completion::completion_suggestions::StringOrSuggestion::String( shirabe_php_shim::php_to_string(&n), ) }) @@ -1568,7 +1564,7 @@ impl Application { /// Gets the default input definition (Symfony base; `parent::getDefaultInputDefinition`). pub fn base_get_default_input_definition(&self) -> InputDefinition { - use shirabe_external_packages::symfony::console::input::input_definition::DefinitionItem; + use shirabe_symfony_console::input::input_definition::DefinitionItem; InputDefinition::new(vec![ DefinitionItem::InputArgument( InputArgument::new( @@ -1651,10 +1647,10 @@ impl Application { pub fn base_get_default_commands( &self, ) -> Vec<std::rc::Rc<std::cell::RefCell<dyn SymfonyCommand>>> { - use shirabe_external_packages::symfony::console::command::complete_command::CompleteCommand; - use shirabe_external_packages::symfony::console::command::dump_completion_command::DumpCompletionCommand; - use shirabe_external_packages::symfony::console::command::help_command::HelpCommand; - use shirabe_external_packages::symfony::console::command::list_command::ListCommand; + use shirabe_symfony_console::command::complete_command::CompleteCommand; + use shirabe_symfony_console::command::dump_completion_command::DumpCompletionCommand; + use shirabe_symfony_console::command::help_command::HelpCommand; + use shirabe_symfony_console::command::list_command::ListCommand; vec![ std::rc::Rc::new(std::cell::RefCell::new(HelpCommand::new())) @@ -3074,9 +3070,7 @@ pub(crate) fn run_worker_reverse_command(name: &str, input_line: &str) -> anyhow }; let input: std::rc::Rc<std::cell::RefCell<dyn InputInterface>> = std::rc::Rc::new(std::cell::RefCell::new( - shirabe_external_packages::symfony::console::input::string_input::StringInput::new( - &line, - )?, + shirabe_symfony_console::input::string_input::StringInput::new(&line)?, )); let output: std::rc::Rc<std::cell::RefCell<dyn OutputInterface>> = std::rc::Rc::new( std::cell::RefCell::new(ConsoleOutput::new(None, None, None)?), diff --git a/crates/shirabe/src/console/html_output_formatter.rs b/crates/shirabe/src/console/html_output_formatter.rs index ddfd3044..2f523c37 100644 --- a/crates/shirabe/src/console/html_output_formatter.rs +++ b/crates/shirabe/src/console/html_output_formatter.rs @@ -1,10 +1,10 @@ //! ref: composer/src/Composer/Console/HtmlOutputFormatter.php use indexmap::IndexMap; -use shirabe_external_packages::symfony::console::formatter::OutputFormatter; -use shirabe_external_packages::symfony::console::formatter::OutputFormatterInterface; -use shirabe_external_packages::symfony::console::formatter::OutputFormatterStyleInterface; use shirabe_pcre::{CaptureKey, Preg}; +use shirabe_symfony_console::formatter::OutputFormatter; +use shirabe_symfony_console::formatter::OutputFormatterInterface; +use shirabe_symfony_console::formatter::OutputFormatterStyleInterface; #[derive(Debug)] pub struct HtmlOutputFormatter { diff --git a/crates/shirabe/src/console/input.rs b/crates/shirabe/src/console/input.rs index 9661c7ad..b8076247 100644 --- a/crates/shirabe/src/console/input.rs +++ b/crates/shirabe/src/console/input.rs @@ -4,8 +4,8 @@ pub mod input_option; pub use input_argument::*; pub use input_option::*; -use shirabe_external_packages::symfony::console::completion::completion_input::CompletionInput; -use shirabe_external_packages::symfony::console::completion::completion_suggestions::{ +use shirabe_symfony_console::completion::completion_input::CompletionInput; +use shirabe_symfony_console::completion::completion_suggestions::{ CompletionSuggestions, StringOrSuggestion, }; @@ -90,8 +90,8 @@ impl InputDefinitionItem { /// Converts to the Symfony-typed definition item accepted by `CommandData::set_definition`. pub(crate) fn to_definition_item( &self, - ) -> shirabe_external_packages::symfony::console::input::input_definition::DefinitionItem { - use shirabe_external_packages::symfony::console::input::input_definition::DefinitionItem; + ) -> shirabe_symfony_console::input::input_definition::DefinitionItem { + use shirabe_symfony_console::input::input_definition::DefinitionItem; match self { InputDefinitionItem::Argument(argument) => { DefinitionItem::InputArgument(argument.to_base()) diff --git a/crates/shirabe/src/console/input/input_argument.rs b/crates/shirabe/src/console/input/input_argument.rs index ab32ffba..ab6f174c 100644 --- a/crates/shirabe/src/console/input/input_argument.rs +++ b/crates/shirabe/src/console/input/input_argument.rs @@ -1,10 +1,10 @@ //! ref: composer/src/Composer/Console/Input/InputArgument.php use crate::console::input::SuggestedValues; -use shirabe_external_packages::symfony::console::completion::completion_input::CompletionInput; -use shirabe_external_packages::symfony::console::completion::completion_suggestions::CompletionSuggestions; -use shirabe_external_packages::symfony::console::input::InputArgument as BaseInputArgument; use shirabe_php_shim::PhpMixed; +use shirabe_symfony_console::completion::completion_input::CompletionInput; +use shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions; +use shirabe_symfony_console::input::InputArgument as BaseInputArgument; #[derive(Debug)] pub struct InputArgument { diff --git a/crates/shirabe/src/console/input/input_option.rs b/crates/shirabe/src/console/input/input_option.rs index 7fa3d699..8a9c19f7 100644 --- a/crates/shirabe/src/console/input/input_option.rs +++ b/crates/shirabe/src/console/input/input_option.rs @@ -1,10 +1,10 @@ //! ref: composer/src/Composer/Console/Input/InputOption.php use crate::console::input::SuggestedValues; -use shirabe_external_packages::symfony::console::completion::completion_input::CompletionInput; -use shirabe_external_packages::symfony::console::completion::completion_suggestions::CompletionSuggestions; -use shirabe_external_packages::symfony::console::input::InputOption as BaseInputOption; use shirabe_php_shim::PhpMixed; +use shirabe_symfony_console::completion::completion_input::CompletionInput; +use shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions; +use shirabe_symfony_console::input::InputOption as BaseInputOption; #[derive(Debug)] pub struct InputOption { diff --git a/crates/shirabe/src/dependency_resolver/problem.rs b/crates/shirabe/src/dependency_resolver/problem.rs index 99fc02b9..9ca4569c 100644 --- a/crates/shirabe/src/dependency_resolver/problem.rs +++ b/crates/shirabe/src/dependency_resolver/problem.rs @@ -10,7 +10,6 @@ use crate::repository::LockArrayRepository; use crate::repository::PlatformRepository; use crate::repository::RepositorySet; use indexmap::IndexMap; -use shirabe_external_packages::symfony::console::formatter::OutputFormatter; use shirabe_pcre::{CaptureKey, Preg}; use shirabe_php_shim::{ CmpOp, LogicException, PhpMixed, defined, extension_loaded, implode, loosely_compare, @@ -20,6 +19,7 @@ use shirabe_php_shim::{ use shirabe_semver::constraint::AnyConstraint; use shirabe_semver::constraint::MultiConstraint; use shirabe_semver::constraint::SimpleConstraint; +use shirabe_symfony_console::formatter::OutputFormatter; /// Represents a problem detected while solving dependencies #[derive(Debug)] diff --git a/crates/shirabe/src/event_dispatcher/event_dispatcher.rs b/crates/shirabe/src/event_dispatcher/event_dispatcher.rs index 04c590c6..72db0543 100644 --- a/crates/shirabe/src/event_dispatcher/event_dispatcher.rs +++ b/crates/shirabe/src/event_dispatcher/event_dispatcher.rs @@ -21,7 +21,6 @@ use crate::script::Event as ScriptEvent; use crate::util::Platform; use crate::util::ProcessExecutor; use indexmap::IndexMap; -use shirabe_external_packages::symfony::console::output::output_interface; use shirabe_pcre::{CaptureKey, Preg}; use shirabe_php_rpc::{ PhpThrow, PluginValue, RustMethodDispatcher, RustObjHandle, call_function, @@ -36,6 +35,7 @@ use shirabe_php_shim::{ str_contains, str_ends_with, str_replace, str_starts_with, strlen, strpos, strtoupper, substr, trim, }; +use shirabe_symfony_console::output::output_interface; use shirabe_symfony_process::ExecutableFinder; use shirabe_symfony_process::PhpExecutableFinder; diff --git a/crates/shirabe/src/factory.rs b/crates/shirabe/src/factory.rs index 18ff8ef5..6d20c3cb 100644 --- a/crates/shirabe/src/factory.rs +++ b/crates/shirabe/src/factory.rs @@ -51,10 +51,6 @@ use crate::util::ProcessExecutor; use crate::util::Silencer; use crate::util::r#loop::Loop; 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::formatter::OutputFormatterStyleInterface; -use shirabe_external_packages::symfony::console::output::ConsoleOutput; use shirabe_php_shim::Catch as _; use shirabe_php_shim::{ InvalidArgumentException, PATHINFO_EXTENSION, PHP_EOL, PHP_OS, PhpMixed, RuntimeException, @@ -62,6 +58,10 @@ use shirabe_php_shim::{ file_exists, file_get_contents, file_put_contents, implode, is_dir, is_file, json_decode, mkdir, pathinfo, realpath, rename, rtrim, strpos, strtr, substr, trim, }; +use shirabe_symfony_console::formatter::OutputFormatter; +use shirabe_symfony_console::formatter::OutputFormatterStyle; +use shirabe_symfony_console::formatter::OutputFormatterStyleInterface; +use shirabe_symfony_console::output::ConsoleOutput; /// Either a configuration array or a filename to read from. PHP's `$localConfig` accepts both. pub enum LocalConfigInput { @@ -402,7 +402,7 @@ impl Factory { let formatter = OutputFormatter::new(false, styles); ConsoleOutput::new( - Some(shirabe_external_packages::symfony::console::output::output_interface::VERBOSITY_NORMAL), + Some(shirabe_symfony_console::output::output_interface::VERBOSITY_NORMAL), None, Some(std::rc::Rc::new(std::cell::RefCell::new(formatter))), ) diff --git a/crates/shirabe/src/installer/suggested_packages_reporter.rs b/crates/shirabe/src/installer/suggested_packages_reporter.rs index 86540f50..916f647d 100644 --- a/crates/shirabe/src/installer/suggested_packages_reporter.rs +++ b/crates/shirabe/src/installer/suggested_packages_reporter.rs @@ -6,9 +6,9 @@ use crate::package::PackageInterfaceHandle; use crate::repository::InstalledRepository; use crate::repository::RepositoryInterface; use indexmap::IndexMap; -use shirabe_external_packages::symfony::console::formatter::OutputFormatter; use shirabe_pcre::Preg; use shirabe_php_shim::php_regex; +use shirabe_symfony_console::formatter::OutputFormatter; #[derive(Debug)] pub struct SuggestedPackagesReporter { diff --git a/crates/shirabe/src/io/buffer_io.rs b/crates/shirabe/src/io/buffer_io.rs index 4b095e1c..75c850f5 100644 --- a/crates/shirabe/src/io/buffer_io.rs +++ b/crates/shirabe/src/io/buffer_io.rs @@ -1,17 +1,17 @@ //! ref: composer/src/Composer/IO/BufferIO.php use crate::io::ConsoleIO; -use shirabe_external_packages::symfony::console::formatter::OutputFormatterInterface; -use shirabe_external_packages::symfony::console::helper::QuestionHelper; -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_external_packages::symfony::console::output::StreamOutput; use shirabe_pcre::Preg; use shirabe_php_shim::{ PHP_EOL, PhpMixed, PhpResource, RuntimeException, SEEK_SET, fopen, fseek, fwrite, php_regex, rewind, stream_get_contents, strip_tags, }; +use shirabe_symfony_console::formatter::OutputFormatterInterface; +use shirabe_symfony_console::helper::QuestionHelper; +use shirabe_symfony_console::input::InputInterface; +use shirabe_symfony_console::input::StringInput; +use shirabe_symfony_console::output::OutputInterface; +use shirabe_symfony_console::output::StreamOutput; #[derive(Debug)] pub struct BufferIO { diff --git a/crates/shirabe/src/io/console_io.rs b/crates/shirabe/src/io/console_io.rs index 8d21242d..043ef939 100644 --- a/crates/shirabe/src/io/console_io.rs +++ b/crates/shirabe/src/io/console_io.rs @@ -9,24 +9,22 @@ use crate::io::io_interface; use crate::question::StrictConfirmationQuestion; use indexmap::IndexMap; use indexmap::indexmap; -use shirabe_external_packages::symfony::console::helper::ProgressBar; -use shirabe_external_packages::symfony::console::helper::QuestionHelper; -use shirabe_external_packages::symfony::console::helper::QuestionHelperInterface; -use shirabe_external_packages::symfony::console::helper::Table; -use shirabe_external_packages::symfony::console::input::InputInterface; -use shirabe_external_packages::symfony::console::output::ConsoleOutput; -use shirabe_external_packages::symfony::console::output::ConsoleOutputInterface; -use shirabe_external_packages::symfony::console::output::output_interface::{ - self, OutputInterface, -}; -use shirabe_external_packages::symfony::console::question::ChoiceQuestion; -use shirabe_external_packages::symfony::console::question::Question; -use shirabe_external_packages::symfony::console::question::QuestionInterface; use shirabe_pcre::Preg; use shirabe_php_shim::{ PhpMixed, array_search, implode, in_array_strict, is_array, is_string, microtime, str_repeat, strip_tags, strlen, }; +use shirabe_symfony_console::helper::ProgressBar; +use shirabe_symfony_console::helper::QuestionHelper; +use shirabe_symfony_console::helper::QuestionHelperInterface; +use shirabe_symfony_console::helper::Table; +use shirabe_symfony_console::input::InputInterface; +use shirabe_symfony_console::output::ConsoleOutput; +use shirabe_symfony_console::output::ConsoleOutputInterface; +use shirabe_symfony_console::output::output_interface::{self, OutputInterface}; +use shirabe_symfony_console::question::ChoiceQuestion; +use shirabe_symfony_console::question::Question; +use shirabe_symfony_console::question::QuestionInterface; /// The Input/Output helper. #[derive(Debug)] @@ -486,13 +484,11 @@ impl IOInterfaceImmutable for ConsoleIO { Option<PhpMixed>, ) -> Result< PhpMixed, - shirabe_external_packages::symfony::console::exception::InvalidArgumentException, + shirabe_symfony_console::exception::InvalidArgumentException, >, > = Box::new(move |answer: Option<PhpMixed>| { validator(answer.unwrap_or(PhpMixed::Null)).map_err(|e| { - shirabe_external_packages::symfony::console::exception::InvalidArgumentException::new( - e.to_string(), - ) + shirabe_symfony_console::exception::InvalidArgumentException::new(e.to_string()) }) }); question.set_validator(Some(adapted)); diff --git a/crates/shirabe/src/lib.rs b/crates/shirabe/src/lib.rs index afcc0cee..7730bc66 100644 --- a/crates/shirabe/src/lib.rs +++ b/crates/shirabe/src/lib.rs @@ -32,7 +32,7 @@ pub mod util; pub fn run(argv: Vec<String>) -> anyhow::Result<i32> { use crate::console::ApplicationHandle; use crate::util::Platform; - use shirabe_external_packages::symfony::console::input::argv_input::ArgvInput; + use shirabe_symfony_console::input::argv_input::ArgvInput; // TODO(php-runtime): the full initialization process in composer/bin/composer should be ported // somewhere else that communicates with the real PHP runtime. diff --git a/crates/shirabe/src/plugin/command_event.rs b/crates/shirabe/src/plugin/command_event.rs index afd93fbb..55fe9052 100644 --- a/crates/shirabe/src/plugin/command_event.rs +++ b/crates/shirabe/src/plugin/command_event.rs @@ -3,9 +3,9 @@ use crate::event_dispatcher::Event; use crate::event_dispatcher::EventInterface; use indexmap::IndexMap; -use shirabe_external_packages::symfony::console::input::InputInterface; -use shirabe_external_packages::symfony::console::output::OutputInterface; use shirabe_php_shim::PhpMixed; +use shirabe_symfony_console::input::InputInterface; +use shirabe_symfony_console::output::OutputInterface; #[derive(Debug)] pub struct CommandEvent { diff --git a/crates/shirabe/src/plugin/php_plugin_proxy.rs b/crates/shirabe/src/plugin/php_plugin_proxy.rs index af9d04db..715a21dd 100644 --- a/crates/shirabe/src/plugin/php_plugin_proxy.rs +++ b/crates/shirabe/src/plugin/php_plugin_proxy.rs @@ -28,14 +28,14 @@ use crate::repository::{ RepositoryInterfaceHandle, RepositoryManagerInterface, }; 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_rpc::{ PhpObjHandle, PhpThrow, PluginValue, RustMethodDispatcher, RustObjHandle, call_function_with_dispatcher, call_php_method, release_php_handle, }; use shirabe_php_shim::PhpMixed; +use shirabe_symfony_console::command::command::Command; +use shirabe_symfony_console::input::InputInterface; +use shirabe_symfony_console::output::OutputInterface; /// A Rust-side entity a PHP proxy stub points back to. #[derive(Debug, Clone)] @@ -2901,11 +2901,9 @@ impl PhpCommandProxy { handle: &PhpObjHandle, data: &crate::command::BaseCommandData, ) -> anyhow::Result<()> { - use shirabe_external_packages::symfony::console::input::input_argument::InputArgument; - use shirabe_external_packages::symfony::console::input::input_definition::{ - DefinitionItem, InputDefinition, - }; - use shirabe_external_packages::symfony::console::input::input_option::InputOption; + use shirabe_symfony_console::input::input_argument::InputArgument; + use shirabe_symfony_console::input::input_definition::{DefinitionItem, InputDefinition}; + use shirabe_symfony_console::input::input_option::InputOption; let value = unwrap_php_result(call_function_with_dispatcher( "__shirabe_read_command_definition", @@ -3010,7 +3008,7 @@ impl PhpCommandProxy { )?)); } data.command_data().set_definition( - shirabe_external_packages::symfony::console::command::command::SetDefinitionArg::Definition( + shirabe_symfony_console::command::command::SetDefinitionArg::Definition( InputDefinition::new(items)?, ), ); @@ -3105,7 +3103,7 @@ impl Command for PhpCommandProxy { self.proxy_command } - 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 PhpCommandProxy { diff --git a/crates/shirabe/src/plugin/pre_command_run_event.rs b/crates/shirabe/src/plugin/pre_command_run_event.rs index 50a182b6..23728e4c 100644 --- a/crates/shirabe/src/plugin/pre_command_run_event.rs +++ b/crates/shirabe/src/plugin/pre_command_run_event.rs @@ -4,8 +4,8 @@ use crate::event_dispatcher::Event; use crate::event_dispatcher::EventInterface; use indexmap::IndexMap; -use shirabe_external_packages::symfony::console::input::InputInterface; use shirabe_php_shim::PhpMixed; +use shirabe_symfony_console::input::InputInterface; #[derive(Debug)] pub struct PreCommandRunEvent { diff --git a/crates/shirabe/src/question/strict_confirmation_question.rs b/crates/shirabe/src/question/strict_confirmation_question.rs index 4d246631..107b9c25 100644 --- a/crates/shirabe/src/question/strict_confirmation_question.rs +++ b/crates/shirabe/src/question/strict_confirmation_question.rs @@ -1,10 +1,10 @@ //! ref: composer/src/Composer/Question/StrictConfirmationQuestion.php -use shirabe_external_packages::symfony::console::exception::InvalidArgumentException; -use shirabe_external_packages::symfony::console::question::Question; -use shirabe_external_packages::symfony::console::question::QuestionInterface; use shirabe_pcre::Preg; use shirabe_php_shim::{PhpMixed, empty, is_bool}; +use shirabe_symfony_console::exception::InvalidArgumentException; +use shirabe_symfony_console::question::Question; +use shirabe_symfony_console::question::QuestionInterface; #[derive(Debug)] pub struct StrictConfirmationQuestion { diff --git a/crates/shirabe/src/util/loop.rs b/crates/shirabe/src/util/loop.rs index f94788ac..5d2845c1 100644 --- a/crates/shirabe/src/util/loop.rs +++ b/crates/shirabe/src/util/loop.rs @@ -4,7 +4,7 @@ use crate::util::HttpDownloader; use crate::util::ProcessExecutor; use futures::StreamExt; use futures::stream::FuturesUnordered; -use shirabe_external_packages::symfony::console::helper::ProgressBar; +use shirabe_symfony_console::helper::ProgressBar; #[derive(Debug)] pub struct Loop { diff --git a/crates/shirabe/src/util/process_executor.rs b/crates/shirabe/src/util/process_executor.rs index 56199868..91c27fd0 100644 --- a/crates/shirabe/src/util/process_executor.rs +++ b/crates/shirabe/src/util/process_executor.rs @@ -707,7 +707,7 @@ impl ProcessExecutor { // the spawn request to the PHP child over that channel instead of calling `Process::start()` // here. Release the permit on the child's completion notification, not by polling a // Rust-owned process handle. The return type below is provisional: the real deliverable is a - // handle to the live PHP-side Process object, not a `shirabe_external_packages` `Process` + // handle to the live PHP-side Process object, not a `shirabe_symfony_process` `Process` // value, so this signature will need to change once the RPC plumbing exists. pub fn execute_async_php<C>( &mut self, diff --git a/crates/shirabe/tests/advisory/auditor_test.rs b/crates/shirabe/tests/advisory/auditor_test.rs index e3b72536..3a066ed7 100644 --- a/crates/shirabe/tests/advisory/auditor_test.rs +++ b/crates/shirabe/tests/advisory/auditor_test.rs @@ -24,11 +24,11 @@ use shirabe::repository::RepositoryInterfaceHandle; use shirabe::repository::RepositorySet; use shirabe::repository::SearchResult; use shirabe::repository::SecurityAdvisoryResult; -use shirabe_external_packages::symfony::console::output::output_interface; use shirabe_php_shim::date_create; use shirabe_semver::VersionParser; use shirabe_semver::constraint::AnyConstraint; use shirabe_semver::constraint::SimpleConstraint; +use shirabe_symfony_console::output::output_interface; fn constraint(operator: &str, version: &str) -> shirabe_semver::constraint::AnyConstraint { SimpleConstraint::new(operator.to_string(), version.to_string(), None).into() diff --git a/crates/shirabe/tests/application_test.rs b/crates/shirabe/tests/application_test.rs index 4e8a0f05..f0bde547 100644 --- a/crates/shirabe/tests/application_test.rs +++ b/crates/shirabe/tests/application_test.rs @@ -12,12 +12,12 @@ use shirabe::command::about_command::AboutCommand; use shirabe::command::self_update_command::SelfUpdateCommand; use shirabe::console::application::ApplicationHandle; use shirabe::util::platform::Platform; -use shirabe_external_packages::symfony::console::command::Command; -use shirabe_external_packages::symfony::console::input::array_input::ArrayInput; -use shirabe_external_packages::symfony::console::input::input_interface::InputInterface; -use shirabe_external_packages::symfony::console::output::buffered_output::BufferedOutput; -use shirabe_external_packages::symfony::console::output::output_interface::OutputInterface; use shirabe_php_shim::{PHP_EOL, PHP_SERVER, PhpMixed, time}; +use shirabe_symfony_console::command::Command; +use shirabe_symfony_console::input::array_input::ArrayInput; +use shirabe_symfony_console::input::input_interface::InputInterface; +use shirabe_symfony_console::output::buffered_output::BufferedOutput; +use shirabe_symfony_console::output::output_interface::OutputInterface; fn set_up() { Platform::put_env("COMPOSER_DISABLE_XDEBUG_WARN", "1"); diff --git a/crates/shirabe/tests/autoload/autoload_generator_test.rs b/crates/shirabe/tests/autoload/autoload_generator_test.rs index 81a4040f..cd0a3e5b 100644 --- a/crates/shirabe/tests/autoload/autoload_generator_test.rs +++ b/crates/shirabe/tests/autoload/autoload_generator_test.rs @@ -18,10 +18,10 @@ use shirabe::repository::{InstalledArrayRepository, InstalledRepositoryInterface use shirabe::script::ScriptEvents; use shirabe::util::http_downloader::HttpDownloader; use shirabe::util::r#loop::Loop; -use shirabe_external_packages::symfony::console::output::output_interface; use shirabe_php_shim::{PhpMixed, dirname, preg_quote, realpath, strtr}; use shirabe_semver::VersionParser; use shirabe_semver::constraint::{AnyConstraint, MatchAllConstraint, SimpleConstraint}; +use shirabe_symfony_console::output::output_interface; use tempfile::TempDir; /// The mock `InstallationManager::getInstallPath` used throughout the test: metapackages return diff --git a/crates/shirabe/tests/command/archive_command_test.rs b/crates/shirabe/tests/command/archive_command_test.rs index 6d20fda0..ac1ad462 100644 --- a/crates/shirabe/tests/command/archive_command_test.rs +++ b/crates/shirabe/tests/command/archive_command_test.rs @@ -15,13 +15,13 @@ use shirabe::repository::{ InstalledArrayRepository, RepositoryInterfaceHandle, RepositoryManagerInterface, }; use shirabe::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::input::array_input::ArrayInput; -use shirabe_external_packages::symfony::console::output::OutputInterface; -use shirabe_external_packages::symfony::console::output::buffered_output::BufferedOutput; use shirabe_php_shim::PhpMixed; use shirabe_semver::VersionParser; +use shirabe_symfony_console::command::command::Command; +use shirabe_symfony_console::input::InputInterface; +use shirabe_symfony_console::input::array_input::ArrayInput; +use shirabe_symfony_console::output::OutputInterface; +use shirabe_symfony_console::output::buffered_output::BufferedOutput; // PHP mocks `Composer\Package\Archiver\ArchiveManager` with // getMockBuilder(...)->disableOriginalConstructor(). diff --git a/crates/shirabe/tests/common/io_mock.rs b/crates/shirabe/tests/common/io_mock.rs index edb5806f..7ea3059c 100644 --- a/crates/shirabe/tests/common/io_mock.rs +++ b/crates/shirabe/tests/common/io_mock.rs @@ -5,9 +5,9 @@ use shirabe::io::buffer_io::BufferIO; use shirabe::io::io_interface; use shirabe::io::{IOInterface, IOInterfaceImmutable, IOInterfaceMutable}; use shirabe::util::platform::Platform; -use shirabe_external_packages::symfony::console::output::output_interface; use shirabe_pcre::Preg; use shirabe_php_shim::{PHP_EOL, PhpMixed, php_regex, preg_quote}; +use shirabe_symfony_console::output::output_interface; use std::collections::VecDeque; // A single entry of the IO expectation list. PHP models these as associative diff --git a/crates/shirabe/tests/common/test_case.rs b/crates/shirabe/tests/common/test_case.rs index 7f8e1d54..e15d2883 100644 --- a/crates/shirabe/tests/common/test_case.rs +++ b/crates/shirabe/tests/common/test_case.rs @@ -21,16 +21,16 @@ use shirabe::util::http_downloader::HttpDownloader; use shirabe::util::r#loop::Loop; use shirabe::util::platform::Platform; use shirabe::util::process_executor::ProcessExecutor; -use shirabe_external_packages::symfony::console::input::array_input::ArrayInput; -use shirabe_external_packages::symfony::console::input::input_interface::InputInterface; -use shirabe_external_packages::symfony::console::input::streamable_input_interface::StreamableInputInterface; -use shirabe_external_packages::symfony::console::output::console_output::ConsoleOutput; -use shirabe_external_packages::symfony::console::output::console_output_interface::ConsoleOutputInterface; -use shirabe_external_packages::symfony::console::output::output_interface::OutputInterface; -use shirabe_external_packages::symfony::console::output::stream_output::StreamOutput; use shirabe_php_shim::{PhpMixed, PhpResource}; use shirabe_semver::VersionParser; use shirabe_semver::constraint::{AnyConstraint, SimpleConstraint}; +use shirabe_symfony_console::input::array_input::ArrayInput; +use shirabe_symfony_console::input::input_interface::InputInterface; +use shirabe_symfony_console::input::streamable_input_interface::StreamableInputInterface; +use shirabe_symfony_console::output::console_output::ConsoleOutput; +use shirabe_symfony_console::output::console_output_interface::ConsoleOutputInterface; +use shirabe_symfony_console::output::output_interface::OutputInterface; +use shirabe_symfony_console::output::stream_output::StreamOutput; use std::path::PathBuf; use tempfile::TempDir; @@ -309,8 +309,8 @@ pub fn get_application_tester() -> ApplicationTester { /// ref: Symfony\Component\Console\Tester\ApplicationTester::run options. /// -/// Lives in the test harness (not `shirabe_external_packages`) because the tester drives shirabe's -/// own `ApplicationHandle`, which the external-packages crate cannot depend on. +/// Lives in the test harness (not `shirabe_symfony_console`) because the tester drives shirabe's +/// own `ApplicationHandle`, which the console crate cannot depend on. #[derive(Debug, Default)] pub struct RunOptions { pub interactive: Option<bool>, diff --git a/crates/shirabe/tests/completion_functional_test.rs b/crates/shirabe/tests/completion_functional_test.rs index 89478d9d..66f2f87b 100644 --- a/crates/shirabe/tests/completion_functional_test.rs +++ b/crates/shirabe/tests/completion_functional_test.rs @@ -14,7 +14,7 @@ mod bootstrap; use serial_test::serial; use shirabe::console::application::{Application, ApplicationHandle}; -use shirabe_external_packages::symfony::console::tester::command_completion_tester::CommandCompletionTester; +use shirabe_symfony_console::tester::command_completion_tester::CommandCompletionTester; struct RestoreCwd(std::path::PathBuf); @@ -48,8 +48,7 @@ fn assert_complete(input: &str, expected_suggestions: Option<&[&str]>) { let base = application.__base_application(); let command = { let mut app_ref = base.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>() diff --git a/crates/shirabe/tests/console/html_output_formatter_test.rs b/crates/shirabe/tests/console/html_output_formatter_test.rs index 31bd460d..e0835973 100644 --- a/crates/shirabe/tests/console/html_output_formatter_test.rs +++ b/crates/shirabe/tests/console/html_output_formatter_test.rs @@ -2,9 +2,7 @@ use indexmap::IndexMap; use shirabe::console::html_output_formatter::HtmlOutputFormatter; -use shirabe_external_packages::symfony::console::formatter::{ - OutputFormatterStyle, OutputFormatterStyleInterface, -}; +use shirabe_symfony_console::formatter::{OutputFormatterStyle, OutputFormatterStyleInterface}; #[test] fn test_formatting() { diff --git a/crates/shirabe/tests/documentation_test.rs b/crates/shirabe/tests/documentation_test.rs index 7a13ce1d..ad945aa3 100644 --- a/crates/shirabe/tests/documentation_test.rs +++ b/crates/shirabe/tests/documentation_test.rs @@ -1,8 +1,8 @@ //! ref: composer/tests/Composer/Test/DocumentationTest.php use shirabe::console::application::ApplicationHandle; -use shirabe_external_packages::symfony::console::command::Command; -use shirabe_external_packages::symfony::console::descriptor::application_description::ApplicationDescription; +use shirabe_symfony_console::command::Command; +use shirabe_symfony_console::descriptor::application_description::ApplicationDescription; fn get_command_name(command: &std::rc::Rc<std::cell::RefCell<dyn Command>>) -> String { let mut name = command.borrow().get_name().unwrap_or_default(); diff --git a/crates/shirabe/tests/event_dispatcher/event_dispatcher_test.rs b/crates/shirabe/tests/event_dispatcher/event_dispatcher_test.rs index 817a6954..a343d056 100644 --- a/crates/shirabe/tests/event_dispatcher/event_dispatcher_test.rs +++ b/crates/shirabe/tests/event_dispatcher/event_dispatcher_test.rs @@ -26,9 +26,9 @@ use shirabe::script::ScriptEvents; use shirabe::util::platform::Platform; use shirabe::util::process_executor::{MockHandler, ProcessExecutor}; use shirabe_class_map_generator::class_map::ClassMap; -use shirabe_external_packages::symfony::console::output::output_interface; use shirabe_php_shim::Catch as _; use shirabe_php_shim::{PHP_EOL, PhpMixed}; +use shirabe_symfony_console::output::output_interface; fn tear_down() { Platform::clear_env("COMPOSER_SKIP_SCRIPTS"); diff --git a/crates/shirabe/tests/installer_test.rs b/crates/shirabe/tests/installer_test.rs index 4c6ce981..295d9250 100644 --- a/crates/shirabe/tests/installer_test.rs +++ b/crates/shirabe/tests/installer_test.rs @@ -42,20 +42,18 @@ use shirabe::util::r#loop::Loop; use shirabe::util::platform::Platform; use shirabe::util::process_executor::ProcessExecutor; use shirabe_class_map_generator::class_map::ClassMap; -use shirabe_external_packages::symfony::console::command::command::Command as SymfonyCommand; -use shirabe_external_packages::symfony::console::command::command::CommandData; -use shirabe_external_packages::symfony::console::input::input_argument::InputArgument; -use shirabe_external_packages::symfony::console::input::input_interface::InputInterface; -use shirabe_external_packages::symfony::console::input::input_option::InputOption; -use shirabe_external_packages::symfony::console::input::string_input::StringInput; -use shirabe_external_packages::symfony::console::output::output_interface::{ - OutputInterface, VERBOSITY_NORMAL, -}; -use shirabe_external_packages::symfony::console::output::stream_output::StreamOutput; use shirabe_pcre::preg::Preg; use shirabe_php_shim::{PREG_SPLIT_DELIM_CAPTURE, PhpMixed, php_regex}; use shirabe_semver::VersionParser; use shirabe_semver::constraint::AnyConstraint; +use shirabe_symfony_console::command::command::Command as SymfonyCommand; +use shirabe_symfony_console::command::command::CommandData; +use shirabe_symfony_console::input::input_argument::InputArgument; +use shirabe_symfony_console::input::input_interface::InputInterface; +use shirabe_symfony_console::input::input_option::InputOption; +use shirabe_symfony_console::input::string_input::StringInput; +use shirabe_symfony_console::output::output_interface::{OutputInterface, VERBOSITY_NORMAL}; +use shirabe_symfony_console::output::stream_output::StreamOutput; // removeDirectory of tempComposerHome (a path produced by the unported install pipeline) is not // ported; the cwd management (setUp's chdir(__DIR__) / tearDown's chdir($this->prevCwd)) and the diff --git a/crates/shirabe/tests/io/buffer_io_test.rs b/crates/shirabe/tests/io/buffer_io_test.rs index c33fd804..5036a172 100644 --- a/crates/shirabe/tests/io/buffer_io_test.rs +++ b/crates/shirabe/tests/io/buffer_io_test.rs @@ -2,8 +2,8 @@ use shirabe::io::IOInterfaceImmutable; use shirabe::io::buffer_io::BufferIO; -use shirabe_external_packages::symfony::console::output::output_interface::VERBOSITY_NORMAL; use shirabe_php_shim::PhpMixed; +use shirabe_symfony_console::output::output_interface::VERBOSITY_NORMAL; #[test] fn test_set_user_inputs() { diff --git a/crates/shirabe/tests/io/console_io_test.rs b/crates/shirabe/tests/io/console_io_test.rs index 15e7100b..c3240ea5 100644 --- a/crates/shirabe/tests/io/console_io_test.rs +++ b/crates/shirabe/tests/io/console_io_test.rs @@ -16,15 +16,15 @@ use shirabe::io::ConsoleIO; use shirabe::io::IOInterfaceImmutable; use shirabe::io::IOInterfaceMutable; use shirabe::io::io_interface::NORMAL; -use shirabe_external_packages::symfony::console::helper::QuestionHelper; -use shirabe_external_packages::symfony::console::input::array_input::ArrayInput; -use shirabe_external_packages::symfony::console::input::input_interface::InputInterface; -use shirabe_external_packages::symfony::console::input::streamable_input_interface::StreamableInputInterface; -use shirabe_external_packages::symfony::console::output::buffered_output::BufferedOutput; -use shirabe_external_packages::symfony::console::output::console_output::ConsoleOutput; -use shirabe_external_packages::symfony::console::output::console_output_interface::ConsoleOutputInterface; -use shirabe_external_packages::symfony::console::output::output_interface::OutputInterface; use shirabe_php_shim::PhpMixed; +use shirabe_symfony_console::helper::QuestionHelper; +use shirabe_symfony_console::input::array_input::ArrayInput; +use shirabe_symfony_console::input::input_interface::InputInterface; +use shirabe_symfony_console::input::streamable_input_interface::StreamableInputInterface; +use shirabe_symfony_console::output::buffered_output::BufferedOutput; +use shirabe_symfony_console::output::console_output::ConsoleOutput; +use shirabe_symfony_console::output::console_output_interface::ConsoleOutputInterface; +use shirabe_symfony_console::output::output_interface::OutputInterface; /// Builds a ConsoleIO backed by real, side-effect-free Input/Output/QuestionHelper. PHP uses /// PHPUnit mocks here, but for tests that exercise only the authentication map they carry no diff --git a/crates/shirabe/tests/package/version/version_selector_test.rs b/crates/shirabe/tests/package/version/version_selector_test.rs index 16ad5fe2..8a3e44a5 100644 --- a/crates/shirabe/tests/package/version/version_selector_test.rs +++ b/crates/shirabe/tests/package/version/version_selector_test.rs @@ -15,10 +15,10 @@ use shirabe::package::version::VersionSelector; use shirabe::package::version::version_parser::VersionParser; use shirabe::repository::PlatformRepository; use shirabe::repository::RepositorySetInterface; -use shirabe_external_packages::symfony::console::output::output_interface; use shirabe_php_shim::PhpMixed; use shirabe_php_shim::{PHP_MAJOR_VERSION, PHP_MINOR_VERSION, PHP_RELEASE_VERSION}; use shirabe_semver::constraint::AnyConstraint; +use shirabe_symfony_console::output::output_interface; mockall::mock! { RepositorySet {} diff --git a/crates/shirabe/tests/plugin/plugin_installer_test.rs b/crates/shirabe/tests/plugin/plugin_installer_test.rs index 65a8872b..0ef36923 100644 --- a/crates/shirabe/tests/plugin/plugin_installer_test.rs +++ b/crates/shirabe/tests/plugin/plugin_installer_test.rs @@ -29,10 +29,10 @@ use shirabe::util::Platform; use shirabe::util::http_downloader::HttpDownloader; use shirabe::util::r#loop::Loop; use shirabe::util::process_executor::ProcessExecutor; -use shirabe_external_packages::symfony::console::output::output_interface::VERBOSITY_NORMAL; use shirabe_php_shim::Catch as _; use shirabe_php_shim::PhpMixed; use shirabe_semver::VersionParser; +use shirabe_symfony_console::output::output_interface::VERBOSITY_NORMAL; use shirabe_symfony_process::PhpExecutableFinder; use tempfile::TempDir; diff --git a/crates/shirabe/tests/question/strict_confirmation_question_test.rs b/crates/shirabe/tests/question/strict_confirmation_question_test.rs index f7f79eb6..3e1ae72e 100644 --- a/crates/shirabe/tests/question/strict_confirmation_question_test.rs +++ b/crates/shirabe/tests/question/strict_confirmation_question_test.rs @@ -1,14 +1,12 @@ //! ref: composer/tests/Composer/Test/Question/StrictConfirmationQuestionTest.php use shirabe::question::StrictConfirmationQuestion; -use shirabe_external_packages::symfony::console::helper::question_helper::{ - QuestionHelper, QuestionHelperInterface, -}; -use shirabe_external_packages::symfony::console::input::array_input::ArrayInput; -use shirabe_external_packages::symfony::console::input::streamable_input_interface::StreamableInputInterface; -use shirabe_external_packages::symfony::console::output::output_interface::OutputInterface; -use shirabe_external_packages::symfony::console::output::stream_output::StreamOutput; use shirabe_php_shim::PhpMixed; +use shirabe_symfony_console::helper::question_helper::{QuestionHelper, QuestionHelperInterface}; +use shirabe_symfony_console::input::array_input::ArrayInput; +use shirabe_symfony_console::input::streamable_input_interface::StreamableInputInterface; +use shirabe_symfony_console::output::output_interface::OutputInterface; +use shirabe_symfony_console::output::stream_output::StreamOutput; const TRUE_ANSWER_REGEX: &str = "/^y(?:es)?$/i"; const FALSE_ANSWER_REGEX: &str = "/^no?$/i"; diff --git a/crates/shirabe/tests/util/http_downloader_test.rs b/crates/shirabe/tests/util/http_downloader_test.rs index f1883721..fcbfd925 100644 --- a/crates/shirabe/tests/util/http_downloader_test.rs +++ b/crates/shirabe/tests/util/http_downloader_test.rs @@ -10,9 +10,9 @@ use shirabe::io::buffer_io::BufferIO; use shirabe::io::io_interface; use shirabe::util::Platform; use shirabe::util::http_downloader::HttpDownloader; -use shirabe_external_packages::symfony::console::output::output_interface::VERBOSITY_NORMAL; use shirabe_php_shim::Catch as _; use shirabe_php_shim::{PHP_EOL, PhpMixed}; +use shirabe_symfony_console::output::output_interface::VERBOSITY_NORMAL; // PHP performs a live HTTP get to assert the URL's user:pass is captured via // setAuthentication. The credential capture happens in `add_job`, before any diff --git a/crates/shirabe/tests/util/process_executor_test.rs b/crates/shirabe/tests/util/process_executor_test.rs index 268bc548..b772c1bc 100644 --- a/crates/shirabe/tests/util/process_executor_test.rs +++ b/crates/shirabe/tests/util/process_executor_test.rs @@ -8,14 +8,14 @@ use shirabe::io::ConsoleIO; use shirabe::io::IOInterface; use shirabe::io::buffer_io::BufferIO; use shirabe::util::process_executor::ProcessExecutor; -use shirabe_external_packages::symfony::console::helper::QuestionHelper; -use shirabe_external_packages::symfony::console::input::array_input::ArrayInput; -use shirabe_external_packages::symfony::console::input::input_interface::InputInterface; -use shirabe_external_packages::symfony::console::output::buffered_output::BufferedOutput; -use shirabe_external_packages::symfony::console::output::output_interface::{ +use shirabe_php_shim::{PHP_EOL, ob_get_clean, ob_start, trim}; +use shirabe_symfony_console::helper::QuestionHelper; +use shirabe_symfony_console::input::array_input::ArrayInput; +use shirabe_symfony_console::input::input_interface::InputInterface; +use shirabe_symfony_console::output::buffered_output::BufferedOutput; +use shirabe_symfony_console::output::output_interface::{ OutputInterface, VERBOSITY_DEBUG, VERBOSITY_NORMAL, }; -use shirabe_php_shim::{PHP_EOL, ob_get_clean, ob_start, trim}; #[test] fn test_execute_captures_output() { |