diff options
37 files changed, 241 insertions, 112 deletions
diff --git a/crates/shirabe-external-packages/src/symfony/component/console/command/command.rs b/crates/shirabe-external-packages/src/symfony/component/console/command/command.rs index 34d1941..c09940e 100644 --- a/crates/shirabe-external-packages/src/symfony/component/console/command/command.rs +++ b/crates/shirabe-external-packages/src/symfony/component/console/command/command.rs @@ -1,12 +1,37 @@ +use crate::symfony::component::console::completion::completion_input::CompletionInput; +use crate::symfony::component::console::completion::completion_suggestions::CompletionSuggestions; use crate::symfony::component::console::input::input_definition::InputDefinition; use crate::symfony::component::console::input::input_interface::InputInterface; use crate::symfony::component::console::output::output_interface::OutputInterface; use shirabe_php_shim::PhpMixed; +pub trait Command { + fn get_name(&self) -> String { + todo!() + } + fn set_name(&mut self, _name: &str) { + todo!() + } + fn get_description(&self) -> String { + todo!() + } + fn set_description(&mut self, _description: &str) { + todo!() + } + fn get_definition(&self) -> &InputDefinition { + todo!() + } + fn complete(&self, _input: &CompletionInput, _suggestions: &mut CompletionSuggestions) { + todo!() + } +} + #[derive(Debug)] -pub struct Command; +pub struct CommandBase; + +impl Command for CommandBase {} -impl Command { +impl CommandBase { pub fn new(_name: Option<&str>) -> Self { todo!() } diff --git a/crates/shirabe/src/command/about_command.rs b/crates/shirabe/src/command/about_command.rs index 583482b..f2fdb80 100644 --- a/crates/shirabe/src/command/about_command.rs +++ b/crates/shirabe/src/command/about_command.rs @@ -4,11 +4,13 @@ use crate::command::base_command::BaseCommand; use crate::composer::Composer; use crate::io::io_interface::IOInterface; use shirabe_external_packages::symfony::component::console::command::command::Command; +use shirabe_external_packages::symfony::component::console::command::command::CommandBase; use shirabe_external_packages::symfony::console::input::input_interface::InputInterface; use shirabe_external_packages::symfony::console::output::output_interface::OutputInterface; +#[derive(Debug)] pub struct AboutCommand { - inner: Command, + inner: CommandBase, composer: Option<Composer>, io: Option<Box<dyn IOInterface>>, } @@ -35,11 +37,11 @@ impl AboutCommand { } impl BaseCommand for AboutCommand { - fn inner(&self) -> &Command { + fn inner(&self) -> &CommandBase { &self.inner } - fn inner_mut(&mut self) -> &mut Command { + fn inner_mut(&mut self) -> &mut CommandBase { &mut self.inner } @@ -59,3 +61,5 @@ impl BaseCommand for AboutCommand { &mut self.io } } + +impl Command for AboutCommand {} diff --git a/crates/shirabe/src/command/archive_command.rs b/crates/shirabe/src/command/archive_command.rs index b271051..623a7d5 100644 --- a/crates/shirabe/src/command/archive_command.rs +++ b/crates/shirabe/src/command/archive_command.rs @@ -5,6 +5,7 @@ use std::any::Any; use anyhow::Result; use shirabe_external_packages::composer::pcre::preg::Preg; use shirabe_external_packages::symfony::component::console::command::command::Command; +use shirabe_external_packages::symfony::component::console::command::command::CommandBase; use shirabe_external_packages::symfony::console::input::input_interface::InputInterface; use shirabe_external_packages::symfony::console::output::output_interface::OutputInterface; use shirabe_php_shim::{LogicException, get_debug_type}; @@ -34,7 +35,7 @@ use crate::util::process_executor::ProcessExecutor; #[derive(Debug)] pub struct ArchiveCommand { - inner: Command, + inner: CommandBase, composer: Option<Composer>, io: Option<Box<dyn IOInterface>>, } @@ -332,11 +333,11 @@ impl ArchiveCommand { } impl BaseCommand for ArchiveCommand { - fn inner(&self) -> &Command { + fn inner(&self) -> &CommandBase { &self.inner } - fn inner_mut(&mut self) -> &mut Command { + fn inner_mut(&mut self) -> &mut CommandBase { &mut self.inner } @@ -356,3 +357,5 @@ impl BaseCommand for ArchiveCommand { &mut self.io } } + +impl Command for ArchiveCommand {} diff --git a/crates/shirabe/src/command/audit_command.rs b/crates/shirabe/src/command/audit_command.rs index 2331f8d..dda0ee7 100644 --- a/crates/shirabe/src/command/audit_command.rs +++ b/crates/shirabe/src/command/audit_command.rs @@ -11,6 +11,7 @@ use crate::repository::installed_repository::InstalledRepository; use crate::repository::repository_set::RepositorySet; use crate::repository::repository_utils::RepositoryUtils; use anyhow::Result; +use shirabe_external_packages::symfony::component::console::command::command::CommandBase; use shirabe_external_packages::symfony::console::output::output_interface::OutputInterface; use shirabe_external_packages::symfony::{ component::console::command::command::Command, console::input::input_interface::InputInterface, @@ -22,7 +23,7 @@ use shirabe_php_shim::{ #[derive(Debug)] pub struct AuditCommand { - inner: Command, + inner: CommandBase, composer: Option<Composer>, io: Option<Box<dyn IOInterface>>, } @@ -161,11 +162,11 @@ impl AuditCommand { } impl BaseCommand for AuditCommand { - fn inner(&self) -> &Command { + fn inner(&self) -> &CommandBase { &self.inner } - fn inner_mut(&mut self) -> &mut Command { + fn inner_mut(&mut self) -> &mut CommandBase { &mut self.inner } @@ -185,3 +186,5 @@ impl BaseCommand for AuditCommand { &mut self.io } } + +impl Command for AuditCommand {} diff --git a/crates/shirabe/src/command/base_command.rs b/crates/shirabe/src/command/base_command.rs index c9f79b7..428cc65 100644 --- a/crates/shirabe/src/command/base_command.rs +++ b/crates/shirabe/src/command/base_command.rs @@ -3,6 +3,7 @@ use anyhow::Result; use indexmap::IndexMap; use shirabe_external_packages::symfony::component::console::command::command::Command; +use shirabe_external_packages::symfony::component::console::command::command::CommandBase; use shirabe_external_packages::symfony::component::console::completion::completion_input::CompletionInput; use shirabe_external_packages::symfony::component::console::completion::completion_suggestions::CompletionSuggestions; use shirabe_external_packages::symfony::component::console::helper::table::Table; @@ -35,8 +36,8 @@ use crate::util::platform::Platform; /// Base class for Composer commands pub trait BaseCommand { - fn inner(&self) -> &Command; - fn inner_mut(&mut self) -> &mut Command; + fn inner(&self) -> &CommandBase; + fn inner_mut(&mut self) -> &mut CommandBase; fn composer(&self) -> Option<&Composer>; fn composer_mut(&mut self) -> &mut Option<Composer>; fn io(&self) -> Option<&dyn IOInterface>; diff --git a/crates/shirabe/src/command/bump_command.rs b/crates/shirabe/src/command/bump_command.rs index 86695cb..7707bb6 100644 --- a/crates/shirabe/src/command/bump_command.rs +++ b/crates/shirabe/src/command/bump_command.rs @@ -4,6 +4,7 @@ use crate::io::io_interface; use anyhow::Result; use shirabe_external_packages::composer::pcre::preg::Preg; use shirabe_external_packages::symfony::component::console::command::command::Command; +use shirabe_external_packages::symfony::component::console::command::command::CommandBase; use shirabe_external_packages::symfony::console::input::input_interface::InputInterface; use shirabe_external_packages::symfony::console::output::output_interface::OutputInterface; use shirabe_php_shim::{PhpMixed, file_get_contents, file_put_contents, is_writable, strtolower}; @@ -26,7 +27,7 @@ use crate::util::silencer::Silencer; #[derive(Debug)] pub struct BumpCommand { - inner: Command, + inner: CommandBase, composer: Option<Composer>, io: Option<Box<dyn IOInterface>>, } @@ -383,11 +384,11 @@ impl BumpCommand { } impl BaseCommand for BumpCommand { - fn inner(&self) -> &Command { + fn inner(&self) -> &CommandBase { &self.inner } - fn inner_mut(&mut self) -> &mut Command { + fn inner_mut(&mut self) -> &mut CommandBase { &mut self.inner } @@ -407,3 +408,5 @@ impl BaseCommand for BumpCommand { &mut self.io } } + +impl Command 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 62cde82..5e13808 100644 --- a/crates/shirabe/src/command/check_platform_reqs_command.rs +++ b/crates/shirabe/src/command/check_platform_reqs_command.rs @@ -3,6 +3,7 @@ use anyhow::Result; use indexmap::IndexMap; use shirabe_external_packages::symfony::component::console::command::command::Command; +use shirabe_external_packages::symfony::component::console::command::command::CommandBase; use shirabe_external_packages::symfony::console::input::input_interface::InputInterface; use shirabe_external_packages::symfony::console::output::output_interface::OutputInterface; use shirabe_php_shim::{PhpMixed, strip_tags}; @@ -28,7 +29,7 @@ struct CheckResult { #[derive(Debug)] pub struct CheckPlatformReqsCommand { - inner: Command, + inner: CommandBase, composer: Option<Composer>, io: Option<Box<dyn IOInterface>>, } @@ -323,11 +324,11 @@ impl CheckPlatformReqsCommand { } impl BaseCommand for CheckPlatformReqsCommand { - fn inner(&self) -> &Command { + fn inner(&self) -> &CommandBase { &self.inner } - fn inner_mut(&mut self) -> &mut Command { + fn inner_mut(&mut self) -> &mut CommandBase { &mut self.inner } @@ -347,3 +348,5 @@ impl BaseCommand for CheckPlatformReqsCommand { &mut self.io } } + +impl Command for CheckPlatformReqsCommand {} diff --git a/crates/shirabe/src/command/clear_cache_command.rs b/crates/shirabe/src/command/clear_cache_command.rs index 1d49502..19a36df 100644 --- a/crates/shirabe/src/command/clear_cache_command.rs +++ b/crates/shirabe/src/command/clear_cache_command.rs @@ -8,12 +8,13 @@ use crate::factory::Factory; use crate::io::io_interface::IOInterface; use indexmap::IndexMap; use shirabe_external_packages::symfony::component::console::command::command::Command; +use shirabe_external_packages::symfony::component::console::command::command::CommandBase; use shirabe_external_packages::symfony::console::input::input_interface::InputInterface; use shirabe_external_packages::symfony::console::output::output_interface::OutputInterface; #[derive(Debug)] pub struct ClearCacheCommand { - inner: Command, + inner: CommandBase, composer: Option<Composer>, io: Option<Box<dyn IOInterface>>, } @@ -123,11 +124,11 @@ impl ClearCacheCommand { } impl BaseCommand for ClearCacheCommand { - fn inner(&self) -> &Command { + fn inner(&self) -> &CommandBase { &self.inner } - fn inner_mut(&mut self) -> &mut Command { + fn inner_mut(&mut self) -> &mut CommandBase { &mut self.inner } @@ -147,3 +148,5 @@ impl BaseCommand for ClearCacheCommand { &mut self.io } } + +impl Command for ClearCacheCommand {} diff --git a/crates/shirabe/src/command/config_command.rs b/crates/shirabe/src/command/config_command.rs index 39ada9a..45bc4c8 100644 --- a/crates/shirabe/src/command/config_command.rs +++ b/crates/shirabe/src/command/config_command.rs @@ -5,6 +5,7 @@ use indexmap::IndexMap; use shirabe_external_packages::composer::pcre::preg::Preg; use shirabe_external_packages::symfony::component::console::command::command::Command; +use shirabe_external_packages::symfony::component::console::command::command::CommandBase; use shirabe_external_packages::symfony::component::console::completion::completion_input::CompletionInput; use shirabe_external_packages::symfony::component::console::input::input_interface::InputInterface; use shirabe_external_packages::symfony::component::console::input::input_option::InputOption; @@ -36,7 +37,7 @@ use shirabe_semver::version_parser::VersionParser; #[derive(Debug)] pub struct ConfigCommand { - inner: Command, + inner: CommandBase, composer: Option<Composer>, io: Option<Box<dyn IOInterface>>, @@ -2183,11 +2184,11 @@ fn key_first_key(value: &PhpMixed) -> Option<String> { } impl BaseCommand for ConfigCommand { - fn inner(&self) -> &Command { + fn inner(&self) -> &CommandBase { &self.inner } - fn inner_mut(&mut self) -> &mut Command { + fn inner_mut(&mut self) -> &mut CommandBase { &mut self.inner } @@ -2233,3 +2234,5 @@ impl BaseConfigCommand for ConfigCommand { self.config_source.as_mut() } } + +impl Command for ConfigCommand {} diff --git a/crates/shirabe/src/command/create_project_command.rs b/crates/shirabe/src/command/create_project_command.rs index 627b84e..68f0369 100644 --- a/crates/shirabe/src/command/create_project_command.rs +++ b/crates/shirabe/src/command/create_project_command.rs @@ -4,6 +4,7 @@ use anyhow::Result; use shirabe_external_packages::composer::pcre::preg::Preg; use shirabe_external_packages::seld::signal::signal_handler::SignalHandler; use shirabe_external_packages::symfony::component::console::command::command::Command; +use shirabe_external_packages::symfony::component::console::command::command::CommandBase; use shirabe_external_packages::symfony::component::console::input::input_interface::InputInterface; use shirabe_external_packages::symfony::component::console::output::output_interface::OutputInterface; use shirabe_external_packages::symfony::component::finder::finder::Finder; @@ -49,7 +50,7 @@ use crate::util::process_executor::ProcessExecutor; /// Install a package as new project into new directory. #[derive(Debug)] pub struct CreateProjectCommand { - inner: Command, + inner: CommandBase, composer: Option<Composer>, io: Option<Box<dyn IOInterface>>, @@ -909,11 +910,11 @@ impl CreateProjectCommand { } impl BaseCommand for CreateProjectCommand { - fn inner(&self) -> &Command { + fn inner(&self) -> &CommandBase { &self.inner } - fn inner_mut(&mut self) -> &mut Command { + fn inner_mut(&mut self) -> &mut CommandBase { &mut self.inner } @@ -933,3 +934,5 @@ impl BaseCommand for CreateProjectCommand { &mut self.io } } + +impl Command for CreateProjectCommand {} diff --git a/crates/shirabe/src/command/depends_command.rs b/crates/shirabe/src/command/depends_command.rs index 75d04fb..8a99ede 100644 --- a/crates/shirabe/src/command/depends_command.rs +++ b/crates/shirabe/src/command/depends_command.rs @@ -1,6 +1,7 @@ //! ref: composer/src/Composer/Command/DependsCommand.php use shirabe_external_packages::symfony::component::console::command::command::Command; +use shirabe_external_packages::symfony::component::console::command::command::CommandBase; use crate::command::base_command::BaseCommand; use crate::command::base_dependency_command::BaseDependencyCommand; @@ -12,8 +13,9 @@ use crate::io::io_interface::IOInterface; use shirabe_external_packages::symfony::console::input::input_interface::InputInterface; use shirabe_external_packages::symfony::console::output::output_interface::OutputInterface; +#[derive(Debug)] pub struct DependsCommand { - inner: Command, + inner: CommandBase, composer: Option<Composer>, io: Option<Box<dyn IOInterface>>, @@ -77,11 +79,11 @@ impl DependsCommand { } impl BaseCommand for DependsCommand { - fn inner(&self) -> &Command { + fn inner(&self) -> &CommandBase { &self.inner } - fn inner_mut(&mut self) -> &mut Command { + fn inner_mut(&mut self) -> &mut CommandBase { &mut self.inner } @@ -111,3 +113,5 @@ impl BaseDependencyCommand for DependsCommand { &mut self.colors } } + +impl Command for DependsCommand {} diff --git a/crates/shirabe/src/command/diagnose_command.rs b/crates/shirabe/src/command/diagnose_command.rs index 23c0cd0..d6205cd 100644 --- a/crates/shirabe/src/command/diagnose_command.rs +++ b/crates/shirabe/src/command/diagnose_command.rs @@ -5,6 +5,7 @@ use indexmap::IndexMap; use shirabe_external_packages::composer::pcre::preg::Preg; use shirabe_external_packages::composer::xdebug_handler::xdebug_handler::XdebugHandler; use shirabe_external_packages::symfony::component::console::command::command::Command; +use shirabe_external_packages::symfony::component::console::command::command::CommandBase; use shirabe_external_packages::symfony::component::console::input::input_interface::InputInterface; use shirabe_external_packages::symfony::component::console::output::output_interface::OutputInterface; use shirabe_external_packages::symfony::component::process::executable_finder::ExecutableFinder; @@ -53,7 +54,7 @@ use crate::util::process_executor::ProcessExecutor; #[derive(Debug)] pub struct DiagnoseCommand { - inner: Command, + inner: CommandBase, composer: Option<Composer>, io: Option<Box<dyn IOInterface>>, @@ -1371,11 +1372,11 @@ impl DiagnoseCommand { } impl BaseCommand for DiagnoseCommand { - fn inner(&self) -> &Command { + fn inner(&self) -> &CommandBase { &self.inner } - fn inner_mut(&mut self) -> &mut Command { + fn inner_mut(&mut self) -> &mut CommandBase { &mut self.inner } @@ -1395,3 +1396,5 @@ impl BaseCommand for DiagnoseCommand { &mut self.io } } + +impl Command for DiagnoseCommand {} diff --git a/crates/shirabe/src/command/dump_autoload_command.rs b/crates/shirabe/src/command/dump_autoload_command.rs index 471b353..43af30d 100644 --- a/crates/shirabe/src/command/dump_autoload_command.rs +++ b/crates/shirabe/src/command/dump_autoload_command.rs @@ -2,6 +2,7 @@ use anyhow::Result; use shirabe_external_packages::symfony::component::console::command::command::Command; +use shirabe_external_packages::symfony::component::console::command::command::CommandBase; use shirabe_external_packages::symfony::console::input::input_interface::InputInterface; use shirabe_external_packages::symfony::console::output::output_interface::OutputInterface; use shirabe_php_shim::{InvalidArgumentException, PhpMixed, file_exists}; @@ -15,7 +16,7 @@ use crate::plugin::plugin_events::PluginEvents; #[derive(Debug)] pub struct DumpAutoloadCommand { - inner: Command, + inner: CommandBase, composer: Option<Composer>, io: Option<Box<dyn IOInterface>>, } @@ -204,11 +205,11 @@ impl DumpAutoloadCommand { } impl BaseCommand for DumpAutoloadCommand { - fn inner(&self) -> &Command { + fn inner(&self) -> &CommandBase { &self.inner } - fn inner_mut(&mut self) -> &mut Command { + fn inner_mut(&mut self) -> &mut CommandBase { &mut self.inner } @@ -228,3 +229,5 @@ impl BaseCommand for DumpAutoloadCommand { &mut self.io } } + +impl Command for DumpAutoloadCommand {} diff --git a/crates/shirabe/src/command/exec_command.rs b/crates/shirabe/src/command/exec_command.rs index 82c90bc..17cdb3e 100644 --- a/crates/shirabe/src/command/exec_command.rs +++ b/crates/shirabe/src/command/exec_command.rs @@ -2,6 +2,7 @@ use anyhow::Result; use shirabe_external_packages::symfony::component::console::command::command::Command; +use shirabe_external_packages::symfony::component::console::command::command::CommandBase; use shirabe_external_packages::symfony::console::input::input_interface::InputInterface; use shirabe_external_packages::symfony::console::output::output_interface::OutputInterface; use shirabe_php_shim::{PhpMixed, RuntimeException, basename, chdir, getcwd, glob}; @@ -14,7 +15,7 @@ use crate::io::io_interface::IOInterface; #[derive(Debug)] pub struct ExecCommand { - inner: Command, + inner: CommandBase, composer: Option<Composer>, io: Option<Box<dyn IOInterface>>, } @@ -193,11 +194,11 @@ impl ExecCommand { } impl BaseCommand for ExecCommand { - fn inner(&self) -> &Command { + fn inner(&self) -> &CommandBase { &self.inner } - fn inner_mut(&mut self) -> &mut Command { + fn inner_mut(&mut self) -> &mut CommandBase { &mut self.inner } @@ -217,3 +218,5 @@ impl BaseCommand for ExecCommand { &mut self.io } } + +impl Command for ExecCommand {} diff --git a/crates/shirabe/src/command/fund_command.rs b/crates/shirabe/src/command/fund_command.rs index cffde6b..066eb8e 100644 --- a/crates/shirabe/src/command/fund_command.rs +++ b/crates/shirabe/src/command/fund_command.rs @@ -6,6 +6,7 @@ use anyhow::Result; use indexmap::IndexMap; use shirabe_external_packages::composer::pcre::preg::Preg; use shirabe_external_packages::symfony::component::console::command::command::Command; +use shirabe_external_packages::symfony::component::console::command::command::CommandBase; use shirabe_external_packages::symfony::console::formatter::output_formatter::OutputFormatter; use shirabe_external_packages::symfony::console::input::input_interface::InputInterface; use shirabe_external_packages::symfony::console::output::output_interface::OutputInterface; @@ -24,7 +25,7 @@ use crate::repository::composite_repository::CompositeRepository; #[derive(Debug)] pub struct FundCommand { - inner: Command, + inner: CommandBase, composer: Option<Composer>, io: Option<Box<dyn IOInterface>>, } @@ -208,11 +209,11 @@ impl FundCommand { } impl BaseCommand for FundCommand { - fn inner(&self) -> &Command { + fn inner(&self) -> &CommandBase { &self.inner } - fn inner_mut(&mut self) -> &mut Command { + fn inner_mut(&mut self) -> &mut CommandBase { &mut self.inner } @@ -232,3 +233,5 @@ impl BaseCommand for FundCommand { &mut self.io } } + +impl Command for FundCommand {} diff --git a/crates/shirabe/src/command/global_command.rs b/crates/shirabe/src/command/global_command.rs index a5423f5..5669328 100644 --- a/crates/shirabe/src/command/global_command.rs +++ b/crates/shirabe/src/command/global_command.rs @@ -5,6 +5,7 @@ use std::path::Path; use anyhow::Result; use shirabe_external_packages::composer::pcre::preg::Preg; use shirabe_external_packages::symfony::component::console::command::command::Command; +use shirabe_external_packages::symfony::component::console::command::command::CommandBase; 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::input_interface::InputInterface; @@ -22,7 +23,7 @@ use crate::util::platform::Platform; #[derive(Debug)] pub struct GlobalCommand { - inner: Command, + inner: CommandBase, composer: Option<Composer>, io: Option<Box<dyn IOInterface>>, } @@ -164,11 +165,11 @@ impl GlobalCommand { } impl BaseCommand for GlobalCommand { - fn inner(&self) -> &Command { + fn inner(&self) -> &CommandBase { &self.inner } - fn inner_mut(&mut self) -> &mut Command { + fn inner_mut(&mut self) -> &mut CommandBase { &mut self.inner } @@ -188,3 +189,5 @@ impl BaseCommand for GlobalCommand { &mut self.io } } + +impl Command for GlobalCommand {} diff --git a/crates/shirabe/src/command/home_command.rs b/crates/shirabe/src/command/home_command.rs index b548a2d..8e9f007 100644 --- a/crates/shirabe/src/command/home_command.rs +++ b/crates/shirabe/src/command/home_command.rs @@ -2,6 +2,7 @@ use anyhow::Result; use shirabe_external_packages::symfony::component::console::command::command::Command; +use shirabe_external_packages::symfony::component::console::command::command::CommandBase; use shirabe_external_packages::symfony::console::input::input_interface::InputInterface; use shirabe_external_packages::symfony::console::output::output_interface::OutputInterface; use shirabe_php_shim::{FILTER_VALIDATE_URL, filter_var}; @@ -21,7 +22,7 @@ use crate::util::process_executor::ProcessExecutor; #[derive(Debug)] pub struct HomeCommand { - inner: Command, + inner: CommandBase, composer: Option<Composer>, io: Option<Box<dyn IOInterface>>, } @@ -231,11 +232,11 @@ impl HomeCommand { } impl BaseCommand for HomeCommand { - fn inner(&self) -> &Command { + fn inner(&self) -> &CommandBase { &self.inner } - fn inner_mut(&mut self) -> &mut Command { + fn inner_mut(&mut self) -> &mut CommandBase { &mut self.inner } @@ -255,3 +256,5 @@ impl BaseCommand for HomeCommand { &mut self.io } } + +impl Command for HomeCommand {} diff --git a/crates/shirabe/src/command/init_command.rs b/crates/shirabe/src/command/init_command.rs index 3148d20..5ee4b67 100644 --- a/crates/shirabe/src/command/init_command.rs +++ b/crates/shirabe/src/command/init_command.rs @@ -6,6 +6,7 @@ use indexmap::IndexMap; use shirabe_external_packages::composer::pcre::preg::Preg; use shirabe_external_packages::composer::spdx_licenses::spdx_licenses::SpdxLicenses; use shirabe_external_packages::symfony::component::console::command::command::Command; +use shirabe_external_packages::symfony::component::console::command::command::CommandBase; use shirabe_external_packages::symfony::component::console::helper::formatter_helper::FormatterHelper; use shirabe_external_packages::symfony::component::console::input::array_input::ArrayInput; use shirabe_external_packages::symfony::component::console::input::input_interface::InputInterface; @@ -37,7 +38,7 @@ use crate::util::silencer::Silencer; #[derive(Debug)] pub struct InitCommand { - inner: Command, + inner: CommandBase, composer: Option<Composer>, io: Option<Box<dyn IOInterface>>, @@ -1206,11 +1207,11 @@ impl InitCommand { } impl BaseCommand for InitCommand { - fn inner(&self) -> &Command { + fn inner(&self) -> &CommandBase { &self.inner } - fn inner_mut(&mut self) -> &mut Command { + fn inner_mut(&mut self) -> &mut CommandBase { &mut self.inner } @@ -1230,3 +1231,5 @@ impl BaseCommand for InitCommand { &mut self.io } } + +impl Command for InitCommand {} diff --git a/crates/shirabe/src/command/install_command.rs b/crates/shirabe/src/command/install_command.rs index 227ba22..eac04c3 100644 --- a/crates/shirabe/src/command/install_command.rs +++ b/crates/shirabe/src/command/install_command.rs @@ -2,6 +2,7 @@ use anyhow::Result; use shirabe_external_packages::symfony::component::console::command::command::Command; +use shirabe_external_packages::symfony::component::console::command::command::CommandBase; use shirabe_external_packages::symfony::console::input::input_interface::InputInterface; use shirabe_external_packages::symfony::console::output::output_interface::OutputInterface; use shirabe_php_shim::PhpMixed; @@ -20,7 +21,7 @@ use crate::util::http_downloader::HttpDownloader; #[derive(Debug)] pub struct InstallCommand { - inner: Command, + inner: CommandBase, composer: Option<Composer>, io: Option<Box<dyn IOInterface>>, } @@ -189,11 +190,11 @@ impl InstallCommand { } impl BaseCommand for InstallCommand { - fn inner(&self) -> &Command { + fn inner(&self) -> &CommandBase { &self.inner } - fn inner_mut(&mut self) -> &mut Command { + fn inner_mut(&mut self) -> &mut CommandBase { &mut self.inner } @@ -213,3 +214,5 @@ impl BaseCommand for InstallCommand { &mut self.io } } + +impl Command for InstallCommand {} diff --git a/crates/shirabe/src/command/licenses_command.rs b/crates/shirabe/src/command/licenses_command.rs index 4cebc07..4fa2e72 100644 --- a/crates/shirabe/src/command/licenses_command.rs +++ b/crates/shirabe/src/command/licenses_command.rs @@ -5,6 +5,7 @@ use std::any::Any; use anyhow::Result; use indexmap::IndexMap; use shirabe_external_packages::symfony::component::console::command::command::Command; +use shirabe_external_packages::symfony::component::console::command::command::CommandBase; use shirabe_external_packages::symfony::console::formatter::output_formatter::OutputFormatter; use shirabe_external_packages::symfony::console::helper::table::Table; use shirabe_external_packages::symfony::console::input::input_interface::InputInterface; @@ -27,7 +28,7 @@ use crate::util::package_sorter::PackageSorter; #[derive(Debug)] pub struct LicensesCommand { - inner: Command, + inner: CommandBase, composer: Option<Composer>, io: Option<Box<dyn IOInterface>>, } @@ -288,11 +289,11 @@ impl LicensesCommand { } impl BaseCommand for LicensesCommand { - fn inner(&self) -> &Command { + fn inner(&self) -> &CommandBase { &self.inner } - fn inner_mut(&mut self) -> &mut Command { + fn inner_mut(&mut self) -> &mut CommandBase { &mut self.inner } @@ -312,3 +313,5 @@ impl BaseCommand for LicensesCommand { &mut self.io } } + +impl Command for LicensesCommand {} diff --git a/crates/shirabe/src/command/outdated_command.rs b/crates/shirabe/src/command/outdated_command.rs index cbdd44d..d11d290 100644 --- a/crates/shirabe/src/command/outdated_command.rs +++ b/crates/shirabe/src/command/outdated_command.rs @@ -9,6 +9,7 @@ use crate::io::io_interface::IOInterface; use anyhow::Result; use indexmap::IndexMap; use shirabe_external_packages::symfony::component::console::command::command::Command; +use shirabe_external_packages::symfony::component::console::command::command::CommandBase; 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::output_interface::OutputInterface; @@ -16,7 +17,7 @@ use shirabe_php_shim::PhpMixed; #[derive(Debug)] pub struct OutdatedCommand { - inner: Command, + inner: CommandBase, composer: Option<Composer>, io: Option<Box<dyn IOInterface>>, } @@ -148,11 +149,11 @@ impl OutdatedCommand { } impl BaseCommand for OutdatedCommand { - fn inner(&self) -> &Command { + fn inner(&self) -> &CommandBase { &self.inner } - fn inner_mut(&mut self) -> &mut Command { + fn inner_mut(&mut self) -> &mut CommandBase { &mut self.inner } @@ -172,3 +173,5 @@ impl BaseCommand for OutdatedCommand { &mut self.io } } + +impl Command for OutdatedCommand {} diff --git a/crates/shirabe/src/command/prohibits_command.rs b/crates/shirabe/src/command/prohibits_command.rs index ded5ba4..6add126 100644 --- a/crates/shirabe/src/command/prohibits_command.rs +++ b/crates/shirabe/src/command/prohibits_command.rs @@ -1,6 +1,7 @@ //! ref: composer/src/Composer/Command/ProhibitsCommand.php use shirabe_external_packages::symfony::component::console::command::command::Command; +use shirabe_external_packages::symfony::component::console::command::command::CommandBase; use crate::command::base_command::BaseCommand; use crate::command::base_dependency_command::BaseDependencyCommand; @@ -12,8 +13,9 @@ use crate::io::io_interface::IOInterface; use shirabe_external_packages::symfony::console::input::input_interface::InputInterface; use shirabe_external_packages::symfony::console::output::output_interface::OutputInterface; +#[derive(Debug)] pub struct ProhibitsCommand { - inner: Command, + inner: CommandBase, composer: Option<Composer>, io: Option<Box<dyn IOInterface>>, @@ -84,11 +86,11 @@ impl ProhibitsCommand { } impl BaseCommand for ProhibitsCommand { - fn inner(&self) -> &Command { + fn inner(&self) -> &CommandBase { &self.inner } - fn inner_mut(&mut self) -> &mut Command { + fn inner_mut(&mut self) -> &mut CommandBase { &mut self.inner } @@ -118,3 +120,5 @@ impl BaseDependencyCommand for ProhibitsCommand { &mut self.colors } } + +impl Command for ProhibitsCommand {} diff --git a/crates/shirabe/src/command/reinstall_command.rs b/crates/shirabe/src/command/reinstall_command.rs index a6febd4..031977e 100644 --- a/crates/shirabe/src/command/reinstall_command.rs +++ b/crates/shirabe/src/command/reinstall_command.rs @@ -5,6 +5,7 @@ use std::any::Any; use anyhow::Result; use shirabe_external_packages::composer::pcre::preg::Preg; use shirabe_external_packages::symfony::component::console::command::command::Command; +use shirabe_external_packages::symfony::component::console::command::command::CommandBase; use shirabe_external_packages::symfony::console::input::input_interface::InputInterface; use shirabe_external_packages::symfony::console::output::output_interface::OutputInterface; use shirabe_php_shim::InvalidArgumentException; @@ -27,7 +28,7 @@ use crate::util::platform::Platform; #[derive(Debug)] pub struct ReinstallCommand { - inner: Command, + inner: CommandBase, composer: Option<Composer>, io: Option<Box<dyn IOInterface>>, } @@ -279,11 +280,11 @@ impl ReinstallCommand { } impl BaseCommand for ReinstallCommand { - fn inner(&self) -> &Command { + fn inner(&self) -> &CommandBase { &self.inner } - fn inner_mut(&mut self) -> &mut Command { + fn inner_mut(&mut self) -> &mut CommandBase { &mut self.inner } @@ -303,3 +304,5 @@ impl BaseCommand for ReinstallCommand { &mut self.io } } + +impl Command for ReinstallCommand {} diff --git a/crates/shirabe/src/command/remove_command.rs b/crates/shirabe/src/command/remove_command.rs index da1da09..a66a343 100644 --- a/crates/shirabe/src/command/remove_command.rs +++ b/crates/shirabe/src/command/remove_command.rs @@ -3,6 +3,7 @@ use indexmap::IndexMap; use shirabe_external_packages::composer::pcre::preg::Preg; use shirabe_external_packages::symfony::component::console::command::command::Command; +use shirabe_external_packages::symfony::component::console::command::command::CommandBase; use shirabe_external_packages::symfony::component::console::exception::invalid_argument_exception::InvalidArgumentException; use shirabe_external_packages::symfony::component::console::input::input_interface::InputInterface; use shirabe_external_packages::symfony::component::console::output::output_interface::OutputInterface; @@ -24,7 +25,7 @@ use crate::package::base_package::BasePackage; #[derive(Debug)] pub struct RemoveCommand { - inner: Command, + inner: CommandBase, composer: Option<Composer>, io: Option<Box<dyn IOInterface>>, } @@ -679,11 +680,11 @@ impl RemoveCommand { } impl BaseCommand for RemoveCommand { - fn inner(&self) -> &Command { + fn inner(&self) -> &CommandBase { &self.inner } - fn inner_mut(&mut self) -> &mut Command { + fn inner_mut(&mut self) -> &mut CommandBase { &mut self.inner } @@ -703,3 +704,5 @@ impl BaseCommand for RemoveCommand { &mut self.io } } + +impl Command for RemoveCommand {} diff --git a/crates/shirabe/src/command/repository_command.rs b/crates/shirabe/src/command/repository_command.rs index c1c3218..79b4a15 100644 --- a/crates/shirabe/src/command/repository_command.rs +++ b/crates/shirabe/src/command/repository_command.rs @@ -3,6 +3,7 @@ use indexmap::IndexMap; use shirabe_external_packages::composer::pcre::preg::Preg; use shirabe_external_packages::symfony::component::console::command::command::Command; +use shirabe_external_packages::symfony::component::console::command::command::CommandBase; use shirabe_external_packages::symfony::console::completion::completion_input::CompletionInput; use shirabe_external_packages::symfony::console::input::input_interface::InputInterface; use shirabe_external_packages::symfony::console::output::output_interface::OutputInterface; @@ -23,7 +24,7 @@ use crate::json::json_file::JsonFile; #[derive(Debug)] pub struct RepositoryCommand { - inner: Command, + inner: CommandBase, composer: Option<Composer>, io: Option<Box<dyn IOInterface>>, @@ -450,11 +451,11 @@ impl RepositoryCommand { } impl BaseCommand for RepositoryCommand { - fn inner(&self) -> &Command { + fn inner(&self) -> &CommandBase { &self.inner } - fn inner_mut(&mut self) -> &mut Command { + fn inner_mut(&mut self) -> &mut CommandBase { &mut self.inner } @@ -500,3 +501,5 @@ impl BaseConfigCommand for RepositoryCommand { self.config_source.as_mut() } } + +impl Command for RepositoryCommand {} diff --git a/crates/shirabe/src/command/require_command.rs b/crates/shirabe/src/command/require_command.rs index 003673d..8031fbc 100644 --- a/crates/shirabe/src/command/require_command.rs +++ b/crates/shirabe/src/command/require_command.rs @@ -6,6 +6,7 @@ use indexmap::IndexMap; use shirabe_external_packages::composer::pcre::preg::Preg; use shirabe_external_packages::seld::signal::signal_handler::SignalHandler; use shirabe_external_packages::symfony::component::console::command::command::Command; +use shirabe_external_packages::symfony::component::console::command::command::CommandBase; use shirabe_external_packages::symfony::component::console::input::input_interface::InputInterface; use shirabe_external_packages::symfony::component::console::output::output_interface::OutputInterface; use shirabe_php_shim::{ @@ -48,7 +49,7 @@ use crate::util::silencer::Silencer; #[derive(Debug)] pub struct RequireCommand { - inner: Command, + inner: CommandBase, composer: Option<Composer>, io: Option<Box<dyn IOInterface>>, @@ -1184,11 +1185,11 @@ impl RequireCommand { } impl BaseCommand for RequireCommand { - fn inner(&self) -> &Command { + fn inner(&self) -> &CommandBase { &self.inner } - fn inner_mut(&mut self) -> &mut Command { + fn inner_mut(&mut self) -> &mut CommandBase { &mut self.inner } @@ -1208,3 +1209,5 @@ impl BaseCommand for RequireCommand { &mut self.io } } + +impl Command for RequireCommand {} diff --git a/crates/shirabe/src/command/run_script_command.rs b/crates/shirabe/src/command/run_script_command.rs index fac896a..2b9dd1f 100644 --- a/crates/shirabe/src/command/run_script_command.rs +++ b/crates/shirabe/src/command/run_script_command.rs @@ -2,6 +2,7 @@ use anyhow::Result; use shirabe_external_packages::symfony::component::console::command::command::Command; +use shirabe_external_packages::symfony::component::console::command::command::CommandBase; use shirabe_external_packages::symfony::console::input::input_interface::InputInterface; use shirabe_external_packages::symfony::console::output::output_interface::OutputInterface; use shirabe_php_shim::{InvalidArgumentException, PhpMixed, RuntimeException}; @@ -18,7 +19,7 @@ use crate::util::process_executor::ProcessExecutor; #[derive(Debug)] pub struct RunScriptCommand { - inner: Command, + inner: CommandBase, composer: Option<Composer>, io: Option<Box<dyn IOInterface>>, @@ -257,11 +258,11 @@ impl RunScriptCommand { } impl BaseCommand for RunScriptCommand { - fn inner(&self) -> &Command { + fn inner(&self) -> &CommandBase { &self.inner } - fn inner_mut(&mut self) -> &mut Command { + fn inner_mut(&mut self) -> &mut CommandBase { &mut self.inner } @@ -281,3 +282,5 @@ impl BaseCommand for RunScriptCommand { &mut self.io } } + +impl Command for RunScriptCommand {} diff --git a/crates/shirabe/src/command/script_alias_command.rs b/crates/shirabe/src/command/script_alias_command.rs index a02d646..01a420a 100644 --- a/crates/shirabe/src/command/script_alias_command.rs +++ b/crates/shirabe/src/command/script_alias_command.rs @@ -8,12 +8,14 @@ use crate::{command::base_command::BaseCommand, composer::Composer}; use anyhow::Result; use shirabe_external_packages::composer::pcre::preg::Preg; use shirabe_external_packages::symfony::component::console::command::command::Command; +use shirabe_external_packages::symfony::component::console::command::command::CommandBase; use shirabe_external_packages::symfony::console::input::input_interface::InputInterface; use shirabe_external_packages::symfony::console::output::output_interface::OutputInterface; use shirabe_php_shim::{InvalidArgumentException, LogicException, PhpMixed, is_string}; +#[derive(Debug)] pub struct ScriptAliasCommand { - inner: Command, + inner: CommandBase, composer: Option<Composer>, io: Option<Box<dyn IOInterface>>, @@ -132,11 +134,11 @@ impl ScriptAliasCommand { } impl BaseCommand for ScriptAliasCommand { - fn inner(&self) -> &Command { + fn inner(&self) -> &CommandBase { &self.inner } - fn inner_mut(&mut self) -> &mut Command { + fn inner_mut(&mut self) -> &mut CommandBase { &mut self.inner } @@ -156,3 +158,5 @@ impl BaseCommand for ScriptAliasCommand { &mut self.io } } + +impl Command for ScriptAliasCommand {} diff --git a/crates/shirabe/src/command/search_command.rs b/crates/shirabe/src/command/search_command.rs index 3b0d52e..40ef4fe 100644 --- a/crates/shirabe/src/command/search_command.rs +++ b/crates/shirabe/src/command/search_command.rs @@ -13,6 +13,7 @@ use crate::{command::base_command::BaseCommand, composer::Composer}; use anyhow::Result; use indexmap::IndexMap; use shirabe_external_packages::symfony::component::console::command::command::Command; +use shirabe_external_packages::symfony::component::console::command::command::CommandBase; use shirabe_external_packages::symfony::console::formatter::output_formatter::OutputFormatter; use shirabe_external_packages::symfony::console::input::input_interface::InputInterface; use shirabe_external_packages::symfony::console::output::output_interface::OutputInterface; @@ -20,7 +21,7 @@ use shirabe_php_shim::{InvalidArgumentException, PhpMixed, implode, in_array, pr #[derive(Debug)] pub struct SearchCommand { - inner: Command, + inner: CommandBase, composer: Option<Composer>, io: Option<Box<dyn IOInterface>>, } @@ -183,11 +184,11 @@ impl SearchCommand { } impl BaseCommand for SearchCommand { - fn inner(&self) -> &Command { + fn inner(&self) -> &CommandBase { &self.inner } - fn inner_mut(&mut self) -> &mut Command { + fn inner_mut(&mut self) -> &mut CommandBase { &mut self.inner } @@ -207,3 +208,5 @@ impl BaseCommand for SearchCommand { &mut self.io } } + +impl Command for SearchCommand {} diff --git a/crates/shirabe/src/command/self_update_command.rs b/crates/shirabe/src/command/self_update_command.rs index 5f80516..c6ea1bd 100644 --- a/crates/shirabe/src/command/self_update_command.rs +++ b/crates/shirabe/src/command/self_update_command.rs @@ -4,6 +4,7 @@ use crate::io::io_interface; use anyhow::Result; use shirabe_external_packages::composer::pcre::preg::Preg; use shirabe_external_packages::symfony::component::console::command::command::Command; +use shirabe_external_packages::symfony::component::console::command::command::CommandBase; use shirabe_external_packages::symfony::component::console::input::input_interface::InputInterface; use shirabe_external_packages::symfony::component::console::output::output_interface::OutputInterface; use shirabe_external_packages::symfony::component::finder::finder::Finder; @@ -34,7 +35,7 @@ use crate::util::platform::Platform; #[derive(Debug)] pub struct SelfUpdateCommand { - inner: Command, + inner: CommandBase, composer: Option<Composer>, io: Option<Box<dyn IOInterface>>, } @@ -1184,11 +1185,11 @@ RGv89BPD+2DLnJysngsvVaUCAwEAAQ==\n\ } impl BaseCommand for SelfUpdateCommand { - fn inner(&self) -> &Command { + fn inner(&self) -> &CommandBase { &self.inner } - fn inner_mut(&mut self) -> &mut Command { + fn inner_mut(&mut self) -> &mut CommandBase { &mut self.inner } @@ -1208,3 +1209,5 @@ impl BaseCommand for SelfUpdateCommand { &mut self.io } } + +impl Command for SelfUpdateCommand {} diff --git a/crates/shirabe/src/command/show_command.rs b/crates/shirabe/src/command/show_command.rs index 1421120..f32f414 100644 --- a/crates/shirabe/src/command/show_command.rs +++ b/crates/shirabe/src/command/show_command.rs @@ -5,6 +5,7 @@ use shirabe_external_packages::composer::pcre::preg::Preg; use shirabe_external_packages::composer::semver::semver::Semver; use shirabe_external_packages::composer::spdx_licenses::spdx_licenses::SpdxLicenses; use shirabe_external_packages::symfony::component::console::command::command::Command; +use shirabe_external_packages::symfony::component::console::command::command::CommandBase; use shirabe_external_packages::symfony::console::completion::completion_input::CompletionInput; use shirabe_external_packages::symfony::console::formatter::output_formatter::OutputFormatter; use shirabe_external_packages::symfony::console::formatter::output_formatter_style::OutputFormatterStyle; @@ -51,7 +52,7 @@ const _INPUT_OPTION_REF: i64 = InputOption::VALUE_NONE; #[derive(Debug)] pub struct ShowCommand { - inner: Command, + inner: CommandBase, composer: Option<Composer>, io: Option<Box<dyn IOInterface>>, @@ -2653,11 +2654,11 @@ impl CompletionTrait for ShowCommand { } impl BaseCommand for ShowCommand { - fn inner(&self) -> &Command { + fn inner(&self) -> &CommandBase { &self.inner } - fn inner_mut(&mut self) -> &mut Command { + fn inner_mut(&mut self) -> &mut CommandBase { &mut self.inner } @@ -2693,3 +2694,5 @@ struct ViewMetaData { write_latest: bool, write_release_date: bool, } + +impl Command for ShowCommand {} diff --git a/crates/shirabe/src/command/status_command.rs b/crates/shirabe/src/command/status_command.rs index 15749ae..a79b662 100644 --- a/crates/shirabe/src/command/status_command.rs +++ b/crates/shirabe/src/command/status_command.rs @@ -3,6 +3,7 @@ use anyhow::Result; use indexmap::IndexMap; use shirabe_external_packages::symfony::component::console::command::command::Command; +use shirabe_external_packages::symfony::component::console::command::command::CommandBase; use shirabe_external_packages::symfony::console::input::input_interface::InputInterface; use shirabe_external_packages::symfony::console::output::output_interface::OutputInterface; @@ -20,7 +21,7 @@ use crate::util::process_executor::ProcessExecutor; #[derive(Debug)] pub struct StatusCommand { - inner: Command, + inner: CommandBase, composer: Option<Composer>, io: Option<Box<dyn IOInterface>>, } @@ -308,11 +309,11 @@ impl StatusCommand { } impl BaseCommand for StatusCommand { - fn inner(&self) -> &Command { + fn inner(&self) -> &CommandBase { &self.inner } - fn inner_mut(&mut self) -> &mut Command { + fn inner_mut(&mut self) -> &mut CommandBase { &mut self.inner } @@ -332,3 +333,5 @@ impl BaseCommand for StatusCommand { &mut self.io } } + +impl Command for StatusCommand {} diff --git a/crates/shirabe/src/command/suggests_command.rs b/crates/shirabe/src/command/suggests_command.rs index 1f43070..09be216 100644 --- a/crates/shirabe/src/command/suggests_command.rs +++ b/crates/shirabe/src/command/suggests_command.rs @@ -11,6 +11,7 @@ use crate::repository::installed_repository::InstalledRepository; use crate::repository::platform_repository::PlatformRepository; use crate::repository::root_package_repository::RootPackageRepository; use anyhow::Result; +use shirabe_external_packages::symfony::component::console::command::command::CommandBase; use shirabe_external_packages::symfony::console::output::output_interface::OutputInterface; use shirabe_external_packages::symfony::{ component::console::command::command::Command, console::input::input_interface::InputInterface, @@ -19,7 +20,7 @@ use shirabe_php_shim::{PhpMixed, empty, in_array}; #[derive(Debug)] pub struct SuggestsCommand { - inner: Command, + inner: CommandBase, composer: Option<Composer>, io: Option<Box<dyn IOInterface>>, @@ -121,11 +122,11 @@ impl SuggestsCommand { } impl BaseCommand for SuggestsCommand { - fn inner(&self) -> &Command { + fn inner(&self) -> &CommandBase { &self.inner } - fn inner_mut(&mut self) -> &mut Command { + fn inner_mut(&mut self) -> &mut CommandBase { &mut self.inner } @@ -145,3 +146,5 @@ impl BaseCommand for SuggestsCommand { &mut self.io } } + +impl Command for SuggestsCommand {} diff --git a/crates/shirabe/src/command/update_command.rs b/crates/shirabe/src/command/update_command.rs index 4b07422..fc04e87 100644 --- a/crates/shirabe/src/command/update_command.rs +++ b/crates/shirabe/src/command/update_command.rs @@ -15,6 +15,7 @@ use shirabe_semver::constraint::multi_constraint::MultiConstraint; use shirabe_semver::intervals::Intervals; use shirabe_external_packages::symfony::component::console::command::command::Command; +use shirabe_external_packages::symfony::component::console::command::command::CommandBase; use crate::advisory::auditor::Auditor; use crate::command::base_command::BaseCommand; @@ -40,7 +41,7 @@ use crate::util::http_downloader::HttpDownloader; #[derive(Debug)] pub struct UpdateCommand { - inner: Command, + inner: CommandBase, composer: Option<Composer>, io: Option<Box<dyn IOInterface>>, } @@ -638,11 +639,11 @@ impl UpdateCommand { } impl BaseCommand for UpdateCommand { - fn inner(&self) -> &Command { + fn inner(&self) -> &CommandBase { &self.inner } - fn inner_mut(&mut self) -> &mut Command { + fn inner_mut(&mut self) -> &mut CommandBase { &mut self.inner } @@ -662,3 +663,5 @@ impl BaseCommand for UpdateCommand { &mut self.io } } + +impl Command for UpdateCommand {} diff --git a/crates/shirabe/src/command/validate_command.rs b/crates/shirabe/src/command/validate_command.rs index 5906aaa..6d5d655 100644 --- a/crates/shirabe/src/command/validate_command.rs +++ b/crates/shirabe/src/command/validate_command.rs @@ -2,6 +2,7 @@ use anyhow::Result; use shirabe_external_packages::symfony::component::console::command::command::Command; +use shirabe_external_packages::symfony::component::console::command::command::CommandBase; use shirabe_external_packages::symfony::console::input::input_interface::InputInterface; use shirabe_external_packages::symfony::console::output::output_interface::OutputInterface; @@ -19,7 +20,7 @@ use crate::util::filesystem::Filesystem; #[derive(Debug)] pub struct ValidateCommand { - inner: Command, + inner: CommandBase, composer: Option<Composer>, io: Option<Box<dyn IOInterface>>, } @@ -336,11 +337,11 @@ impl ValidateCommand { } impl BaseCommand for ValidateCommand { - fn inner(&self) -> &Command { + fn inner(&self) -> &CommandBase { &self.inner } - fn inner_mut(&mut self) -> &mut Command { + fn inner_mut(&mut self) -> &mut CommandBase { &mut self.inner } @@ -360,3 +361,5 @@ impl BaseCommand for ValidateCommand { &mut self.io } } + +impl Command for ValidateCommand {} diff --git a/crates/shirabe/src/console/application.rs b/crates/shirabe/src/console/application.rs index dec25ce..07996bb 100644 --- a/crates/shirabe/src/console/application.rs +++ b/crates/shirabe/src/console/application.rs @@ -6,7 +6,7 @@ use indexmap::IndexMap; use shirabe_external_packages::composer::xdebug_handler::xdebug_handler::XdebugHandler; use shirabe_external_packages::seld::json_lint::parsing_exception::ParsingException; use shirabe_external_packages::symfony::component::console::application::Application as BaseApplication; -use shirabe_external_packages::symfony::component::console::command::command::Command as SymfonyCommand; +use shirabe_external_packages::symfony::component::console::command::command::Command; use shirabe_external_packages::symfony::component::console::exception::command_not_found_exception::CommandNotFoundException; use shirabe_external_packages::symfony::component::console::exception::exception_interface::ExceptionInterface; use shirabe_external_packages::symfony::component::console::helper::helper_set::HelperSet; @@ -617,7 +617,7 @@ impl Application { // if the command is not an array of commands, and points to a valid Command subclass, import its details directly let dummy_str = dummy.as_string().unwrap_or(""); - let cmd: Box<dyn SymfonyCommand> = if is_string(dummy) + let cmd: Box<dyn Command> = if is_string(dummy) && shirabe_php_shim::class_exists(dummy_str) && is_subclass_of( dummy_str, @@ -630,7 +630,7 @@ impl Application { io.write_error(&format!("<warning>The script named {} extends SingleCommandApplication which is not compatible with Composer 2.9+, make sure you extend Symfony\\Component\\Console\\Command instead.</warning>", script)); } let mut cmd = shirabe_php_shim::instantiate_class::< - Box<dyn SymfonyCommand>, + Box<dyn Command>, >( dummy_str, vec![PhpMixed::String(script.clone())], @@ -984,9 +984,9 @@ impl Application { } /// Initializes all the composer commands. - pub(crate) fn get_default_commands(&self) -> Vec<Box<dyn SymfonyCommand>> { + pub(crate) fn get_default_commands(&self) -> Vec<Box<dyn Command>> { let mut cmds = self.inner.get_default_commands(); - let extras: Vec<Box<dyn SymfonyCommand>> = vec![ + let extras: Vec<Box<dyn Command>> = vec![ Box::new(AboutCommand::new()), Box::new(ConfigCommand::new()), Box::new(DependsCommand::new()), @@ -1101,9 +1101,9 @@ impl Application { definition } - fn get_plugin_commands(&mut self) -> anyhow::Result<Vec<Box<dyn SymfonyCommand>>> { + fn get_plugin_commands(&mut self) -> anyhow::Result<Vec<Box<dyn Command>>> { // TODO(plugin): plugin command discovery is part of the plugin API - let mut commands: Vec<Box<dyn SymfonyCommand>> = vec![]; + let mut commands: Vec<Box<dyn Command>> = vec![]; let composer = self.get_composer(false, Some(false), None)?.cloned(); let composer = match composer { diff --git a/crates/shirabe/src/event_dispatcher/event_dispatcher.rs b/crates/shirabe/src/event_dispatcher/event_dispatcher.rs index db7860c..705287c 100644 --- a/crates/shirabe/src/event_dispatcher/event_dispatcher.rs +++ b/crates/shirabe/src/event_dispatcher/event_dispatcher.rs @@ -4,7 +4,7 @@ use indexmap::IndexMap; use shirabe_external_packages::composer::pcre::preg::Preg; use shirabe_external_packages::symfony::component::console::application::Application; -use shirabe_external_packages::symfony::component::console::command::command::Command; +use shirabe_external_packages::symfony::component::console::command::command::CommandBase; use shirabe_external_packages::symfony::component::console::input::string_input::StringInput; use shirabe_external_packages::symfony::component::console::output::console_output::ConsoleOutput; use shirabe_external_packages::symfony::component::process::executable_finder::ExecutableFinder; @@ -595,7 +595,7 @@ impl EventDispatcher { } app.set_auto_exit(false); // TODO(plugin): instantiate command class dynamically: `new $className($event->getName())` - let cmd = Command::new(event.get_name().to_string()); + let cmd = CommandBase::new(None); // TODO(plugin): pass event name if method_exists(&PhpMixed::String("Application".to_string()), "addCommand") { app.add_command(cmd.clone()); |