diff options
Diffstat (limited to 'crates/shirabe/src/command/base_command.rs')
| -rw-r--r-- | crates/shirabe/src/command/base_command.rs | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/crates/shirabe/src/command/base_command.rs b/crates/shirabe/src/command/base_command.rs index 6b673ed..cf121dc 100644 --- a/crates/shirabe/src/command/base_command.rs +++ b/crates/shirabe/src/command/base_command.rs @@ -19,7 +19,7 @@ use std::rc::Rc; use crate::advisory::AuditConfig; use crate::advisory::Auditor; use crate::command::SelfUpdateCommand; -use crate::composer::PartialComposerHandle; +use crate::composer::{AnyComposerHandle, PartialComposer}; use crate::config::Config; use crate::console::Application; use crate::console::input::InputArgument; @@ -163,23 +163,23 @@ pub trait BaseCommand { required: bool, disable_plugins: Option<bool>, disable_scripts: Option<bool>, - ) -> Result<Option<PartialComposerHandle>>; + ) -> Result<Option<AnyComposerHandle>>; /// Retrieves the default Composer\Composer instance or throws fn require_composer( &mut self, disable_plugins: Option<bool>, disable_scripts: Option<bool>, - ) -> Result<PartialComposerHandle>; + ) -> Result<AnyComposerHandle>; /// Retrieves the default Composer\Composer instance or null fn try_composer( &mut self, disable_plugins: Option<bool>, disable_scripts: Option<bool>, - ) -> Option<PartialComposerHandle>; + ) -> Option<AnyComposerHandle>; - fn set_composer(&mut self, composer: PartialComposerHandle); + fn set_composer(&mut self, composer: AnyComposerHandle); /// Removes the cached composer instance fn reset_composer(&mut self) -> Result<()>; @@ -208,7 +208,7 @@ pub trait BaseCommand { config: Option<IndexMap<String, PhpMixed>>, disable_plugins: bool, disable_scripts: Option<bool>, - ) -> Result<PartialComposerHandle>; + ) -> Result<AnyComposerHandle>; /// Returns preferSource and preferDist values based on the configuration. fn get_preferred_install_options( @@ -256,7 +256,7 @@ pub trait BaseCommand { #[derive(Debug)] pub struct BaseCommandData { - pub(crate) composer: Option<PartialComposerHandle>, + pub(crate) composer: Option<AnyComposerHandle>, pub(crate) io: Option<Rc<RefCell<dyn IOInterface>>>, } @@ -264,11 +264,11 @@ pub trait HasBaseCommandData { fn base_command_data(&self) -> &BaseCommandData; fn base_command_data_mut(&mut self) -> &mut BaseCommandData; - fn composer(&self) -> Option<PartialComposerHandle> { + fn composer(&self) -> Option<AnyComposerHandle> { self.base_command_data().composer.clone() } - fn composer_mut(&mut self) -> &mut Option<PartialComposerHandle> { + fn composer_mut(&mut self) -> &mut Option<AnyComposerHandle> { &mut self.base_command_data_mut().composer } @@ -292,7 +292,7 @@ impl<C: HasBaseCommandData> BaseCommand for C { required: bool, disable_plugins: Option<bool>, disable_scripts: Option<bool>, - ) -> Result<Option<PartialComposerHandle>> { + ) -> Result<Option<AnyComposerHandle>> { if required { return Ok(Some( self.require_composer(disable_plugins, disable_scripts)?, @@ -306,7 +306,7 @@ impl<C: HasBaseCommandData> BaseCommand for C { &mut self, _disable_plugins: Option<bool>, _disable_scripts: Option<bool>, - ) -> Result<PartialComposerHandle> { + ) -> Result<AnyComposerHandle> { // TODO(phase-b): depends on Application::get_composer, which is still stubbed. let _ = RuntimeException { message: String::new(), @@ -319,12 +319,12 @@ impl<C: HasBaseCommandData> BaseCommand for C { &mut self, _disable_plugins: Option<bool>, _disable_scripts: Option<bool>, - ) -> Option<PartialComposerHandle> { + ) -> Option<AnyComposerHandle> { // TODO(phase-b): depends on Application::get_composer, which is still stubbed. todo!("try_composer pending Application::get_composer") } - fn set_composer(&mut self, composer: PartialComposerHandle) { + fn set_composer(&mut self, composer: AnyComposerHandle) { *self.composer_mut() = Some(composer); } @@ -388,7 +388,7 @@ impl<C: HasBaseCommandData> BaseCommand for C { ); // TODO(phase-b): event_dispatcher.dispatch expects Option<Event>; need wrapper from // PreCommandRunEvent. - let _ = composer.borrow_partial().get_event_dispatcher(); + let _ = composer.get_event_dispatcher(); let _ = pre_command_run_event.get_name(); } @@ -481,7 +481,7 @@ impl<C: HasBaseCommandData> BaseCommand for C { config: Option<IndexMap<String, PhpMixed>>, disable_plugins: bool, disable_scripts: Option<bool>, - ) -> Result<PartialComposerHandle> { + ) -> Result<AnyComposerHandle> { let disable_plugins = disable_plugins || input.has_parameter_option(&["--no-plugins"], false); let disable_scripts = disable_scripts.unwrap_or(false) |
