diff options
| author | nsfisis <nsfisis@gmail.com> | 2026-08-10 04:38:35 +0900 |
|---|---|---|
| committer | nsfisis <nsfisis@gmail.com> | 2026-08-10 04:38:35 +0900 |
| commit | 9d9da0d1512202af7802d13b1c3c33a1a077a84e (patch) | |
| tree | abe363b266a61da1713c6a16702b84ea68c70882 /crates | |
| parent | f38080643d80b258393f2b7ab20349b122fe4591 (diff) | |
| download | php-shirabe-9d9da0d1512202af7802d13b1c3c33a1a077a84e.tar.gz php-shirabe-9d9da0d1512202af7802d13b1c3c33a1a077a84e.tar.zst php-shirabe-9d9da0d1512202af7802d13b1c3c33a1a077a84e.zip | |
refactor(symfony): hide leaf modules behind their parent re-exports
Every parent module in the symfony-* crates already re-exported its leaf
modules with `pub use`, so each item was reachable by two paths. Make the
leaf modules private and route all callers through the single re-exported
path.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Diffstat (limited to 'crates')
132 files changed, 561 insertions, 585 deletions
diff --git a/crates/shirabe-symfony-console/src/application.rs b/crates/shirabe-symfony-console/src/application.rs index 192649ef..d4b96da2 100644 --- a/crates/shirabe-symfony-console/src/application.rs +++ b/crates/shirabe-symfony-console/src/application.rs @@ -1,10 +1,10 @@ //! ref: composer/vendor/symfony/console/Application.php -use crate::command::command::Command; -use crate::completion::completion_input::CompletionInput; -use crate::completion::completion_suggestions::CompletionSuggestions; -use crate::helper::helper_set::HelperSet; -use crate::input::input_definition::InputDefinition; +use crate::command::Command; +use crate::completion::CompletionInput; +use crate::completion::CompletionSuggestions; +use crate::helper::HelperSet; +use crate::input::InputDefinition; use indexmap::IndexMap; /// `Symfony\Component\Console\Application` is a concrete class in PHP, but it is ported here as a diff --git a/crates/shirabe-symfony-console/src/attribute.rs b/crates/shirabe-symfony-console/src/attribute.rs index 241eb674..e24e6fac 100644 --- a/crates/shirabe-symfony-console/src/attribute.rs +++ b/crates/shirabe-symfony-console/src/attribute.rs @@ -1,3 +1,3 @@ -pub mod as_command; +mod as_command; pub use as_command::*; diff --git a/crates/shirabe-symfony-console/src/color.rs b/crates/shirabe-symfony-console/src/color.rs index 13632b40..26cc96db 100644 --- a/crates/shirabe-symfony-console/src/color.rs +++ b/crates/shirabe-symfony-console/src/color.rs @@ -1,6 +1,6 @@ //! ref: composer/vendor/symfony/console/Color.php -use crate::exception::invalid_argument_exception::InvalidArgumentException; +use crate::exception::InvalidArgumentException; use indexmap::IndexMap; const COLORS: [(&str, i64); 9] = [ diff --git a/crates/shirabe-symfony-console/src/command.rs b/crates/shirabe-symfony-console/src/command.rs index b17d7f5b..5ab97400 100644 --- a/crates/shirabe-symfony-console/src/command.rs +++ b/crates/shirabe-symfony-console/src/command.rs @@ -1,9 +1,9 @@ -pub mod command; -pub mod complete_command; -pub mod dump_completion_command; -pub mod help_command; -pub mod list_command; -pub mod signalable_command_interface; +mod command; +mod complete_command; +mod dump_completion_command; +mod help_command; +mod list_command; +mod signalable_command_interface; pub use command::*; pub use complete_command::*; diff --git a/crates/shirabe-symfony-console/src/command/command.rs b/crates/shirabe-symfony-console/src/command/command.rs index f0d9dfe0..831795e7 100644 --- a/crates/shirabe-symfony-console/src/command/command.rs +++ b/crates/shirabe-symfony-console/src/command/command.rs @@ -1,15 +1,16 @@ //! ref: composer/vendor/symfony/console/Command/Command.php use crate::application::Application; -use crate::completion::completion_input::CompletionInput; -use crate::completion::completion_suggestions::CompletionSuggestions; -use crate::exception::invalid_argument_exception::InvalidArgumentException; -use crate::helper::helper_set::HelperSet; -use crate::input::input_argument::InputArgument; -use crate::input::input_definition::InputDefinition; -use crate::input::input_interface::InputInterface; -use crate::input::input_option::InputOption; -use crate::output::output_interface::{self, OutputInterface}; +use crate::completion::CompletionInput; +use crate::completion::CompletionSuggestions; +use crate::exception::InvalidArgumentException; +use crate::helper::HelperSet; +use crate::input::InputArgument; +use crate::input::InputDefinition; +use crate::input::InputInterface; +use crate::input::InputOption; +use crate::output::OutputInterface; +use crate::output::output_interface; use indexmap::IndexMap; use shirabe_php_shim::{PhpMixed, php_regex}; use std::cell::{Cell, Ref}; @@ -241,7 +242,7 @@ impl CommandData { /// argument/option instances or an InputDefinition. #[derive(Debug)] pub enum SetDefinitionArg { - Array(Vec<crate::input::input_definition::DefinitionItem>), + Array(Vec<crate::input::DefinitionItem>), Definition(InputDefinition), } @@ -296,11 +297,11 @@ macro_rules! delegate_command_trait_impls_to_inner { $crate::delegate_to_inner!($field, fn is_enabled(&self) -> bool); $crate::delegate_to_inner!($field, fn set_application(&self, application: Option<std::rc::Rc<std::cell::RefCell<dyn $crate::application::Application>>>)); $crate::delegate_to_inner!($field, fn get_application(&self) -> Option<std::rc::Rc<std::cell::RefCell<dyn $crate::application::Application>>>); - $crate::delegate_to_inner!($field, fn set_helper_set(&self, helper_set: std::rc::Rc<std::cell::RefCell<$crate::helper::helper_set::HelperSet>>)); - $crate::delegate_to_inner!($field, fn get_helper_set(&self) -> Option<std::rc::Rc<std::cell::RefCell<$crate::helper::helper_set::HelperSet>>>); + $crate::delegate_to_inner!($field, fn set_helper_set(&self, helper_set: std::rc::Rc<std::cell::RefCell<$crate::helper::HelperSet>>)); + $crate::delegate_to_inner!($field, fn get_helper_set(&self) -> Option<std::rc::Rc<std::cell::RefCell<$crate::helper::HelperSet>>>); $crate::delegate_to_inner!($field, fn merge_application_definition(&self, merge_args: bool)); - $crate::delegate_to_inner!($field, fn get_definition(&self) -> std::cell::Ref<'_, $crate::input::input_definition::InputDefinition>); - $crate::delegate_to_inner!($field, fn get_native_definition(&self) -> std::cell::Ref<'_, $crate::input::input_definition::InputDefinition>); + $crate::delegate_to_inner!($field, fn get_definition(&self) -> std::cell::Ref<'_, $crate::input::InputDefinition>); + $crate::delegate_to_inner!($field, fn get_native_definition(&self) -> std::cell::Ref<'_, $crate::input::InputDefinition>); $crate::delegate_to_inner!($field, fn set_name(&self, name: &str) -> anyhow::Result<()>); $crate::delegate_to_inner!($field, fn get_name(&self) -> Option<String>); $crate::delegate_to_inner!($field, fn set_process_title(&self, title: &str)); @@ -317,7 +318,7 @@ macro_rules! delegate_command_trait_impls_to_inner { $crate::delegate_to_inner!($field, fn get_synopsis(&self, short: bool) -> String); $crate::delegate_to_inner!($field, fn add_usage(&self, usage: &str)); $crate::delegate_to_inner!($field, fn get_usages(&self) -> Vec<String>); - $crate::delegate_to_inner!($field, fn get_helper(&self, name: &str) -> anyhow::Result<Result<shirabe_php_shim::PhpMixed, $crate::exception::logic_exception::LogicException>>); + $crate::delegate_to_inner!($field, fn get_helper(&self, name: &str) -> anyhow::Result<Result<shirabe_php_shim::PhpMixed, $crate::exception::LogicException>>); $crate::delegate_to_inner!($field, fn set_code(&self, code: Box<dyn Fn(&mut dyn $crate::input::InputInterface, &mut dyn $crate::output::OutputInterface) -> shirabe_php_shim::PhpMixed>)); $crate::delegate_to_inner!($field, fn get_code(&self) -> std::cell::Ref<'_, Option<Box<dyn Fn(&mut dyn $crate::input::InputInterface, &mut dyn $crate::output::OutputInterface) -> shirabe_php_shim::PhpMixed>>>); $crate::delegate_to_inner!($field, fn ignore_validation_errors(&self)); @@ -538,7 +539,7 @@ pub trait Command: std::fmt::Debug + shirabe_php_shim::AsAny + shirabe_php_shim: fn get_helper( &self, name: &str, - ) -> anyhow::Result<Result<PhpMixed, crate::exception::logic_exception::LogicException>>; + ) -> anyhow::Result<Result<PhpMixed, crate::exception::LogicException>>; fn set_code( &self, @@ -836,16 +837,14 @@ impl Command for CommandData { fn get_helper( &self, name: &str, - ) -> anyhow::Result<Result<PhpMixed, crate::exception::logic_exception::LogicException>> { + ) -> anyhow::Result<Result<PhpMixed, crate::exception::LogicException>> { let helper_set_ref = self.helper_set.borrow(); let helper_set = match &*helper_set_ref { None => { - return Ok(Err(crate::exception::logic_exception::LogicException::new( - format!( - "Cannot retrieve helper \"{}\" because there is no HelperSet defined. Did you forget to add your command to the application or to set the application on the command using the setApplication() method? You can also set the HelperSet directly using the setHelperSet() method.", - name - ), - ))); + return Ok(Err(crate::exception::LogicException::new(format!( + "Cannot retrieve helper \"{}\" because there is no HelperSet defined. Did you forget to add your command to the application or to set the application on the command using the setApplication() method? You can also set the HelperSet directly using the setHelperSet() method.", + name + )))); } Some(helper_set) => helper_set, }; diff --git a/crates/shirabe-symfony-console/src/command/complete_command.rs b/crates/shirabe-symfony-console/src/command/complete_command.rs index 3dad2609..8058d698 100644 --- a/crates/shirabe-symfony-console/src/command/complete_command.rs +++ b/crates/shirabe-symfony-console/src/command/complete_command.rs @@ -1,13 +1,13 @@ //! ref: composer/vendor/symfony/console/Command/CompleteCommand.php -use crate::command::command::{Command, CommandData}; -use crate::completion::completion_input::CompletionInput; -use crate::completion::completion_suggestions::{CompletionSuggestions, StringOrSuggestion}; -use crate::completion::output::bash_completion_output::BashCompletionOutput; -use crate::completion::output::completion_output_interface::CompletionOutputInterface; -use crate::input::input_interface::InputInterface; -use crate::input::input_option::InputOption; -use crate::output::output_interface::OutputInterface; +use crate::command::{Command, CommandData}; +use crate::completion::BashCompletionOutput; +use crate::completion::CompletionInput; +use crate::completion::CompletionOutputInterface; +use crate::completion::{CompletionSuggestions, StringOrSuggestion}; +use crate::input::InputInterface; +use crate::input::InputOption; +use crate::output::OutputInterface; use indexmap::IndexMap; use shirabe_php_shim::{PhpMixed, impl_php_class}; use std::ops::{Deref, DerefMut}; diff --git a/crates/shirabe-symfony-console/src/command/dump_completion_command.rs b/crates/shirabe-symfony-console/src/command/dump_completion_command.rs index efe116a9..4db6c233 100644 --- a/crates/shirabe-symfony-console/src/command/dump_completion_command.rs +++ b/crates/shirabe-symfony-console/src/command/dump_completion_command.rs @@ -1,12 +1,13 @@ //! ref: composer/vendor/symfony/console/Command/DumpCompletionCommand.php -use crate::command::command::{Command, CommandData}; -use crate::completion::completion_input::CompletionInput; -use crate::completion::completion_suggestions::{CompletionSuggestions, StringOrSuggestion}; -use crate::input::input_argument::InputArgument; -use crate::input::input_interface::InputInterface; -use crate::input::input_option::InputOption; -use crate::output::output_interface::{self, OutputInterface}; +use crate::command::{Command, CommandData}; +use crate::completion::CompletionInput; +use crate::completion::{CompletionSuggestions, StringOrSuggestion}; +use crate::input::InputArgument; +use crate::input::InputInterface; +use crate::input::InputOption; +use crate::output::OutputInterface; +use crate::output::output_interface; use shirabe_php_shim::{PhpMixed, impl_php_class}; use shirabe_symfony_process::process::Process; use std::ops::{Deref, DerefMut}; diff --git a/crates/shirabe-symfony-console/src/command/help_command.rs b/crates/shirabe-symfony-console/src/command/help_command.rs index 9472d144..4f1447cb 100644 --- a/crates/shirabe-symfony-console/src/command/help_command.rs +++ b/crates/shirabe-symfony-console/src/command/help_command.rs @@ -1,16 +1,16 @@ //! ref: composer/vendor/symfony/console/Command/HelpCommand.php -use crate::command::command::{Command, CommandData, SetDefinitionArg}; -use crate::completion::completion_input::CompletionInput; -use crate::completion::completion_suggestions::{CompletionSuggestions, StringOrSuggestion}; -use crate::descriptor::application_description::ApplicationDescription; -use crate::descriptor::descriptor_interface::DescribableObject; -use crate::helper::descriptor_helper::DescriptorHelper; -use crate::input::input_argument::InputArgument; -use crate::input::input_definition::DefinitionItem; -use crate::input::input_interface::InputInterface; -use crate::input::input_option::InputOption; -use crate::output::output_interface::OutputInterface; +use crate::command::{Command, CommandData, SetDefinitionArg}; +use crate::completion::CompletionInput; +use crate::completion::{CompletionSuggestions, StringOrSuggestion}; +use crate::descriptor::ApplicationDescription; +use crate::descriptor::DescribableObject; +use crate::helper::DescriptorHelper; +use crate::input::DefinitionItem; +use crate::input::InputArgument; +use crate::input::InputInterface; +use crate::input::InputOption; +use crate::output::OutputInterface; use shirabe_php_shim::{PhpMixed, impl_php_class}; use std::ops::{Deref, DerefMut}; diff --git a/crates/shirabe-symfony-console/src/command/list_command.rs b/crates/shirabe-symfony-console/src/command/list_command.rs index fb0bb770..ead84d44 100644 --- a/crates/shirabe-symfony-console/src/command/list_command.rs +++ b/crates/shirabe-symfony-console/src/command/list_command.rs @@ -1,16 +1,16 @@ //! ref: composer/vendor/symfony/console/Command/ListCommand.php -use crate::command::command::{Command, CommandData, SetDefinitionArg}; -use crate::completion::completion_input::CompletionInput; -use crate::completion::completion_suggestions::{CompletionSuggestions, StringOrSuggestion}; -use crate::descriptor::application_description::ApplicationDescription; -use crate::descriptor::descriptor_interface::DescribableObject; -use crate::helper::descriptor_helper::DescriptorHelper; -use crate::input::input_argument::InputArgument; -use crate::input::input_definition::DefinitionItem; -use crate::input::input_interface::InputInterface; -use crate::input::input_option::InputOption; -use crate::output::output_interface::OutputInterface; +use crate::command::{Command, CommandData, SetDefinitionArg}; +use crate::completion::CompletionInput; +use crate::completion::{CompletionSuggestions, StringOrSuggestion}; +use crate::descriptor::ApplicationDescription; +use crate::descriptor::DescribableObject; +use crate::helper::DescriptorHelper; +use crate::input::DefinitionItem; +use crate::input::InputArgument; +use crate::input::InputInterface; +use crate::input::InputOption; +use crate::output::OutputInterface; use shirabe_php_shim::{PhpMixed, impl_php_class}; use std::ops::{Deref, DerefMut}; diff --git a/crates/shirabe-symfony-console/src/command_loader.rs b/crates/shirabe-symfony-console/src/command_loader.rs index 97b3f541..3f1eb8ba 100644 --- a/crates/shirabe-symfony-console/src/command_loader.rs +++ b/crates/shirabe-symfony-console/src/command_loader.rs @@ -1,3 +1,3 @@ -pub mod command_loader_interface; +mod command_loader_interface; pub use command_loader_interface::*; diff --git a/crates/shirabe-symfony-console/src/command_loader/command_loader_interface.rs b/crates/shirabe-symfony-console/src/command_loader/command_loader_interface.rs index 22ed308d..f7d0335d 100644 --- a/crates/shirabe-symfony-console/src/command_loader/command_loader_interface.rs +++ b/crates/shirabe-symfony-console/src/command_loader/command_loader_interface.rs @@ -1,6 +1,6 @@ //! ref: composer/vendor/symfony/console/CommandLoader/CommandLoaderInterface.php -use crate::command::command::Command; +use crate::command::Command; pub trait CommandLoaderInterface: std::fmt::Debug { /// Loads a command. diff --git a/crates/shirabe-symfony-console/src/completion.rs b/crates/shirabe-symfony-console/src/completion.rs index cb7f1d12..6c694950 100644 --- a/crates/shirabe-symfony-console/src/completion.rs +++ b/crates/shirabe-symfony-console/src/completion.rs @@ -1,7 +1,7 @@ -pub mod completion_input; -pub mod completion_suggestions; -pub mod output; -pub mod suggestion; +mod completion_input; +mod completion_suggestions; +mod output; +mod suggestion; pub use completion_input::*; pub use completion_suggestions::*; diff --git a/crates/shirabe-symfony-console/src/completion/completion_input.rs b/crates/shirabe-symfony-console/src/completion/completion_input.rs index b9785013..aef23d4a 100644 --- a/crates/shirabe-symfony-console/src/completion/completion_input.rs +++ b/crates/shirabe-symfony-console/src/completion/completion_input.rs @@ -1,8 +1,8 @@ //! ref: composer/vendor/symfony/console/Completion/CompletionInput.php -use crate::input::argv_input::ArgvInput; -use crate::input::input_definition::InputDefinition; -use crate::input::input_option::InputOption; +use crate::input::ArgvInput; +use crate::input::InputDefinition; +use crate::input::InputOption; use shirabe_php_shim::{PhpMixed, php_regex}; /// An input specialized for shell completion. @@ -281,10 +281,8 @@ impl CompletionInput { /// PHP: `CompletionInput extends ArgvInput` — the inherited `InputInterface` surface, /// forwarded to the embedded `ArgvInput`. `bind` dispatches to the specialized /// `CompletionInput::bind` above, matching PHP's virtual dispatch. -impl crate::input::input_interface::InputInterface for CompletionInput { - fn dup( - &self, - ) -> std::rc::Rc<std::cell::RefCell<dyn crate::input::input_interface::InputInterface>> { +impl crate::input::InputInterface for CompletionInput { + fn dup(&self) -> std::rc::Rc<std::cell::RefCell<dyn crate::input::InputInterface>> { std::rc::Rc::new(std::cell::RefCell::new(self.clone())) } @@ -297,11 +295,7 @@ impl crate::input::input_interface::InputInterface for CompletionInput { } fn has_parameter_option(&self, values: PhpMixed, only_params: bool) -> bool { - crate::input::input_interface::InputInterface::has_parameter_option( - &self.inner, - values, - only_params, - ) + crate::input::InputInterface::has_parameter_option(&self.inner, values, only_params) } fn get_parameter_option( @@ -310,7 +304,7 @@ impl crate::input::input_interface::InputInterface for CompletionInput { default: PhpMixed, only_params: bool, ) -> PhpMixed { - crate::input::input_interface::InputInterface::get_parameter_option( + crate::input::InputInterface::get_parameter_option( &self.inner, values, default, @@ -323,59 +317,55 @@ impl crate::input::input_interface::InputInterface for CompletionInput { } fn validate(&mut self) -> anyhow::Result<()> { - crate::input::input_interface::InputInterface::validate(&mut self.inner) + crate::input::InputInterface::validate(&mut self.inner) } fn get_arguments(&self) -> indexmap::IndexMap<String, PhpMixed> { - crate::input::input_interface::InputInterface::get_arguments(&self.inner) + crate::input::InputInterface::get_arguments(&self.inner) } fn get_argument(&self, name: &str) -> anyhow::Result<PhpMixed> { - crate::input::input_interface::InputInterface::get_argument(&self.inner, name) + crate::input::InputInterface::get_argument(&self.inner, name) } fn set_argument(&mut self, name: &str, value: PhpMixed) -> anyhow::Result<()> { - crate::input::input_interface::InputInterface::set_argument(&mut self.inner, name, value) + crate::input::InputInterface::set_argument(&mut self.inner, name, value) } fn has_argument(&self, name: &str) -> bool { - crate::input::input_interface::InputInterface::has_argument(&self.inner, name) + crate::input::InputInterface::has_argument(&self.inner, name) } fn get_options(&self) -> indexmap::IndexMap<String, PhpMixed> { - crate::input::input_interface::InputInterface::get_options(&self.inner) + crate::input::InputInterface::get_options(&self.inner) } fn get_option(&self, name: &str) -> anyhow::Result<PhpMixed> { - crate::input::input_interface::InputInterface::get_option(&self.inner, name) + crate::input::InputInterface::get_option(&self.inner, name) } fn set_option(&mut self, name: &str, value: PhpMixed) -> anyhow::Result<()> { - crate::input::input_interface::InputInterface::set_option(&mut self.inner, name, value) + crate::input::InputInterface::set_option(&mut self.inner, name, value) } fn has_option(&self, name: &str) -> bool { - crate::input::input_interface::InputInterface::has_option(&self.inner, name) + crate::input::InputInterface::has_option(&self.inner, name) } fn is_interactive(&self) -> bool { - crate::input::input_interface::InputInterface::is_interactive(&self.inner) + crate::input::InputInterface::is_interactive(&self.inner) } fn set_interactive(&mut self, interactive: bool) { - crate::input::input_interface::InputInterface::set_interactive(&mut self.inner, interactive) + crate::input::InputInterface::set_interactive(&mut self.inner, interactive) } - fn as_streamable( - &self, - ) -> Option<&dyn crate::input::streamable_input_interface::StreamableInputInterface> { - crate::input::input_interface::InputInterface::as_streamable(&self.inner) + fn as_streamable(&self) -> Option<&dyn crate::input::StreamableInputInterface> { + crate::input::InputInterface::as_streamable(&self.inner) } - fn as_streamable_mut( - &mut self, - ) -> Option<&mut dyn crate::input::streamable_input_interface::StreamableInputInterface> { - crate::input::input_interface::InputInterface::as_streamable_mut(&mut self.inner) + fn as_streamable_mut(&mut self) -> Option<&mut dyn crate::input::StreamableInputInterface> { + crate::input::InputInterface::as_streamable_mut(&mut self.inner) } } diff --git a/crates/shirabe-symfony-console/src/completion/completion_suggestions.rs b/crates/shirabe-symfony-console/src/completion/completion_suggestions.rs index dd9235ae..69fd8993 100644 --- a/crates/shirabe-symfony-console/src/completion/completion_suggestions.rs +++ b/crates/shirabe-symfony-console/src/completion/completion_suggestions.rs @@ -1,7 +1,7 @@ //! ref: composer/vendor/symfony/console/Completion/CompletionSuggestions.php -use crate::completion::suggestion::Suggestion; -use crate::input::input_option::InputOption; +use crate::completion::Suggestion; +use crate::input::InputOption; /// PHP union type `string|Suggestion` used by `suggestValue`/`suggestValues`. #[derive(Debug)] diff --git a/crates/shirabe-symfony-console/src/completion/output/bash_completion_output.rs b/crates/shirabe-symfony-console/src/completion/output/bash_completion_output.rs index 3af69e7f..98ca91b1 100644 --- a/crates/shirabe-symfony-console/src/completion/output/bash_completion_output.rs +++ b/crates/shirabe-symfony-console/src/completion/output/bash_completion_output.rs @@ -1,8 +1,8 @@ //! ref: composer/vendor/symfony/console/Completion/Output/BashCompletionOutput.php -use crate::completion::completion_suggestions::CompletionSuggestions; -use crate::completion::output::completion_output_interface::CompletionOutputInterface; -use crate::output::output_interface::OutputInterface; +use crate::completion::CompletionOutputInterface; +use crate::completion::CompletionSuggestions; +use crate::output::OutputInterface; #[derive(Debug)] pub struct BashCompletionOutput; diff --git a/crates/shirabe-symfony-console/src/completion/output/completion_output_interface.rs b/crates/shirabe-symfony-console/src/completion/output/completion_output_interface.rs index 1965aa14..d9245f82 100644 --- a/crates/shirabe-symfony-console/src/completion/output/completion_output_interface.rs +++ b/crates/shirabe-symfony-console/src/completion/output/completion_output_interface.rs @@ -1,7 +1,7 @@ //! ref: composer/vendor/symfony/console/Completion/Output/CompletionOutputInterface.php -use crate::completion::completion_suggestions::CompletionSuggestions; -use crate::output::output_interface::OutputInterface; +use crate::completion::CompletionSuggestions; +use crate::output::OutputInterface; /// Transforms the `CompletionSuggestions` object into output readable by the shell completion. pub trait CompletionOutputInterface: std::fmt::Debug { diff --git a/crates/shirabe-symfony-console/src/descriptor.rs b/crates/shirabe-symfony-console/src/descriptor.rs index 9f85f925..ea211492 100644 --- a/crates/shirabe-symfony-console/src/descriptor.rs +++ b/crates/shirabe-symfony-console/src/descriptor.rs @@ -1,10 +1,10 @@ -pub mod application_description; -pub mod descriptor; -pub mod descriptor_interface; -pub mod json_descriptor; -pub mod markdown_descriptor; -pub mod text_descriptor; -pub mod xml_descriptor; +mod application_description; +mod descriptor; +mod descriptor_interface; +mod json_descriptor; +mod markdown_descriptor; +mod text_descriptor; +mod xml_descriptor; pub use application_description::*; pub use descriptor::*; diff --git a/crates/shirabe-symfony-console/src/descriptor/application_description.rs b/crates/shirabe-symfony-console/src/descriptor/application_description.rs index d63f0be2..7b9a9e3d 100644 --- a/crates/shirabe-symfony-console/src/descriptor/application_description.rs +++ b/crates/shirabe-symfony-console/src/descriptor/application_description.rs @@ -1,8 +1,8 @@ //! ref: composer/vendor/symfony/console/Descriptor/ApplicationDescription.php use crate::application::Application; -use crate::command::command::Command; -use crate::exception::command_not_found_exception::CommandNotFoundException; +use crate::command::Command; +use crate::exception::CommandNotFoundException; use indexmap::IndexMap; use shirabe_php_shim::PhpMixed; diff --git a/crates/shirabe-symfony-console/src/descriptor/descriptor.rs b/crates/shirabe-symfony-console/src/descriptor/descriptor.rs index f3647d7c..d06f60ca 100644 --- a/crates/shirabe-symfony-console/src/descriptor/descriptor.rs +++ b/crates/shirabe-symfony-console/src/descriptor/descriptor.rs @@ -1,12 +1,12 @@ //! ref: composer/vendor/symfony/console/Descriptor/Descriptor.php use crate::application::Application; -use crate::command::command::Command; -use crate::descriptor::descriptor_interface::{DescribableObject, DescriptorInterface}; -use crate::input::input_argument::InputArgument; -use crate::input::input_definition::InputDefinition; -use crate::input::input_option::InputOption; -use crate::output::output_interface::OutputInterface; +use crate::command::Command; +use crate::descriptor::{DescribableObject, DescriptorInterface}; +use crate::input::InputArgument; +use crate::input::InputDefinition; +use crate::input::InputOption; +use crate::output::OutputInterface; use indexmap::IndexMap; use shirabe_php_shim::PhpMixed; @@ -53,9 +53,9 @@ pub trait Descriptor: DescriptorInterface { &[content.to_string()], false, if decorated { - crate::output::output_interface::OUTPUT_NORMAL + crate::output::OUTPUT_NORMAL } else { - crate::output::output_interface::OUTPUT_RAW + crate::output::OUTPUT_RAW }, ); } diff --git a/crates/shirabe-symfony-console/src/descriptor/descriptor_interface.rs b/crates/shirabe-symfony-console/src/descriptor/descriptor_interface.rs index c50c6a99..928c4294 100644 --- a/crates/shirabe-symfony-console/src/descriptor/descriptor_interface.rs +++ b/crates/shirabe-symfony-console/src/descriptor/descriptor_interface.rs @@ -1,11 +1,11 @@ //! ref: composer/vendor/symfony/console/Descriptor/DescriptorInterface.php use crate::application::Application; -use crate::command::command::Command; -use crate::input::input_argument::InputArgument; -use crate::input::input_definition::InputDefinition; -use crate::input::input_option::InputOption; -use crate::output::output_interface::OutputInterface; +use crate::command::Command; +use crate::input::InputArgument; +use crate::input::InputDefinition; +use crate::input::InputOption; +use crate::output::OutputInterface; use indexmap::IndexMap; use shirabe_php_shim::PhpMixed; diff --git a/crates/shirabe-symfony-console/src/descriptor/json_descriptor.rs b/crates/shirabe-symfony-console/src/descriptor/json_descriptor.rs index 983d5f08..a195dc01 100644 --- a/crates/shirabe-symfony-console/src/descriptor/json_descriptor.rs +++ b/crates/shirabe-symfony-console/src/descriptor/json_descriptor.rs @@ -1,14 +1,14 @@ //! ref: composer/vendor/symfony/console/Descriptor/JsonDescriptor.php use crate::application::Application; -use crate::command::command::Command; -use crate::descriptor::application_description::ApplicationDescription; -use crate::descriptor::descriptor::Descriptor; -use crate::descriptor::descriptor_interface::{DescribableObject, DescriptorInterface}; -use crate::input::input_argument::InputArgument; -use crate::input::input_definition::InputDefinition; -use crate::input::input_option::InputOption; -use crate::output::output_interface::OutputInterface; +use crate::command::Command; +use crate::descriptor::ApplicationDescription; +use crate::descriptor::Descriptor; +use crate::descriptor::{DescribableObject, DescriptorInterface}; +use crate::input::InputArgument; +use crate::input::InputDefinition; +use crate::input::InputOption; +use crate::output::OutputInterface; use indexmap::IndexMap; use shirabe_pcre::preg::Preg; use shirabe_php_shim::{PhpMixed, php_regex}; diff --git a/crates/shirabe-symfony-console/src/descriptor/markdown_descriptor.rs b/crates/shirabe-symfony-console/src/descriptor/markdown_descriptor.rs index b64c2be0..8c814bb5 100644 --- a/crates/shirabe-symfony-console/src/descriptor/markdown_descriptor.rs +++ b/crates/shirabe-symfony-console/src/descriptor/markdown_descriptor.rs @@ -1,15 +1,15 @@ //! ref: composer/vendor/symfony/console/Descriptor/MarkdownDescriptor.php use crate::application::Application; -use crate::command::command::Command; -use crate::descriptor::application_description::ApplicationDescription; -use crate::descriptor::descriptor::Descriptor; -use crate::descriptor::descriptor_interface::{DescribableObject, DescriptorInterface}; -use crate::helper::helper::Helper; -use crate::input::input_argument::InputArgument; -use crate::input::input_definition::InputDefinition; -use crate::input::input_option::InputOption; -use crate::output::output_interface::OutputInterface; +use crate::command::Command; +use crate::descriptor::ApplicationDescription; +use crate::descriptor::Descriptor; +use crate::descriptor::{DescribableObject, DescriptorInterface}; +use crate::helper::Helper; +use crate::input::InputArgument; +use crate::input::InputDefinition; +use crate::input::InputOption; +use crate::output::OutputInterface; use indexmap::IndexMap; use shirabe_pcre::preg::Preg; use shirabe_php_shim::PhpMixed; @@ -329,9 +329,9 @@ impl Descriptor for MarkdownDescriptor { &[content.to_string()], false, if decorated { - crate::output::output_interface::OUTPUT_NORMAL + crate::output::OUTPUT_NORMAL } else { - crate::output::output_interface::OUTPUT_RAW + crate::output::OUTPUT_RAW }, ); } diff --git a/crates/shirabe-symfony-console/src/descriptor/text_descriptor.rs b/crates/shirabe-symfony-console/src/descriptor/text_descriptor.rs index 3ea09355..0308415f 100644 --- a/crates/shirabe-symfony-console/src/descriptor/text_descriptor.rs +++ b/crates/shirabe-symfony-console/src/descriptor/text_descriptor.rs @@ -1,16 +1,16 @@ //! ref: composer/vendor/symfony/console/Descriptor/TextDescriptor.php use crate::application::Application; -use crate::command::command::Command; -use crate::descriptor::application_description::ApplicationDescription; -use crate::descriptor::descriptor::Descriptor; -use crate::descriptor::descriptor_interface::{DescribableObject, DescriptorInterface}; -use crate::formatter::output_formatter::OutputFormatter; -use crate::helper::helper::Helper; -use crate::input::input_argument::InputArgument; -use crate::input::input_definition::InputDefinition; -use crate::input::input_option::InputOption; -use crate::output::output_interface::OutputInterface; +use crate::command::Command; +use crate::descriptor::ApplicationDescription; +use crate::descriptor::Descriptor; +use crate::descriptor::{DescribableObject, DescriptorInterface}; +use crate::formatter::OutputFormatter; +use crate::helper::Helper; +use crate::input::InputArgument; +use crate::input::InputDefinition; +use crate::input::InputOption; +use crate::output::OutputInterface; use indexmap::IndexMap; use shirabe_pcre::preg::Preg; use shirabe_php_shim::PhpMixed; diff --git a/crates/shirabe-symfony-console/src/descriptor/xml_descriptor.rs b/crates/shirabe-symfony-console/src/descriptor/xml_descriptor.rs index 11c26b46..1a001b22 100644 --- a/crates/shirabe-symfony-console/src/descriptor/xml_descriptor.rs +++ b/crates/shirabe-symfony-console/src/descriptor/xml_descriptor.rs @@ -1,14 +1,14 @@ //! ref: composer/vendor/symfony/console/Descriptor/XmlDescriptor.php use crate::application::Application; -use crate::command::command::Command; -use crate::descriptor::application_description::ApplicationDescription; -use crate::descriptor::descriptor::Descriptor; -use crate::descriptor::descriptor_interface::{DescribableObject, DescriptorInterface}; -use crate::input::input_argument::InputArgument; -use crate::input::input_definition::InputDefinition; -use crate::input::input_option::InputOption; -use crate::output::output_interface::OutputInterface; +use crate::command::Command; +use crate::descriptor::ApplicationDescription; +use crate::descriptor::Descriptor; +use crate::descriptor::{DescribableObject, DescriptorInterface}; +use crate::input::InputArgument; +use crate::input::InputDefinition; +use crate::input::InputOption; +use crate::output::OutputInterface; use indexmap::IndexMap; use shirabe_php_shim::{DOMDocument, DOMNode, PhpMixed}; diff --git a/crates/shirabe-symfony-console/src/exception.rs b/crates/shirabe-symfony-console/src/exception.rs index 356b5955..b8d040b2 100644 --- a/crates/shirabe-symfony-console/src/exception.rs +++ b/crates/shirabe-symfony-console/src/exception.rs @@ -1,11 +1,11 @@ -pub mod command_not_found_exception; -pub mod exception_interface; -pub mod invalid_argument_exception; -pub mod invalid_option_exception; -pub mod logic_exception; -pub mod missing_input_exception; -pub mod namespace_not_found_exception; -pub mod runtime_exception; +mod command_not_found_exception; +mod exception_interface; +mod invalid_argument_exception; +mod invalid_option_exception; +mod logic_exception; +mod missing_input_exception; +mod namespace_not_found_exception; +mod runtime_exception; pub use command_not_found_exception::*; pub use exception_interface::*; diff --git a/crates/shirabe-symfony-console/src/formatter.rs b/crates/shirabe-symfony-console/src/formatter.rs index 716d3fbe..0f6da79b 100644 --- a/crates/shirabe-symfony-console/src/formatter.rs +++ b/crates/shirabe-symfony-console/src/formatter.rs @@ -1,9 +1,9 @@ -pub mod output_formatter; -pub mod output_formatter_interface; -pub mod output_formatter_style; -pub mod output_formatter_style_interface; -pub mod output_formatter_style_stack; -pub mod wrappable_output_formatter_interface; +mod output_formatter; +mod output_formatter_interface; +mod output_formatter_style; +mod output_formatter_style_interface; +mod output_formatter_style_stack; +mod wrappable_output_formatter_interface; pub use output_formatter::*; pub use output_formatter_interface::*; diff --git a/crates/shirabe-symfony-console/src/formatter/output_formatter.rs b/crates/shirabe-symfony-console/src/formatter/output_formatter.rs index bd7259a1..649af71d 100644 --- a/crates/shirabe-symfony-console/src/formatter/output_formatter.rs +++ b/crates/shirabe-symfony-console/src/formatter/output_formatter.rs @@ -1,6 +1,6 @@ //! ref: composer/vendor/symfony/console/Formatter/OutputFormatter.php -use crate::exception::invalid_argument_exception::InvalidArgumentException; +use crate::exception::InvalidArgumentException; use crate::formatter::output_formatter_interface::OutputFormatterInterface; use crate::formatter::output_formatter_style::OutputFormatterStyle; use crate::formatter::output_formatter_style_interface::OutputFormatterStyleInterface; diff --git a/crates/shirabe-symfony-console/src/formatter/output_formatter_style_stack.rs b/crates/shirabe-symfony-console/src/formatter/output_formatter_style_stack.rs index f85b80f1..ed014fd8 100644 --- a/crates/shirabe-symfony-console/src/formatter/output_formatter_style_stack.rs +++ b/crates/shirabe-symfony-console/src/formatter/output_formatter_style_stack.rs @@ -1,6 +1,6 @@ //! ref: composer/vendor/symfony/console/Formatter/OutputFormatterStyleStack.php -use crate::exception::invalid_argument_exception::InvalidArgumentException; +use crate::exception::InvalidArgumentException; use crate::formatter::output_formatter_style::OutputFormatterStyle; use crate::formatter::output_formatter_style_interface::OutputFormatterStyleInterface; diff --git a/crates/shirabe-symfony-console/src/helper.rs b/crates/shirabe-symfony-console/src/helper.rs index 8aed672f..bfe1459d 100644 --- a/crates/shirabe-symfony-console/src/helper.rs +++ b/crates/shirabe-symfony-console/src/helper.rs @@ -1,19 +1,19 @@ -pub mod debug_formatter_helper; -pub mod descriptor_helper; -pub mod formatter_helper; -pub mod helper; -pub mod helper_interface; -pub mod helper_set; -pub mod process_helper; -pub mod progress_bar; -pub mod question_helper; -pub mod symfony_question_helper; -pub mod table; -pub mod table_cell; -pub mod table_cell_style; -pub mod table_rows; -pub mod table_separator; -pub mod table_style; +mod debug_formatter_helper; +mod descriptor_helper; +mod formatter_helper; +mod helper; +mod helper_interface; +mod helper_set; +mod process_helper; +mod progress_bar; +mod question_helper; +mod symfony_question_helper; +mod table; +mod table_cell; +mod table_cell_style; +mod table_rows; +mod table_separator; +mod table_style; pub use debug_formatter_helper::*; pub use descriptor_helper::*; diff --git a/crates/shirabe-symfony-console/src/helper/debug_formatter_helper.rs b/crates/shirabe-symfony-console/src/helper/debug_formatter_helper.rs index f7fd2157..ac5d1c47 100644 --- a/crates/shirabe-symfony-console/src/helper/debug_formatter_helper.rs +++ b/crates/shirabe-symfony-console/src/helper/debug_formatter_helper.rs @@ -1,8 +1,8 @@ //! ref: composer/vendor/symfony/console/Helper/DebugFormatterHelper.php -use crate::helper::helper::Helper; -use crate::helper::helper_interface::HelperInterface; -use crate::helper::helper_set::HelperSet; +use crate::helper::Helper; +use crate::helper::HelperInterface; +use crate::helper::HelperSet; use indexmap::IndexMap; const COLORS: [&str; 9] = [ diff --git a/crates/shirabe-symfony-console/src/helper/descriptor_helper.rs b/crates/shirabe-symfony-console/src/helper/descriptor_helper.rs index 23bb4f66..4ab5a93a 100644 --- a/crates/shirabe-symfony-console/src/helper/descriptor_helper.rs +++ b/crates/shirabe-symfony-console/src/helper/descriptor_helper.rs @@ -1,15 +1,15 @@ //! ref: composer/vendor/symfony/console/Helper/DescriptorHelper.php -use crate::descriptor::descriptor_interface::{DescribableObject, DescriptorInterface}; -use crate::descriptor::json_descriptor::JsonDescriptor; -use crate::descriptor::markdown_descriptor::MarkdownDescriptor; -use crate::descriptor::text_descriptor::TextDescriptor; -use crate::descriptor::xml_descriptor::XmlDescriptor; -use crate::exception::invalid_argument_exception::InvalidArgumentException; -use crate::helper::helper::Helper; -use crate::helper::helper_interface::HelperInterface; -use crate::helper::helper_set::HelperSet; -use crate::output::output_interface::OutputInterface; +use crate::descriptor::JsonDescriptor; +use crate::descriptor::MarkdownDescriptor; +use crate::descriptor::TextDescriptor; +use crate::descriptor::XmlDescriptor; +use crate::descriptor::{DescribableObject, DescriptorInterface}; +use crate::exception::InvalidArgumentException; +use crate::helper::Helper; +use crate::helper::HelperInterface; +use crate::helper::HelperSet; +use crate::output::OutputInterface; use indexmap::IndexMap; /// This class adds helper method to describe objects in various formats. diff --git a/crates/shirabe-symfony-console/src/helper/formatter_helper.rs b/crates/shirabe-symfony-console/src/helper/formatter_helper.rs index f4e1b643..546e0da2 100644 --- a/crates/shirabe-symfony-console/src/helper/formatter_helper.rs +++ b/crates/shirabe-symfony-console/src/helper/formatter_helper.rs @@ -1,9 +1,9 @@ //! ref: composer/vendor/symfony/console/Helper/FormatterHelper.php -use crate::formatter::output_formatter::OutputFormatter; -use crate::helper::helper::Helper; -use crate::helper::helper_interface::HelperInterface; -use crate::helper::helper_set::HelperSet; +use crate::formatter::OutputFormatter; +use crate::helper::Helper; +use crate::helper::HelperInterface; +use crate::helper::HelperSet; /// The Formatter class provides helpers to format messages. #[derive(Debug, Default)] diff --git a/crates/shirabe-symfony-console/src/helper/helper.rs b/crates/shirabe-symfony-console/src/helper/helper.rs index 0af2830f..c92b7cb1 100644 --- a/crates/shirabe-symfony-console/src/helper/helper.rs +++ b/crates/shirabe-symfony-console/src/helper/helper.rs @@ -1,7 +1,7 @@ //! ref: composer/vendor/symfony/console/Helper/Helper.php -use crate::formatter::output_formatter_interface::OutputFormatterInterface; -use crate::helper::helper_set::HelperSet; +use crate::formatter::OutputFormatterInterface; +use crate::helper::HelperSet; use shirabe_php_shim::php_regex; use shirabe_symfony_string::unicode_string::UnicodeString; diff --git a/crates/shirabe-symfony-console/src/helper/helper_interface.rs b/crates/shirabe-symfony-console/src/helper/helper_interface.rs index 41c0b680..9615dfa2 100644 --- a/crates/shirabe-symfony-console/src/helper/helper_interface.rs +++ b/crates/shirabe-symfony-console/src/helper/helper_interface.rs @@ -1,6 +1,6 @@ //! ref: composer/vendor/symfony/console/Helper/HelperInterface.php -use crate::helper::helper_set::HelperSet; +use crate::helper::HelperSet; /// HelperInterface is the interface all helpers must implement. pub trait HelperInterface: std::fmt::Debug + shirabe_php_shim::AsAny { diff --git a/crates/shirabe-symfony-console/src/helper/helper_set.rs b/crates/shirabe-symfony-console/src/helper/helper_set.rs index bf64f8b2..6726a4f1 100644 --- a/crates/shirabe-symfony-console/src/helper/helper_set.rs +++ b/crates/shirabe-symfony-console/src/helper/helper_set.rs @@ -1,10 +1,10 @@ //! ref: composer/vendor/symfony/console/Helper/HelperSet.php -use crate::helper::debug_formatter_helper::DebugFormatterHelper; -use crate::helper::formatter_helper::FormatterHelper; -use crate::helper::helper_interface::HelperInterface; -use crate::helper::process_helper::ProcessHelper; -use crate::helper::question_helper::QuestionHelper; +use crate::helper::DebugFormatterHelper; +use crate::helper::FormatterHelper; +use crate::helper::HelperInterface; +use crate::helper::ProcessHelper; +use crate::helper::QuestionHelper; /// HelperSet represents a set of helpers to be used with a command. /// diff --git a/crates/shirabe-symfony-console/src/helper/process_helper.rs b/crates/shirabe-symfony-console/src/helper/process_helper.rs index be1c1a84..e0e94c47 100644 --- a/crates/shirabe-symfony-console/src/helper/process_helper.rs +++ b/crates/shirabe-symfony-console/src/helper/process_helper.rs @@ -1,12 +1,12 @@ //! ref: composer/vendor/symfony/console/Helper/ProcessHelper.php -use crate::helper::debug_formatter_helper::DebugFormatterHelper; -use crate::helper::helper::Helper; -use crate::helper::helper_interface::HelperInterface; -use crate::helper::helper_set::HelperSet; +use crate::helper::DebugFormatterHelper; +use crate::helper::Helper; +use crate::helper::HelperInterface; +use crate::helper::HelperSet; use crate::output::ConsoleOutputInterface; -use crate::output::output_interface::{self, OutputInterface}; -use shirabe_symfony_process::exception::process_failed_exception::ProcessFailedException; +use crate::output::{OutputInterface, output_interface}; +use shirabe_symfony_process::exception::ProcessFailedException; use shirabe_symfony_process::process::Process; /// The ProcessHelper class provides helpers to run external processes. @@ -54,7 +54,7 @@ impl ProcessHelper { // reduces to a downcast to the concrete type. let output: std::rc::Rc<std::cell::RefCell<dyn OutputInterface>> = { let redirected = shirabe_php_shim::AsAny::as_any(&*output.borrow()) - .downcast_ref::<crate::output::console_output::ConsoleOutput>() + .downcast_ref::<crate::output::ConsoleOutput>() .map(|console| console.get_error_output()); redirected.unwrap_or(output) }; @@ -228,7 +228,7 @@ impl ProcessHelper { // reduces to a downcast to the concrete type. let output: std::rc::Rc<std::cell::RefCell<dyn OutputInterface>> = { let redirected = shirabe_php_shim::AsAny::as_any(&*output.borrow()) - .downcast_ref::<crate::output::console_output::ConsoleOutput>() + .downcast_ref::<crate::output::ConsoleOutput>() .map(|console| console.get_error_output()); redirected.unwrap_or(output) }; diff --git a/crates/shirabe-symfony-console/src/helper/progress_bar.rs b/crates/shirabe-symfony-console/src/helper/progress_bar.rs index 44e144cf..b0124419 100644 --- a/crates/shirabe-symfony-console/src/helper/progress_bar.rs +++ b/crates/shirabe-symfony-console/src/helper/progress_bar.rs @@ -1,8 +1,8 @@ //! ref: composer/vendor/symfony/console/Helper/ProgressBar.php use crate::cursor::Cursor; -use crate::exception::logic_exception::LogicException; -use crate::helper::helper::Helper; +use crate::exception::LogicException; +use crate::helper::Helper; use crate::output::ConsoleOutputInterface; use crate::output::ConsoleSectionOutput; use crate::output::OutputInterface; @@ -73,7 +73,7 @@ impl ProgressBar { // reduces to a downcast to the concrete type. let output: std::rc::Rc<std::cell::RefCell<dyn OutputInterface>> = { let redirected = shirabe_php_shim::AsAny::as_any(&*output.borrow()) - .downcast_ref::<crate::output::console_output::ConsoleOutput>() + .downcast_ref::<crate::output::ConsoleOutput>() .map(|console| console.get_error_output()); redirected.unwrap_or(output) }; diff --git a/crates/shirabe-symfony-console/src/helper/question_helper.rs b/crates/shirabe-symfony-console/src/helper/question_helper.rs index 6ee83702..662edf40 100644 --- a/crates/shirabe-symfony-console/src/helper/question_helper.rs +++ b/crates/shirabe-symfony-console/src/helper/question_helper.rs @@ -1,20 +1,20 @@ //! ref: composer/vendor/symfony/console/Helper/QuestionHelper.php use crate::cursor::Cursor; -use crate::exception::missing_input_exception::MissingInputException; -use crate::exception::runtime_exception::RuntimeException; -use crate::formatter::output_formatter::OutputFormatter; -use crate::formatter::output_formatter_style::OutputFormatterStyle; -use crate::helper::formatter_helper::FormatBlockMessages; -use crate::helper::helper::Helper; -use crate::helper::helper_interface::HelperInterface; -use crate::helper::helper_set::HelperSet; -use crate::input::input_interface::InputInterface; -use crate::output::console_output::ConsoleOutput; -use crate::output::console_output_interface::ConsoleOutputInterface; -use crate::output::console_section_output::ConsoleSectionOutput; +use crate::exception::MissingInputException; +use crate::exception::RuntimeException; +use crate::formatter::OutputFormatter; +use crate::formatter::OutputFormatterStyle; +use crate::helper::FormatBlockMessages; +use crate::helper::Helper; +use crate::helper::HelperInterface; +use crate::helper::HelperSet; +use crate::input::InputInterface; +use crate::output::ConsoleOutput; +use crate::output::ConsoleOutputInterface; +use crate::output::ConsoleSectionOutput; +use crate::output::OutputInterface; use crate::output::output_interface; -use crate::output::output_interface::OutputInterface; use crate::question::ChoiceQuestion; use crate::question::QuestionInterface; use crate::terminal::Terminal; diff --git a/crates/shirabe-symfony-console/src/helper/symfony_question_helper.rs b/crates/shirabe-symfony-console/src/helper/symfony_question_helper.rs index 9de40dd4..5b4b3ba0 100644 --- a/crates/shirabe-symfony-console/src/helper/symfony_question_helper.rs +++ b/crates/shirabe-symfony-console/src/helper/symfony_question_helper.rs @@ -1,12 +1,12 @@ //! ref: composer/vendor/symfony/console/Helper/SymfonyQuestionHelper.php -use crate::formatter::output_formatter::OutputFormatter; -use crate::helper::question_helper::{QuestionHelper, QuestionHelperInterface}; +use crate::formatter::OutputFormatter; +use crate::helper::{QuestionHelper, QuestionHelperInterface}; +use crate::output::OutputInterface; use crate::output::output_interface; -use crate::output::output_interface::OutputInterface; use crate::question::QuestionInterface; -use crate::style::style_interface::StyleInterface; -use crate::style::symfony_style::SymfonyStyle; +use crate::style::StyleInterface; +use crate::style::SymfonyStyle; use shirabe_php_shim::PhpMixed; use std::ops::{Deref, DerefMut}; diff --git a/crates/shirabe-symfony-console/src/helper/table.rs b/crates/shirabe-symfony-console/src/helper/table.rs index 8f82c357..177e23c0 100644 --- a/crates/shirabe-symfony-console/src/helper/table.rs +++ b/crates/shirabe-symfony-console/src/helper/table.rs @@ -1,12 +1,12 @@ //! ref: composer/vendor/symfony/console/Helper/Table.php -use crate::exception::invalid_argument_exception::InvalidArgumentException; -use crate::formatter::output_formatter::OutputFormatter; -use crate::formatter::wrappable_output_formatter_interface::WrappableOutputFormatterInterface; +use crate::exception::InvalidArgumentException; +use crate::formatter::OutputFormatter; +use crate::formatter::WrappableOutputFormatterInterface; use crate::helper::{ Helper, TableCell, TableCellOption, TableCellStyle, TableRows, TableSeparator, TableStyle, }; -use crate::output::output_interface::OutputInterface; +use crate::output::OutputInterface; use indexmap::IndexMap; use shirabe_pcre::preg::Preg; use shirabe_php_shim::{PhpMixed, php_regex}; @@ -568,7 +568,7 @@ impl Table { &self.style.get_border_format(), &[PhpMixed::from(markup)], )], - crate::output::output_interface::OUTPUT_NORMAL, + crate::output::OUTPUT_NORMAL, ); } @@ -608,10 +608,9 @@ impl Table { BORDER_INSIDE })); } - self.output.borrow().writeln( - &[row_content], - crate::output::output_interface::OUTPUT_NORMAL, - ); + self.output + .borrow() + .writeln(&[row_content], crate::output::OUTPUT_NORMAL); } /// Renders table cell with padding. diff --git a/crates/shirabe-symfony-console/src/helper/table_cell.rs b/crates/shirabe-symfony-console/src/helper/table_cell.rs index 100872ca..fdcda7b8 100644 --- a/crates/shirabe-symfony-console/src/helper/table_cell.rs +++ b/crates/shirabe-symfony-console/src/helper/table_cell.rs @@ -1,7 +1,7 @@ //! ref: composer/vendor/symfony/console/Helper/TableCell.php -use crate::exception::invalid_argument_exception::InvalidArgumentException; -use crate::helper::table_cell_style::TableCellStyle; +use crate::exception::InvalidArgumentException; +use crate::helper::TableCellStyle; use indexmap::IndexMap; /// A `TableCell` option value: an integer span, a `TableCellStyle`, or null. diff --git a/crates/shirabe-symfony-console/src/helper/table_cell_style.rs b/crates/shirabe-symfony-console/src/helper/table_cell_style.rs index 6f0d6b5c..3a95e2ce 100644 --- a/crates/shirabe-symfony-console/src/helper/table_cell_style.rs +++ b/crates/shirabe-symfony-console/src/helper/table_cell_style.rs @@ -1,6 +1,6 @@ //! ref: composer/vendor/symfony/console/Helper/TableCellStyle.php -use crate::exception::invalid_argument_exception::InvalidArgumentException; +use crate::exception::InvalidArgumentException; use indexmap::IndexMap; pub const DEFAULT_ALIGN: &str = "left"; diff --git a/crates/shirabe-symfony-console/src/helper/table_rows.rs b/crates/shirabe-symfony-console/src/helper/table_rows.rs index dea05384..214ebab0 100644 --- a/crates/shirabe-symfony-console/src/helper/table_rows.rs +++ b/crates/shirabe-symfony-console/src/helper/table_rows.rs @@ -1,6 +1,6 @@ //! ref: composer/vendor/symfony/console/Helper/TableRows.php -use crate::helper::table::Row; +use crate::helper::Row; /// @internal /// diff --git a/crates/shirabe-symfony-console/src/helper/table_separator.rs b/crates/shirabe-symfony-console/src/helper/table_separator.rs index 898a6630..7c1735c6 100644 --- a/crates/shirabe-symfony-console/src/helper/table_separator.rs +++ b/crates/shirabe-symfony-console/src/helper/table_separator.rs @@ -1,7 +1,7 @@ //! ref: composer/vendor/symfony/console/Helper/TableSeparator.php -use crate::exception::invalid_argument_exception::InvalidArgumentException; -use crate::helper::table_cell::{TableCell, TableCellOption}; +use crate::exception::InvalidArgumentException; +use crate::helper::{TableCell, TableCellOption}; use indexmap::IndexMap; /// Marks a row as being a separator. @@ -30,9 +30,7 @@ impl TableSeparator { self.inner.get_rowspan() } - pub fn get_style( - &self, - ) -> Option<std::rc::Rc<crate::helper::table_cell_style::TableCellStyle>> { + pub fn get_style(&self) -> Option<std::rc::Rc<crate::helper::TableCellStyle>> { self.inner.get_style() } } diff --git a/crates/shirabe-symfony-console/src/input.rs b/crates/shirabe-symfony-console/src/input.rs index d4813b44..f05188fe 100644 --- a/crates/shirabe-symfony-console/src/input.rs +++ b/crates/shirabe-symfony-console/src/input.rs @@ -1,13 +1,13 @@ -pub mod argv_input; -pub mod array_input; -pub mod input; -pub mod input_argument; -pub mod input_aware_interface; -pub mod input_definition; -pub mod input_interface; -pub mod input_option; -pub mod streamable_input_interface; -pub mod string_input; +mod argv_input; +mod array_input; +mod input; +mod input_argument; +mod input_aware_interface; +mod input_definition; +mod input_interface; +mod input_option; +mod streamable_input_interface; +mod string_input; pub use argv_input::*; pub use array_input::*; diff --git a/crates/shirabe-symfony-console/src/input/argv_input.rs b/crates/shirabe-symfony-console/src/input/argv_input.rs index d8619df9..cbd0f6d2 100644 --- a/crates/shirabe-symfony-console/src/input/argv_input.rs +++ b/crates/shirabe-symfony-console/src/input/argv_input.rs @@ -1,10 +1,10 @@ //! ref: composer/vendor/symfony/console/Input/ArgvInput.php -use crate::exception::runtime_exception::RuntimeException; -use crate::input::input::Input; -use crate::input::input_definition::InputDefinition; -use crate::input::input_interface::InputInterface; -use crate::input::streamable_input_interface::StreamableInputInterface; +use crate::exception::RuntimeException; +use crate::input::Input; +use crate::input::InputDefinition; +use crate::input::InputInterface; +use crate::input::StreamableInputInterface; use indexmap::IndexMap; use shirabe_php_shim::{PhpMixed, php_regex}; diff --git a/crates/shirabe-symfony-console/src/input/array_input.rs b/crates/shirabe-symfony-console/src/input/array_input.rs index fa1d4540..d93501c7 100644 --- a/crates/shirabe-symfony-console/src/input/array_input.rs +++ b/crates/shirabe-symfony-console/src/input/array_input.rs @@ -1,11 +1,11 @@ //! ref: composer/vendor/symfony/console/Input/ArrayInput.php -use crate::exception::invalid_argument_exception::InvalidArgumentException; -use crate::exception::invalid_option_exception::InvalidOptionException; -use crate::input::input::Input; -use crate::input::input_definition::InputDefinition; -use crate::input::input_interface::InputInterface; -use crate::input::streamable_input_interface::StreamableInputInterface; +use crate::exception::InvalidArgumentException; +use crate::exception::InvalidOptionException; +use crate::input::Input; +use crate::input::InputDefinition; +use crate::input::InputInterface; +use crate::input::StreamableInputInterface; use indexmap::IndexMap; use shirabe_php_shim::PhpMixed; diff --git a/crates/shirabe-symfony-console/src/input/input.rs b/crates/shirabe-symfony-console/src/input/input.rs index 15190665..0da2b95c 100644 --- a/crates/shirabe-symfony-console/src/input/input.rs +++ b/crates/shirabe-symfony-console/src/input/input.rs @@ -1,8 +1,8 @@ //! ref: composer/vendor/symfony/console/Input/Input.php -use crate::exception::invalid_argument_exception::InvalidArgumentException; -use crate::exception::runtime_exception::RuntimeException; -use crate::input::input_definition::InputDefinition; +use crate::exception::InvalidArgumentException; +use crate::exception::RuntimeException; +use crate::input::InputDefinition; use indexmap::IndexMap; use shirabe_php_shim::{PhpMixed, PhpResource, php_regex}; diff --git a/crates/shirabe-symfony-console/src/input/input_argument.rs b/crates/shirabe-symfony-console/src/input/input_argument.rs index ebc8e223..5ca91a6b 100644 --- a/crates/shirabe-symfony-console/src/input/input_argument.rs +++ b/crates/shirabe-symfony-console/src/input/input_argument.rs @@ -1,7 +1,7 @@ //! ref: composer/vendor/symfony/console/Input/InputArgument.php -use crate::exception::invalid_argument_exception::InvalidArgumentException; -use crate::exception::logic_exception::LogicException; +use crate::exception::InvalidArgumentException; +use crate::exception::LogicException; use shirabe_php_shim::PhpMixed; #[derive(Debug, Clone)] diff --git a/crates/shirabe-symfony-console/src/input/input_aware_interface.rs b/crates/shirabe-symfony-console/src/input/input_aware_interface.rs index 1638b6c7..38b02cec 100644 --- a/crates/shirabe-symfony-console/src/input/input_aware_interface.rs +++ b/crates/shirabe-symfony-console/src/input/input_aware_interface.rs @@ -1,6 +1,6 @@ //! ref: composer/vendor/symfony/console/Input/InputAwareInterface.php -use crate::input::input_interface::InputInterface; +use crate::input::InputInterface; pub trait InputAwareInterface { fn set_input(&mut self, input: Box<dyn InputInterface>); diff --git a/crates/shirabe-symfony-console/src/input/input_definition.rs b/crates/shirabe-symfony-console/src/input/input_definition.rs index 96f9ce9a..8d116bc1 100644 --- a/crates/shirabe-symfony-console/src/input/input_definition.rs +++ b/crates/shirabe-symfony-console/src/input/input_definition.rs @@ -1,9 +1,9 @@ //! ref: composer/vendor/symfony/console/Input/InputDefinition.php -use crate::exception::invalid_argument_exception::InvalidArgumentException; -use crate::exception::logic_exception::LogicException; -use crate::input::input_argument::InputArgument; -use crate::input::input_option::InputOption; +use crate::exception::InvalidArgumentException; +use crate::exception::LogicException; +use crate::input::InputArgument; +use crate::input::InputOption; use indexmap::IndexMap; use shirabe_php_shim::PhpMixed; diff --git a/crates/shirabe-symfony-console/src/input/input_interface.rs b/crates/shirabe-symfony-console/src/input/input_interface.rs index b3cd2eef..4491ca8c 100644 --- a/crates/shirabe-symfony-console/src/input/input_interface.rs +++ b/crates/shirabe-symfony-console/src/input/input_interface.rs @@ -1,7 +1,7 @@ //! ref: composer/vendor/symfony/console/Input/InputInterface.php -use crate::input::input_definition::InputDefinition; -use crate::input::streamable_input_interface::StreamableInputInterface; +use crate::input::InputDefinition; +use crate::input::StreamableInputInterface; use shirabe_php_shim::PhpMixed; pub trait InputInterface: std::fmt::Debug + shirabe_php_shim::AsAny { diff --git a/crates/shirabe-symfony-console/src/input/input_option.rs b/crates/shirabe-symfony-console/src/input/input_option.rs index 7312e552..6734f374 100644 --- a/crates/shirabe-symfony-console/src/input/input_option.rs +++ b/crates/shirabe-symfony-console/src/input/input_option.rs @@ -1,7 +1,7 @@ //! ref: composer/vendor/symfony/console/Input/InputOption.php -use crate::exception::invalid_argument_exception::InvalidArgumentException; -use crate::exception::logic_exception::LogicException; +use crate::exception::InvalidArgumentException; +use crate::exception::LogicException; use shirabe_php_shim::{PhpMixed, php_regex}; #[derive(Debug, Clone)] diff --git a/crates/shirabe-symfony-console/src/input/streamable_input_interface.rs b/crates/shirabe-symfony-console/src/input/streamable_input_interface.rs index 559b34a0..b9a8e766 100644 --- a/crates/shirabe-symfony-console/src/input/streamable_input_interface.rs +++ b/crates/shirabe-symfony-console/src/input/streamable_input_interface.rs @@ -1,6 +1,6 @@ //! ref: composer/vendor/symfony/console/Input/StreamableInputInterface.php -use crate::input::input_interface::InputInterface; +use crate::input::InputInterface; use shirabe_php_shim::PhpResource; pub trait StreamableInputInterface: InputInterface { diff --git a/crates/shirabe-symfony-console/src/input/string_input.rs b/crates/shirabe-symfony-console/src/input/string_input.rs index 720e2bef..5e6d4e76 100644 --- a/crates/shirabe-symfony-console/src/input/string_input.rs +++ b/crates/shirabe-symfony-console/src/input/string_input.rs @@ -1,10 +1,10 @@ //! ref: composer/vendor/symfony/console/Input/StringInput.php -use crate::exception::invalid_argument_exception::InvalidArgumentException; -use crate::input::argv_input::ArgvInput; -use crate::input::input_definition::InputDefinition; -use crate::input::input_interface::InputInterface; -use crate::input::streamable_input_interface::StreamableInputInterface; +use crate::exception::InvalidArgumentException; +use crate::input::ArgvInput; +use crate::input::InputDefinition; +use crate::input::InputInterface; +use crate::input::StreamableInputInterface; use indexmap::IndexMap; use shirabe_php_shim::{CaptureKey, PhpMixed, php_regex}; diff --git a/crates/shirabe-symfony-console/src/output.rs b/crates/shirabe-symfony-console/src/output.rs index 23a8e15a..dab5368e 100644 --- a/crates/shirabe-symfony-console/src/output.rs +++ b/crates/shirabe-symfony-console/src/output.rs @@ -1,11 +1,11 @@ -pub mod buffered_output; -pub mod console_output; -pub mod console_output_interface; -pub mod console_section_output; -pub mod output; +mod buffered_output; +mod console_output; +mod console_output_interface; +mod console_section_output; +mod output; pub mod output_interface; -pub mod stream_output; -pub mod trimmed_buffer_output; +mod stream_output; +mod trimmed_buffer_output; pub use buffered_output::*; pub use console_output::*; diff --git a/crates/shirabe-symfony-console/src/output/buffered_output.rs b/crates/shirabe-symfony-console/src/output/buffered_output.rs index 147f837f..07a47779 100644 --- a/crates/shirabe-symfony-console/src/output/buffered_output.rs +++ b/crates/shirabe-symfony-console/src/output/buffered_output.rs @@ -2,7 +2,7 @@ use crate::formatter::OutputFormatterInterface; use crate::output::OutputInterface; -use crate::output::output::{DoWrite, Output}; +use crate::output::{DoWrite, Output}; #[derive(Debug)] pub struct BufferedOutput { diff --git a/crates/shirabe-symfony-console/src/output/console_output.rs b/crates/shirabe-symfony-console/src/output/console_output.rs index 5028eaf7..4080d688 100644 --- a/crates/shirabe-symfony-console/src/output/console_output.rs +++ b/crates/shirabe-symfony-console/src/output/console_output.rs @@ -2,10 +2,10 @@ use crate::formatter::OutputFormatterInterface; use crate::output::ConsoleOutputInterface; +use crate::output::ConsoleSectionOutput; use crate::output::OutputInterface; -use crate::output::console_section_output::ConsoleSectionOutput; -use crate::output::output_interface::VERBOSITY_NORMAL; -use crate::output::stream_output::StreamOutput; +use crate::output::StreamOutput; +use crate::output::VERBOSITY_NORMAL; /// ConsoleOutput is the default class for all CLI output. It uses STDOUT and STDERR. /// diff --git a/crates/shirabe-symfony-console/src/output/console_section_output.rs b/crates/shirabe-symfony-console/src/output/console_section_output.rs index 2b42ad02..9a2cb9ec 100644 --- a/crates/shirabe-symfony-console/src/output/console_section_output.rs +++ b/crates/shirabe-symfony-console/src/output/console_section_output.rs @@ -2,9 +2,9 @@ use crate::formatter::OutputFormatterInterface; use crate::helper::Helper; +use crate::output::DoWrite; use crate::output::OutputInterface; -use crate::output::output::DoWrite; -use crate::output::stream_output::StreamOutput; +use crate::output::StreamOutput; use crate::terminal::Terminal; type Sections = @@ -79,7 +79,7 @@ impl ConsoleSectionOutput { /// Overwrites the previous output with a new message. pub fn overwrite(&self, message: &[String]) { self.clear(None); - self.writeln(message, crate::output::output_interface::OUTPUT_NORMAL); + self.writeln(message, crate::output::OUTPUT_NORMAL); } pub fn get_content(&self) -> String { diff --git a/crates/shirabe-symfony-console/src/output/output.rs b/crates/shirabe-symfony-console/src/output/output.rs index 98566a4e..2df7733a 100644 --- a/crates/shirabe-symfony-console/src/output/output.rs +++ b/crates/shirabe-symfony-console/src/output/output.rs @@ -2,7 +2,7 @@ use crate::formatter::OutputFormatter; use crate::formatter::OutputFormatterInterface; -use crate::output::output_interface::{ +use crate::output::{ OUTPUT_NORMAL, OUTPUT_PLAIN, OUTPUT_RAW, VERBOSITY_DEBUG, VERBOSITY_NORMAL, VERBOSITY_QUIET, VERBOSITY_VERBOSE, VERBOSITY_VERY_VERBOSE, }; diff --git a/crates/shirabe-symfony-console/src/output/output_interface.rs b/crates/shirabe-symfony-console/src/output/output_interface.rs index cdc78144..f41cb056 100644 --- a/crates/shirabe-symfony-console/src/output/output_interface.rs +++ b/crates/shirabe-symfony-console/src/output/output_interface.rs @@ -56,9 +56,7 @@ pub trait OutputInterface: std::fmt::Debug + shirabe_php_shim::AsAny { /// Downcast hook standing in for PHP's `$output instanceof ConsoleOutputInterface` /// (cf. `InputInterface::as_streamable`). Only `ConsoleOutput` returns `Some`. - fn as_console_output( - &self, - ) -> Option<&dyn crate::output::console_output_interface::ConsoleOutputInterface> { + fn as_console_output(&self) -> Option<&dyn crate::output::ConsoleOutputInterface> { None } } diff --git a/crates/shirabe-symfony-console/src/output/stream_output.rs b/crates/shirabe-symfony-console/src/output/stream_output.rs index 1ed90cac..8ffe7e82 100644 --- a/crates/shirabe-symfony-console/src/output/stream_output.rs +++ b/crates/shirabe-symfony-console/src/output/stream_output.rs @@ -3,8 +3,8 @@ use crate::exception::InvalidArgumentException; use crate::formatter::OutputFormatterInterface; use crate::output::OutputInterface; -use crate::output::output::{DoWrite, Output}; -use crate::output::output_interface::VERBOSITY_NORMAL; +use crate::output::VERBOSITY_NORMAL; +use crate::output::{DoWrite, Output}; use shirabe_php_shim::php_regex; /// StreamOutput writes the output to a given stream. diff --git a/crates/shirabe-symfony-console/src/output/trimmed_buffer_output.rs b/crates/shirabe-symfony-console/src/output/trimmed_buffer_output.rs index 9f8be71a..1cd3f2a1 100644 --- a/crates/shirabe-symfony-console/src/output/trimmed_buffer_output.rs +++ b/crates/shirabe-symfony-console/src/output/trimmed_buffer_output.rs @@ -3,7 +3,7 @@ use crate::exception::InvalidArgumentException; use crate::formatter::OutputFormatterInterface; use crate::output::OutputInterface; -use crate::output::output::{DoWrite, Output}; +use crate::output::{DoWrite, Output}; /// A BufferedOutput that keeps only the last N chars. #[derive(Debug)] diff --git a/crates/shirabe-symfony-console/src/question/choice_question.rs b/crates/shirabe-symfony-console/src/question/choice_question.rs index 95717f1a..8c0bafc3 100644 --- a/crates/shirabe-symfony-console/src/question/choice_question.rs +++ b/crates/shirabe-symfony-console/src/question/choice_question.rs @@ -1,7 +1,7 @@ //! ref: composer/vendor/symfony/console/Question/ChoiceQuestion.php -use crate::exception::invalid_argument_exception::InvalidArgumentException; -use crate::exception::logic_exception::LogicException; +use crate::exception::InvalidArgumentException; +use crate::exception::LogicException; use crate::question::Question; use crate::question::QuestionInterface; use indexmap::IndexMap; diff --git a/crates/shirabe-symfony-console/src/question/confirmation_question.rs b/crates/shirabe-symfony-console/src/question/confirmation_question.rs index 34db281b..65dd19ab 100644 --- a/crates/shirabe-symfony-console/src/question/confirmation_question.rs +++ b/crates/shirabe-symfony-console/src/question/confirmation_question.rs @@ -1,6 +1,6 @@ //! ref: composer/vendor/symfony/console/Question/ConfirmationQuestion.php -use crate::exception::invalid_argument_exception::InvalidArgumentException; +use crate::exception::InvalidArgumentException; use crate::question::Question; use crate::question::QuestionInterface; use shirabe_php_shim::PhpMixed; diff --git a/crates/shirabe-symfony-console/src/question/question.rs b/crates/shirabe-symfony-console/src/question/question.rs index 7f96111b..7bab26b3 100644 --- a/crates/shirabe-symfony-console/src/question/question.rs +++ b/crates/shirabe-symfony-console/src/question/question.rs @@ -1,7 +1,7 @@ //! ref: composer/vendor/symfony/console/Question/Question.php -use crate::exception::invalid_argument_exception::InvalidArgumentException; -use crate::exception::logic_exception::LogicException; +use crate::exception::InvalidArgumentException; +use crate::exception::LogicException; use crate::question::choice_question::ChoiceQuestion; use crate::question::confirmation_question::ConfirmationQuestion; use shirabe_php_shim::PhpMixed; diff --git a/crates/shirabe-symfony-console/src/signal_registry.rs b/crates/shirabe-symfony-console/src/signal_registry.rs index a07ca01f..ab48848e 100644 --- a/crates/shirabe-symfony-console/src/signal_registry.rs +++ b/crates/shirabe-symfony-console/src/signal_registry.rs @@ -1,3 +1,3 @@ -pub mod signal_registry; +mod signal_registry; pub use signal_registry::*; diff --git a/crates/shirabe-symfony-console/src/style.rs b/crates/shirabe-symfony-console/src/style.rs index efc54e1c..0367ec95 100644 --- a/crates/shirabe-symfony-console/src/style.rs +++ b/crates/shirabe-symfony-console/src/style.rs @@ -1,6 +1,6 @@ -pub mod output_style; -pub mod style_interface; -pub mod symfony_style; +mod output_style; +mod style_interface; +mod symfony_style; pub use output_style::*; pub use style_interface::*; diff --git a/crates/shirabe-symfony-console/src/style/output_style.rs b/crates/shirabe-symfony-console/src/style/output_style.rs index 17c9489e..2881547d 100644 --- a/crates/shirabe-symfony-console/src/style/output_style.rs +++ b/crates/shirabe-symfony-console/src/style/output_style.rs @@ -3,8 +3,8 @@ use crate::formatter::OutputFormatterInterface; use crate::helper::ProgressBar; use crate::output::ConsoleOutputInterface; +use crate::output::OUTPUT_NORMAL; use crate::output::OutputInterface; -use crate::output::output_interface::OUTPUT_NORMAL; /// Decorates output to add console style guide helpers. #[derive(Debug)] @@ -50,7 +50,7 @@ impl OutputStyle { // ConsoleOutput is the only OutputInterface implementor that also implements // ConsoleOutputInterface, so `instanceof ConsoleOutputInterface` reduces to this downcast. shirabe_php_shim::AsAny::as_any(&*output.borrow()) - .downcast_ref::<crate::output::console_output::ConsoleOutput>() + .downcast_ref::<crate::output::ConsoleOutput>() .is_some() } @@ -58,11 +58,11 @@ impl OutputStyle { /// borrow of the concrete type serves as the cast result. fn as_console_output_interface( output: &std::rc::Rc<std::cell::RefCell<dyn OutputInterface>>, - ) -> Option<std::cell::Ref<'_, crate::output::console_output::ConsoleOutput>> { + ) -> Option<std::cell::Ref<'_, crate::output::ConsoleOutput>> { std::cell::Ref::filter_map(output.borrow(), |output| { output .as_any() - .downcast_ref::<crate::output::console_output::ConsoleOutput>() + .downcast_ref::<crate::output::ConsoleOutput>() }) .ok() } diff --git a/crates/shirabe-symfony-console/src/style/symfony_style.rs b/crates/shirabe-symfony-console/src/style/symfony_style.rs index 486acf2e..ead056d5 100644 --- a/crates/shirabe-symfony-console/src/style/symfony_style.rs +++ b/crates/shirabe-symfony-console/src/style/symfony_style.rs @@ -1,22 +1,22 @@ //! ref: composer/vendor/symfony/console/Style/SymfonyStyle.php -use crate::exception::invalid_argument_exception::InvalidArgumentException; +use crate::exception::InvalidArgumentException; use crate::formatter::OutputFormatter; use crate::formatter::OutputFormatterInterface; use crate::helper::Helper; use crate::helper::ProgressBar; +use crate::helper::QuestionHelperInterface; use crate::helper::SymfonyQuestionHelper; use crate::helper::Table; use crate::helper::TableCell; use crate::helper::TableSeparator; -use crate::helper::question_helper::QuestionHelperInterface; -use crate::helper::table::{Cell, Row}; +use crate::helper::{Cell, Row}; use crate::input::InputInterface; +use crate::output::ConsoleOutput; use crate::output::ConsoleOutputInterface; +use crate::output::OUTPUT_NORMAL; use crate::output::OutputInterface; use crate::output::TrimmedBufferOutput; -use crate::output::console_output::ConsoleOutput; -use crate::output::output_interface::OUTPUT_NORMAL; use crate::question::ChoiceQuestion; use crate::question::ConfirmationQuestion; use crate::question::Question; @@ -161,7 +161,7 @@ impl SymfonyStyle { let mut options = indexmap::IndexMap::new(); options.insert( "colspan".to_string(), - crate::helper::table_cell::TableCellOption::Int(2), + crate::helper::TableCellOption::Int(2), ); options }) @@ -261,7 +261,7 @@ impl SymfonyStyle { style.set_cell_header_format("<info>%s</info>".to_string()); let mut table = Table::new(output); - let _ = table.set_style(crate::helper::table::StyleName::Style(style)); + let _ = table.set_style(crate::helper::StyleName::Style(style)); table } diff --git a/crates/shirabe-symfony-console/src/tester.rs b/crates/shirabe-symfony-console/src/tester.rs index 1a7f6d0c..87dbe716 100644 --- a/crates/shirabe-symfony-console/src/tester.rs +++ b/crates/shirabe-symfony-console/src/tester.rs @@ -1,3 +1,3 @@ -pub mod command_completion_tester; +mod command_completion_tester; pub use command_completion_tester::*; diff --git a/crates/shirabe-symfony-console/src/tester/command_completion_tester.rs b/crates/shirabe-symfony-console/src/tester/command_completion_tester.rs index 81cbdab3..cf6d90de 100644 --- a/crates/shirabe-symfony-console/src/tester/command_completion_tester.rs +++ b/crates/shirabe-symfony-console/src/tester/command_completion_tester.rs @@ -1,8 +1,8 @@ //! ref: composer/vendor/symfony/console/Tester/CommandCompletionTester.php -use crate::command::command::Command; -use crate::completion::completion_input::CompletionInput; -use crate::completion::completion_suggestions::CompletionSuggestions; +use crate::command::Command; +use crate::completion::CompletionInput; +use crate::completion::CompletionSuggestions; /// Eases the testing of command completion. #[derive(Debug)] diff --git a/crates/shirabe-symfony-filesystem/src/filesystem.rs b/crates/shirabe-symfony-filesystem/src/filesystem.rs index 0bb54efd..f8a88b02 100644 --- a/crates/shirabe-symfony-filesystem/src/filesystem.rs +++ b/crates/shirabe-symfony-filesystem/src/filesystem.rs @@ -1,6 +1,6 @@ //! ref: composer/vendor/symfony/filesystem/Filesystem.php -use crate::exception::io_exception::IOException; +use crate::exception::IOException; use shirabe_php_shim::Catch as _; #[derive(Debug, Clone)] diff --git a/crates/shirabe-symfony-process/src/exception/process_failed_exception.rs b/crates/shirabe-symfony-process/src/exception/process_failed_exception.rs index 76520b33..f7f0bcdc 100644 --- a/crates/shirabe-symfony-process/src/exception/process_failed_exception.rs +++ b/crates/shirabe-symfony-process/src/exception/process_failed_exception.rs @@ -1,7 +1,7 @@ //! ref: composer/vendor/symfony/process/Exception/ProcessFailedException.php -use crate::exception::invalid_argument_exception::InvalidArgumentException; -use crate::exception::runtime_exception::RuntimeException; +use crate::exception::InvalidArgumentException; +use crate::exception::RuntimeException; use crate::process::Process; #[derive(Debug)] diff --git a/crates/shirabe-symfony-process/src/exception/process_signaled_exception.rs b/crates/shirabe-symfony-process/src/exception/process_signaled_exception.rs index e570c80d..8c69d353 100644 --- a/crates/shirabe-symfony-process/src/exception/process_signaled_exception.rs +++ b/crates/shirabe-symfony-process/src/exception/process_signaled_exception.rs @@ -1,6 +1,6 @@ //! ref: composer/vendor/symfony/process/Exception/ProcessSignaledException.php -use crate::exception::runtime_exception::RuntimeException; +use crate::exception::RuntimeException; use crate::process::Process; #[derive(Debug)] diff --git a/crates/shirabe-symfony-process/src/exception/process_timed_out_exception.rs b/crates/shirabe-symfony-process/src/exception/process_timed_out_exception.rs index b7e6595d..3dc9d7ed 100644 --- a/crates/shirabe-symfony-process/src/exception/process_timed_out_exception.rs +++ b/crates/shirabe-symfony-process/src/exception/process_timed_out_exception.rs @@ -1,6 +1,6 @@ //! ref: composer/vendor/symfony/process/Exception/ProcessTimedOutException.php -use crate::exception::runtime_exception::RuntimeException; +use crate::exception::RuntimeException; use crate::process::Process; #[derive(Debug)] diff --git a/crates/shirabe-symfony-process/src/process.rs b/crates/shirabe-symfony-process/src/process.rs index 6a078b9e..1dfb5806 100644 --- a/crates/shirabe-symfony-process/src/process.rs +++ b/crates/shirabe-symfony-process/src/process.rs @@ -1,10 +1,10 @@ //! ref: composer/vendor/symfony/process/Process.php -use crate::exception::invalid_argument_exception::InvalidArgumentException; -use crate::exception::logic_exception::LogicException; -use crate::exception::process_signaled_exception::ProcessSignaledException; -use crate::exception::process_timed_out_exception::ProcessTimedOutException; -use crate::exception::runtime_exception::RuntimeException; +use crate::exception::InvalidArgumentException; +use crate::exception::LogicException; +use crate::exception::ProcessSignaledException; +use crate::exception::ProcessTimedOutException; +use crate::exception::RuntimeException; use crate::executable_finder::ExecutableFinder; use crate::pipes::pipes_interface::PipesInterface; use crate::pipes::unix_pipes::UnixPipes; diff --git a/crates/shirabe-symfony-process/src/process_utils.rs b/crates/shirabe-symfony-process/src/process_utils.rs index 7c4ca21f..415a5334 100644 --- a/crates/shirabe-symfony-process/src/process_utils.rs +++ b/crates/shirabe-symfony-process/src/process_utils.rs @@ -1,6 +1,6 @@ //! ref: composer/vendor/symfony/process/ProcessUtils.php -use crate::exception::invalid_argument_exception::InvalidArgumentException; +use crate::exception::InvalidArgumentException; use shirabe_php_shim::PhpMixed; /// ProcessUtils is a bunch of utility methods. diff --git a/crates/shirabe/src/command/about_command.rs b/crates/shirabe/src/command/about_command.rs index 0d680727..3a72ac3a 100644 --- a/crates/shirabe/src/command/about_command.rs +++ b/crates/shirabe/src/command/about_command.rs @@ -5,7 +5,7 @@ use crate::command::BaseCommandData; use crate::command::base_command::base_command_initialize; use crate::composer; use shirabe_php_shim::impl_php_class; -use shirabe_symfony_console::command::command::Command; +use shirabe_symfony_console::command::Command; use shirabe_symfony_console::input::InputInterface; use shirabe_symfony_console::output::OutputInterface; @@ -69,8 +69,8 @@ impl Command for AboutCommand { fn complete( &self, - input: &shirabe_symfony_console::completion::completion_input::CompletionInput, - suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions, + input: &shirabe_symfony_console::completion::CompletionInput, + suggestions: &mut shirabe_symfony_console::completion::CompletionSuggestions, ) -> anyhow::Result<()> { crate::command::base_command::base_command_complete(self, input, suggestions) } diff --git a/crates/shirabe/src/command/archive_command.rs b/crates/shirabe/src/command/archive_command.rs index d863b8b3..452103d9 100644 --- a/crates/shirabe/src/command/archive_command.rs +++ b/crates/shirabe/src/command/archive_command.rs @@ -28,7 +28,7 @@ use crate::util::r#loop::Loop; use indexmap::IndexMap; 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::command::Command; use shirabe_symfony_console::input::InputInterface; use shirabe_symfony_console::output::OutputInterface; @@ -451,8 +451,8 @@ impl Command for ArchiveCommand { fn complete( &self, - input: &shirabe_symfony_console::completion::completion_input::CompletionInput, - suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions, + input: &shirabe_symfony_console::completion::CompletionInput, + suggestions: &mut shirabe_symfony_console::completion::CompletionSuggestions, ) -> anyhow::Result<()> { crate::command::base_command::base_command_complete(self, input, suggestions) } diff --git a/crates/shirabe/src/command/audit_command.rs b/crates/shirabe/src/command/audit_command.rs index c631a870..b6a3a150 100644 --- a/crates/shirabe/src/command/audit_command.rs +++ b/crates/shirabe/src/command/audit_command.rs @@ -17,7 +17,7 @@ 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::command::Command; use shirabe_symfony_console::input::InputInterface; use shirabe_symfony_console::output::OutputInterface; @@ -287,8 +287,8 @@ impl Command for AuditCommand { fn complete( &self, - input: &shirabe_symfony_console::completion::completion_input::CompletionInput, - suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions, + input: &shirabe_symfony_console::completion::CompletionInput, + suggestions: &mut shirabe_symfony_console::completion::CompletionSuggestions, ) -> anyhow::Result<()> { crate::command::base_command::base_command_complete(self, input, suggestions) } diff --git a/crates/shirabe/src/command/base_command.rs b/crates/shirabe/src/command/base_command.rs index ceb71bf1..9eb28dd8 100644 --- a/crates/shirabe/src/command/base_command.rs +++ b/crates/shirabe/src/command/base_command.rs @@ -23,7 +23,7 @@ use shirabe_php_shim::{ 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::command::{Command, CommandData, SetDefinitionArg}; use shirabe_symfony_console::helper::Table; use shirabe_symfony_console::helper::TableSeparator; use shirabe_symfony_console::input::InputInterface; @@ -741,10 +741,10 @@ fn apply_application_defaults( /// each command's `Command::complete` forwards here. pub fn base_command_complete( cmd: &dyn BaseCommand, - input: &shirabe_symfony_console::completion::completion_input::CompletionInput, - suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions, + input: &shirabe_symfony_console::completion::CompletionInput, + suggestions: &mut shirabe_symfony_console::completion::CompletionSuggestions, ) -> anyhow::Result<()> { - use shirabe_symfony_console::completion::completion_input::CompletionInput; + use shirabe_symfony_console::completion::CompletionInput; // PHP: (string) $input->getCompletionName() let name = input.get_completion_name().unwrap_or_default(); diff --git a/crates/shirabe/src/command/bump_command.rs b/crates/shirabe/src/command/bump_command.rs index 99761b18..87109d20 100644 --- a/crates/shirabe/src/command/bump_command.rs +++ b/crates/shirabe/src/command/bump_command.rs @@ -21,7 +21,7 @@ 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::command::Command; use shirabe_symfony_console::input::InputInterface; use shirabe_symfony_console::output::OutputInterface; @@ -442,8 +442,8 @@ impl Command for BumpCommand { fn complete( &self, - input: &shirabe_symfony_console::completion::completion_input::CompletionInput, - suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions, + input: &shirabe_symfony_console::completion::CompletionInput, + suggestions: &mut shirabe_symfony_console::completion::CompletionSuggestions, ) -> anyhow::Result<()> { crate::command::base_command::base_command_complete(self, input, suggestions) } diff --git a/crates/shirabe/src/command/check_platform_reqs_command.rs b/crates/shirabe/src/command/check_platform_reqs_command.rs index b69f4190..3742cdac 100644 --- a/crates/shirabe/src/command/check_platform_reqs_command.rs +++ b/crates/shirabe/src/command/check_platform_reqs_command.rs @@ -15,7 +15,7 @@ use indexmap::IndexMap; 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::command::Command; use shirabe_symfony_console::input::InputInterface; use shirabe_symfony_console::output::OutputInterface; @@ -413,8 +413,8 @@ impl Command for CheckPlatformReqsCommand { fn complete( &self, - input: &shirabe_symfony_console::completion::completion_input::CompletionInput, - suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions, + input: &shirabe_symfony_console::completion::CompletionInput, + suggestions: &mut shirabe_symfony_console::completion::CompletionSuggestions, ) -> anyhow::Result<()> { crate::command::base_command::base_command_complete(self, input, suggestions) } diff --git a/crates/shirabe/src/command/clear_cache_command.rs b/crates/shirabe/src/command/clear_cache_command.rs index fcc237af..2252a75e 100644 --- a/crates/shirabe/src/command/clear_cache_command.rs +++ b/crates/shirabe/src/command/clear_cache_command.rs @@ -9,7 +9,7 @@ use crate::console::input::InputOption; use crate::factory::Factory; use crate::io::IOInterfaceImmutable; use shirabe_php_shim::{impl_php_class, realpath}; -use shirabe_symfony_console::command::command::Command; +use shirabe_symfony_console::command::Command; use shirabe_symfony_console::input::InputInterface; use shirabe_symfony_console::output::OutputInterface; @@ -188,8 +188,8 @@ impl Command for ClearCacheCommand { fn complete( &self, - input: &shirabe_symfony_console::completion::completion_input::CompletionInput, - suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions, + input: &shirabe_symfony_console::completion::CompletionInput, + suggestions: &mut shirabe_symfony_console::completion::CompletionSuggestions, ) -> anyhow::Result<()> { crate::command::base_command::base_command_complete(self, input, suggestions) } diff --git a/crates/shirabe/src/command/config_command.rs b/crates/shirabe/src/command/config_command.rs index a0660aca..df47d934 100644 --- a/crates/shirabe/src/command/config_command.rs +++ b/crates/shirabe/src/command/config_command.rs @@ -26,7 +26,7 @@ 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::command::Command; use shirabe_symfony_console::input::InputInterface; use shirabe_symfony_console::output::OutputInterface; @@ -1578,8 +1578,8 @@ impl Command for ConfigCommand { fn complete( &self, - input: &shirabe_symfony_console::completion::completion_input::CompletionInput, - suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions, + input: &shirabe_symfony_console::completion::CompletionInput, + suggestions: &mut shirabe_symfony_console::completion::CompletionSuggestions, ) -> anyhow::Result<()> { crate::command::base_command::base_command_complete(self, input, suggestions) } diff --git a/crates/shirabe/src/command/create_project_command.rs b/crates/shirabe/src/command/create_project_command.rs index e8f7d187..787e31d7 100644 --- a/crates/shirabe/src/command/create_project_command.rs +++ b/crates/shirabe/src/command/create_project_command.rs @@ -44,7 +44,7 @@ use shirabe_php_shim::{ mkdir, realpath, rtrim, strtolower, unlink, }; use shirabe_seld_signal::SignalHandler; -use shirabe_symfony_console::command::command::Command; +use shirabe_symfony_console::command::Command; use shirabe_symfony_console::input::InputInterface; use shirabe_symfony_console::output::OutputInterface; use shirabe_symfony_finder::Finder; @@ -1021,8 +1021,8 @@ impl Command for CreateProjectCommand { fn complete( &self, - input: &shirabe_symfony_console::completion::completion_input::CompletionInput, - suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions, + input: &shirabe_symfony_console::completion::CompletionInput, + suggestions: &mut shirabe_symfony_console::completion::CompletionSuggestions, ) -> anyhow::Result<()> { crate::command::base_command::base_command_complete(self, input, suggestions) } diff --git a/crates/shirabe/src/command/depends_command.rs b/crates/shirabe/src/command/depends_command.rs index 7ffa9281..f22682e8 100644 --- a/crates/shirabe/src/command/depends_command.rs +++ b/crates/shirabe/src/command/depends_command.rs @@ -8,7 +8,7 @@ use crate::command::base_command::base_command_initialize; use crate::console::input::InputArgument; use crate::console::input::InputOption; use shirabe_php_shim::impl_php_class; -use shirabe_symfony_console::command::command::Command; +use shirabe_symfony_console::command::Command; use shirabe_symfony_console::input::InputInterface; use shirabe_symfony_console::output::OutputInterface; @@ -119,8 +119,8 @@ impl Command for DependsCommand { fn complete( &self, - input: &shirabe_symfony_console::completion::completion_input::CompletionInput, - suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions, + input: &shirabe_symfony_console::completion::CompletionInput, + suggestions: &mut shirabe_symfony_console::completion::CompletionSuggestions, ) -> anyhow::Result<()> { crate::command::base_command::base_command_complete(self, input, suggestions) } diff --git a/crates/shirabe/src/command/diagnose_command.rs b/crates/shirabe/src/command/diagnose_command.rs index 5094f06a..ca71c0e5 100644 --- a/crates/shirabe/src/command/diagnose_command.rs +++ b/crates/shirabe/src/command/diagnose_command.rs @@ -41,7 +41,7 @@ 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::command::Command; use shirabe_symfony_console::input::InputInterface; use shirabe_symfony_console::output::OutputInterface; use shirabe_symfony_process::ExecutableFinder; @@ -637,7 +637,7 @@ impl DiagnoseCommand { let io: std::rc::Rc<std::cell::RefCell<dyn IOInterface>> = std::rc::Rc::new(std::cell::RefCell::new(BufferIO::new( String::new(), - shirabe_symfony_console::output::output_interface::VERBOSITY_NORMAL, + shirabe_symfony_console::output::VERBOSITY_NORMAL, None, )?)); let result = match auditor.audit( @@ -1499,8 +1499,8 @@ impl Command for DiagnoseCommand { fn complete( &self, - input: &shirabe_symfony_console::completion::completion_input::CompletionInput, - suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions, + input: &shirabe_symfony_console::completion::CompletionInput, + suggestions: &mut shirabe_symfony_console::completion::CompletionSuggestions, ) -> anyhow::Result<()> { crate::command::base_command::base_command_complete(self, input, suggestions) } diff --git a/crates/shirabe/src/command/dump_autoload_command.rs b/crates/shirabe/src/command/dump_autoload_command.rs index 8bf491cb..d9ac44ba 100644 --- a/crates/shirabe/src/command/dump_autoload_command.rs +++ b/crates/shirabe/src/command/dump_autoload_command.rs @@ -8,7 +8,7 @@ use crate::io::IOInterfaceImmutable; use crate::plugin::CommandEvent; use crate::plugin::PluginEvents; use shirabe_php_shim::{InvalidArgumentException, PhpMixed, file_exists, impl_php_class}; -use shirabe_symfony_console::command::command::Command; +use shirabe_symfony_console::command::Command; use shirabe_symfony_console::input::InputInterface; use shirabe_symfony_console::output::OutputInterface; @@ -303,8 +303,8 @@ impl Command for DumpAutoloadCommand { fn complete( &self, - input: &shirabe_symfony_console::completion::completion_input::CompletionInput, - suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions, + input: &shirabe_symfony_console::completion::CompletionInput, + suggestions: &mut shirabe_symfony_console::completion::CompletionSuggestions, ) -> anyhow::Result<()> { crate::command::base_command::base_command_complete(self, input, suggestions) } diff --git a/crates/shirabe/src/command/exec_command.rs b/crates/shirabe/src/command/exec_command.rs index e5825e3b..92e46c8b 100644 --- a/crates/shirabe/src/command/exec_command.rs +++ b/crates/shirabe/src/command/exec_command.rs @@ -8,7 +8,7 @@ use crate::console::input::InputArgument; use crate::console::input::InputOption; use crate::io::IOInterfaceImmutable; use shirabe_php_shim::{PhpMixed, RuntimeException, basename, chdir, getcwd, glob, impl_php_class}; -use shirabe_symfony_console::command::command::Command; +use shirabe_symfony_console::command::Command; use shirabe_symfony_console::input::InputInterface; use shirabe_symfony_console::output::OutputInterface; @@ -256,8 +256,8 @@ impl Command for ExecCommand { fn complete( &self, - input: &shirabe_symfony_console::completion::completion_input::CompletionInput, - suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions, + input: &shirabe_symfony_console::completion::CompletionInput, + suggestions: &mut shirabe_symfony_console::completion::CompletionSuggestions, ) -> anyhow::Result<()> { crate::command::base_command::base_command_complete(self, input, suggestions) } diff --git a/crates/shirabe/src/command/fund_command.rs b/crates/shirabe/src/command/fund_command.rs index 1151c365..7f2dd24c 100644 --- a/crates/shirabe/src/command/fund_command.rs +++ b/crates/shirabe/src/command/fund_command.rs @@ -14,7 +14,7 @@ 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::command::Command; use shirabe_symfony_console::formatter::OutputFormatter; use shirabe_symfony_console::input::InputInterface; use shirabe_symfony_console::output::OutputInterface; @@ -229,8 +229,8 @@ impl Command for FundCommand { fn complete( &self, - input: &shirabe_symfony_console::completion::completion_input::CompletionInput, - suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions, + input: &shirabe_symfony_console::completion::CompletionInput, + suggestions: &mut shirabe_symfony_console::completion::CompletionSuggestions, ) -> anyhow::Result<()> { crate::command::base_command::base_command_complete(self, input, suggestions) } diff --git a/crates/shirabe/src/command/global_command.rs b/crates/shirabe/src/command/global_command.rs index f60cc4a0..af25eb29 100644 --- a/crates/shirabe/src/command/global_command.rs +++ b/crates/shirabe/src/command/global_command.rs @@ -10,11 +10,9 @@ use crate::util::Filesystem; use crate::util::Platform; 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::command::Command; +use shirabe_symfony_console::completion::CompletionInput; +use shirabe_symfony_console::completion::{CompletionSuggestions, StringOrSuggestion}; use shirabe_symfony_console::input::ArgvInput; use shirabe_symfony_console::input::ArrayInput; use shirabe_symfony_console::input::InputInterface; diff --git a/crates/shirabe/src/command/home_command.rs b/crates/shirabe/src/command/home_command.rs index 226872d5..a0cc881d 100644 --- a/crates/shirabe/src/command/home_command.rs +++ b/crates/shirabe/src/command/home_command.rs @@ -14,7 +14,7 @@ use crate::util::Platform; use crate::util::ProcessExecutor; 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::command::Command; use shirabe_symfony_console::input::InputInterface; use shirabe_symfony_console::output::OutputInterface; @@ -265,8 +265,8 @@ impl Command for HomeCommand { fn complete( &self, - input: &shirabe_symfony_console::completion::completion_input::CompletionInput, - suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions, + input: &shirabe_symfony_console::completion::CompletionInput, + suggestions: &mut shirabe_symfony_console::completion::CompletionSuggestions, ) -> anyhow::Result<()> { crate::command::base_command::base_command_complete(self, input, suggestions) } diff --git a/crates/shirabe/src/command/init_command.rs b/crates/shirabe/src/command/init_command.rs index 3a095416..e76f5a94 100644 --- a/crates/shirabe/src/command/init_command.rs +++ b/crates/shirabe/src/command/init_command.rs @@ -29,7 +29,7 @@ use shirabe_php_shim::{ ucwords, }; use shirabe_spdx_licenses::SpdxLicenses; -use shirabe_symfony_console::command::command::Command; +use shirabe_symfony_console::command::Command; use shirabe_symfony_console::helper::FormatBlockMessages; use shirabe_symfony_console::input::ArrayInput; use shirabe_symfony_console::input::InputInterface; @@ -1250,8 +1250,8 @@ impl Command for InitCommand { fn complete( &self, - input: &shirabe_symfony_console::completion::completion_input::CompletionInput, - suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions, + input: &shirabe_symfony_console::completion::CompletionInput, + suggestions: &mut shirabe_symfony_console::completion::CompletionSuggestions, ) -> anyhow::Result<()> { crate::command::base_command::base_command_complete(self, input, suggestions) } diff --git a/crates/shirabe/src/command/install_command.rs b/crates/shirabe/src/command/install_command.rs index 264cbbeb..6a5ce8de 100644 --- a/crates/shirabe/src/command/install_command.rs +++ b/crates/shirabe/src/command/install_command.rs @@ -14,7 +14,7 @@ use crate::plugin::CommandEvent; use crate::plugin::PluginEvents; use crate::util::HttpDownloader; use shirabe_php_shim::{PhpMixed, impl_php_class}; -use shirabe_symfony_console::command::command::Command; +use shirabe_symfony_console::command::Command; use shirabe_symfony_console::input::InputInterface; use shirabe_symfony_console::output::OutputInterface; @@ -274,8 +274,8 @@ impl Command for InstallCommand { fn complete( &self, - input: &shirabe_symfony_console::completion::completion_input::CompletionInput, - suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions, + input: &shirabe_symfony_console::completion::CompletionInput, + suggestions: &mut shirabe_symfony_console::completion::CompletionSuggestions, ) -> anyhow::Result<()> { crate::command::base_command::base_command_complete(self, input, suggestions) } diff --git a/crates/shirabe/src/command/licenses_command.rs b/crates/shirabe/src/command/licenses_command.rs index ed64061a..653987bf 100644 --- a/crates/shirabe/src/command/licenses_command.rs +++ b/crates/shirabe/src/command/licenses_command.rs @@ -14,7 +14,7 @@ use crate::util::PackageInfo; use crate::util::PackageSorter; use indexmap::IndexMap; use shirabe_php_shim::{PhpMixed, RuntimeException, UnexpectedValueException, impl_php_class}; -use shirabe_symfony_console::command::command::Command; +use shirabe_symfony_console::command::Command; use shirabe_symfony_console::formatter::OutputFormatter; use shirabe_symfony_console::helper::Table; use shirabe_symfony_console::input::InputInterface; @@ -332,8 +332,8 @@ impl Command for LicensesCommand { fn complete( &self, - input: &shirabe_symfony_console::completion::completion_input::CompletionInput, - suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions, + input: &shirabe_symfony_console::completion::CompletionInput, + suggestions: &mut shirabe_symfony_console::completion::CompletionSuggestions, ) -> anyhow::Result<()> { crate::command::base_command::base_command_complete(self, input, suggestions) } diff --git a/crates/shirabe/src/command/outdated_command.rs b/crates/shirabe/src/command/outdated_command.rs index 6d062d97..3994ab64 100644 --- a/crates/shirabe/src/command/outdated_command.rs +++ b/crates/shirabe/src/command/outdated_command.rs @@ -9,7 +9,7 @@ use crate::console::input::InputOption; use crate::console::input::SuggestedValues; use indexmap::IndexMap; use shirabe_php_shim::{PhpMixed, impl_php_class}; -use shirabe_symfony_console::command::command::Command; +use shirabe_symfony_console::command::Command; use shirabe_symfony_console::input::ArrayInput; use shirabe_symfony_console::input::InputInterface; use shirabe_symfony_console::output::OutputInterface; @@ -235,8 +235,8 @@ impl Command for OutdatedCommand { fn complete( &self, - input: &shirabe_symfony_console::completion::completion_input::CompletionInput, - suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions, + input: &shirabe_symfony_console::completion::CompletionInput, + suggestions: &mut shirabe_symfony_console::completion::CompletionSuggestions, ) -> anyhow::Result<()> { crate::command::base_command::base_command_complete(self, input, suggestions) } diff --git a/crates/shirabe/src/command/prohibits_command.rs b/crates/shirabe/src/command/prohibits_command.rs index 893c4f4a..ae38f9d2 100644 --- a/crates/shirabe/src/command/prohibits_command.rs +++ b/crates/shirabe/src/command/prohibits_command.rs @@ -7,7 +7,7 @@ use crate::command::{BaseCommand, BaseCommandData}; use crate::console::input::InputArgument; use crate::console::input::InputOption; use shirabe_php_shim::impl_php_class; -use shirabe_symfony_console::command::command::Command; +use shirabe_symfony_console::command::Command; use shirabe_symfony_console::input::InputInterface; use shirabe_symfony_console::output::OutputInterface; @@ -126,8 +126,8 @@ impl Command for ProhibitsCommand { fn complete( &self, - input: &shirabe_symfony_console::completion::completion_input::CompletionInput, - suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions, + input: &shirabe_symfony_console::completion::CompletionInput, + suggestions: &mut shirabe_symfony_console::completion::CompletionSuggestions, ) -> anyhow::Result<()> { crate::command::base_command::base_command_complete(self, input, suggestions) } diff --git a/crates/shirabe/src/command/reinstall_command.rs b/crates/shirabe/src/command/reinstall_command.rs index c9a1d2ea..9ef45fbf 100644 --- a/crates/shirabe/src/command/reinstall_command.rs +++ b/crates/shirabe/src/command/reinstall_command.rs @@ -17,7 +17,7 @@ use crate::script::ScriptEvents; use crate::util::Platform; use shirabe_pcre::Preg; use shirabe_php_shim::{InvalidArgumentException, impl_php_class}; -use shirabe_symfony_console::command::command::Command; +use shirabe_symfony_console::command::Command; use shirabe_symfony_console::input::InputInterface; use shirabe_symfony_console::output::OutputInterface; @@ -344,8 +344,8 @@ impl Command for ReinstallCommand { fn complete( &self, - input: &shirabe_symfony_console::completion::completion_input::CompletionInput, - suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions, + input: &shirabe_symfony_console::completion::CompletionInput, + suggestions: &mut shirabe_symfony_console::completion::CompletionSuggestions, ) -> anyhow::Result<()> { crate::command::base_command::base_command_complete(self, input, suggestions) } diff --git a/crates/shirabe/src/command/remove_command.rs b/crates/shirabe/src/command/remove_command.rs index 50e68045..a8b525e6 100644 --- a/crates/shirabe/src/command/remove_command.rs +++ b/crates/shirabe/src/command/remove_command.rs @@ -19,7 +19,7 @@ use crate::repository::RepositoryInterface; use indexmap::IndexMap; 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::command::Command; use shirabe_symfony_console::exception::InvalidArgumentException; use shirabe_symfony_console::input::InputInterface; use shirabe_symfony_console::output::OutputInterface; @@ -715,8 +715,8 @@ impl Command for RemoveCommand { fn complete( &self, - input: &shirabe_symfony_console::completion::completion_input::CompletionInput, - suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions, + input: &shirabe_symfony_console::completion::CompletionInput, + suggestions: &mut shirabe_symfony_console::completion::CompletionSuggestions, ) -> anyhow::Result<()> { crate::command::base_command::base_command_complete(self, input, suggestions) } diff --git a/crates/shirabe/src/command/repository_command.rs b/crates/shirabe/src/command/repository_command.rs index b03c0133..ef75ffd0 100644 --- a/crates/shirabe/src/command/repository_command.rs +++ b/crates/shirabe/src/command/repository_command.rs @@ -15,7 +15,7 @@ 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::command::Command; use shirabe_symfony_console::input::InputInterface; use shirabe_symfony_console::output::OutputInterface; @@ -578,8 +578,8 @@ impl Command for RepositoryCommand { fn complete( &self, - input: &shirabe_symfony_console::completion::completion_input::CompletionInput, - suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions, + input: &shirabe_symfony_console::completion::CompletionInput, + suggestions: &mut shirabe_symfony_console::completion::CompletionSuggestions, ) -> anyhow::Result<()> { crate::command::base_command::base_command_complete(self, input, suggestions) } diff --git a/crates/shirabe/src/command/require_command.rs b/crates/shirabe/src/command/require_command.rs index 30e727d4..d4295a50 100644 --- a/crates/shirabe/src/command/require_command.rs +++ b/crates/shirabe/src/command/require_command.rs @@ -38,7 +38,7 @@ use shirabe_php_shim::{ impl_php_class, implode, is_writable, strtolower, unlink, }; use shirabe_seld_signal::SignalHandler; -use shirabe_symfony_console::command::command::Command; +use shirabe_symfony_console::command::Command; use shirabe_symfony_console::input::InputInterface; use shirabe_symfony_console::output::OutputInterface; @@ -1289,8 +1289,8 @@ impl Command for RequireCommand { fn complete( &self, - input: &shirabe_symfony_console::completion::completion_input::CompletionInput, - suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions, + input: &shirabe_symfony_console::completion::CompletionInput, + suggestions: &mut shirabe_symfony_console::completion::CompletionSuggestions, ) -> anyhow::Result<()> { crate::command::base_command::base_command_complete(self, input, suggestions) } diff --git a/crates/shirabe/src/command/run_script_command.rs b/crates/shirabe/src/command/run_script_command.rs index 56833daa..a3a7d5be 100644 --- a/crates/shirabe/src/command/run_script_command.rs +++ b/crates/shirabe/src/command/run_script_command.rs @@ -14,9 +14,9 @@ use indexmap::IndexMap; 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::command::Command; use shirabe_symfony_console::exception::CommandNotFoundException; -use shirabe_symfony_console::exception::namespace_not_found_exception::NamespaceNotFoundException; +use shirabe_symfony_console::exception::NamespaceNotFoundException; use shirabe_symfony_console::input::InputInterface; use shirabe_symfony_console::output::OutputInterface; @@ -347,8 +347,8 @@ impl Command for RunScriptCommand { fn complete( &self, - input: &shirabe_symfony_console::completion::completion_input::CompletionInput, - suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions, + input: &shirabe_symfony_console::completion::CompletionInput, + suggestions: &mut shirabe_symfony_console::completion::CompletionSuggestions, ) -> anyhow::Result<()> { crate::command::base_command::base_command_complete(self, input, suggestions) } diff --git a/crates/shirabe/src/command/script_alias_command.rs b/crates/shirabe/src/command/script_alias_command.rs index 214cb51f..e4418b53 100644 --- a/crates/shirabe/src/command/script_alias_command.rs +++ b/crates/shirabe/src/command/script_alias_command.rs @@ -10,7 +10,7 @@ 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::command::Command; use shirabe_symfony_console::input::InputInterface; use shirabe_symfony_console::output::OutputInterface; @@ -171,8 +171,8 @@ impl Command for ScriptAliasCommand { fn complete( &self, - input: &shirabe_symfony_console::completion::completion_input::CompletionInput, - suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions, + input: &shirabe_symfony_console::completion::CompletionInput, + suggestions: &mut shirabe_symfony_console::completion::CompletionSuggestions, ) -> anyhow::Result<()> { crate::command::base_command::base_command_complete(self, input, suggestions) } diff --git a/crates/shirabe/src/command/search_command.rs b/crates/shirabe/src/command/search_command.rs index 3f797551..72a883f1 100644 --- a/crates/shirabe/src/command/search_command.rs +++ b/crates/shirabe/src/command/search_command.rs @@ -17,7 +17,7 @@ use indexmap::IndexMap; 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::command::Command; use shirabe_symfony_console::formatter::OutputFormatter; use shirabe_symfony_console::input::InputInterface; use shirabe_symfony_console::output::OutputInterface; @@ -307,8 +307,8 @@ impl Command for SearchCommand { fn complete( &self, - input: &shirabe_symfony_console::completion::completion_input::CompletionInput, - suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions, + input: &shirabe_symfony_console::completion::CompletionInput, + suggestions: &mut shirabe_symfony_console::completion::CompletionSuggestions, ) -> anyhow::Result<()> { crate::command::base_command::base_command_complete(self, input, suggestions) } diff --git a/crates/shirabe/src/command/self_update_command.rs b/crates/shirabe/src/command/self_update_command.rs index 6872730e..dabe8bc8 100644 --- a/crates/shirabe/src/command/self_update_command.rs +++ b/crates/shirabe/src/command/self_update_command.rs @@ -8,7 +8,7 @@ use crate::console::input::InputOption; use crate::io::IOInterfaceImmutable; use crate::io::io_interface; use shirabe_php_shim::{PhpMixed, impl_php_class}; -use shirabe_symfony_console::command::command::Command; +use shirabe_symfony_console::command::Command; use shirabe_symfony_console::input::InputInterface; use shirabe_symfony_console::output::OutputInterface; @@ -95,8 +95,8 @@ impl Command for SelfUpdateCommand { fn complete( &self, - input: &shirabe_symfony_console::completion::completion_input::CompletionInput, - suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions, + input: &shirabe_symfony_console::completion::CompletionInput, + suggestions: &mut shirabe_symfony_console::completion::CompletionSuggestions, ) -> anyhow::Result<()> { crate::command::base_command::base_command_complete(self, input, suggestions) } diff --git a/crates/shirabe/src/command/show_command.rs b/crates/shirabe/src/command/show_command.rs index c456f71a..e5d5a1f2 100644 --- a/crates/shirabe/src/command/show_command.rs +++ b/crates/shirabe/src/command/show_command.rs @@ -45,7 +45,7 @@ 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::command::Command; use shirabe_symfony_console::formatter::OutputFormatter; use shirabe_symfony_console::formatter::OutputFormatterStyle; use shirabe_symfony_console::input::InputInterface; @@ -2885,8 +2885,8 @@ impl Command for ShowCommand { fn complete( &self, - input: &shirabe_symfony_console::completion::completion_input::CompletionInput, - suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions, + input: &shirabe_symfony_console::completion::CompletionInput, + suggestions: &mut shirabe_symfony_console::completion::CompletionSuggestions, ) -> anyhow::Result<()> { crate::command::base_command::base_command_complete(self, input, suggestions) } diff --git a/crates/shirabe/src/command/status_command.rs b/crates/shirabe/src/command/status_command.rs index 097d7a40..bcb83a3a 100644 --- a/crates/shirabe/src/command/status_command.rs +++ b/crates/shirabe/src/command/status_command.rs @@ -14,7 +14,7 @@ use crate::script::ScriptEvents; use crate::util::ProcessExecutor; use indexmap::IndexMap; use shirabe_php_shim::impl_php_class; -use shirabe_symfony_console::command::command::Command; +use shirabe_symfony_console::command::Command; use shirabe_symfony_console::input::InputInterface; use shirabe_symfony_console::output::OutputInterface; @@ -390,8 +390,8 @@ impl Command for StatusCommand { fn complete( &self, - input: &shirabe_symfony_console::completion::completion_input::CompletionInput, - suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions, + input: &shirabe_symfony_console::completion::CompletionInput, + suggestions: &mut shirabe_symfony_console::completion::CompletionSuggestions, ) -> anyhow::Result<()> { crate::command::base_command::base_command_complete(self, input, suggestions) } diff --git a/crates/shirabe/src/command/suggests_command.rs b/crates/shirabe/src/command/suggests_command.rs index fba93b79..44f903da 100644 --- a/crates/shirabe/src/command/suggests_command.rs +++ b/crates/shirabe/src/command/suggests_command.rs @@ -13,7 +13,7 @@ use crate::repository::RepositoryInterfaceHandle; use crate::repository::RootPackageRepository; use indexmap::IndexMap; use shirabe_php_shim::{PhpMixed, empty, impl_php_class, in_array_loose}; -use shirabe_symfony_console::command::command::Command; +use shirabe_symfony_console::command::Command; use shirabe_symfony_console::input::InputInterface; use shirabe_symfony_console::output::OutputInterface; @@ -228,8 +228,8 @@ impl Command for SuggestsCommand { fn complete( &self, - input: &shirabe_symfony_console::completion::completion_input::CompletionInput, - suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions, + input: &shirabe_symfony_console::completion::CompletionInput, + suggestions: &mut shirabe_symfony_console::completion::CompletionSuggestions, ) -> anyhow::Result<()> { crate::command::base_command::base_command_complete(self, input, suggestions) } diff --git a/crates/shirabe/src/command/update_command.rs b/crates/shirabe/src/command/update_command.rs index abf9696a..b961b3a0 100644 --- a/crates/shirabe/src/command/update_command.rs +++ b/crates/shirabe/src/command/update_command.rs @@ -34,7 +34,7 @@ use shirabe_php_shim::{ }; use shirabe_semver::Intervals; use shirabe_semver::constraint::MultiConstraint; -use shirabe_symfony_console::command::command::Command; +use shirabe_symfony_console::command::Command; use shirabe_symfony_console::helper::Table; use shirabe_symfony_console::input::InputInterface; use shirabe_symfony_console::output::OutputInterface; @@ -764,8 +764,8 @@ impl Command for UpdateCommand { fn complete( &self, - input: &shirabe_symfony_console::completion::completion_input::CompletionInput, - suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions, + input: &shirabe_symfony_console::completion::CompletionInput, + suggestions: &mut shirabe_symfony_console::completion::CompletionSuggestions, ) -> anyhow::Result<()> { crate::command::base_command::base_command_complete(self, input, suggestions) } diff --git a/crates/shirabe/src/command/validate_command.rs b/crates/shirabe/src/command/validate_command.rs index 116c0b27..d2e8f2a7 100644 --- a/crates/shirabe/src/command/validate_command.rs +++ b/crates/shirabe/src/command/validate_command.rs @@ -14,7 +14,7 @@ use crate::plugin::PluginEvents; use crate::util::ConfigValidator; use crate::util::Filesystem; use shirabe_php_shim::impl_php_class; -use shirabe_symfony_console::command::command::Command; +use shirabe_symfony_console::command::Command; use shirabe_symfony_console::input::InputInterface; use shirabe_symfony_console::output::OutputInterface; @@ -406,8 +406,8 @@ impl Command for ValidateCommand { fn complete( &self, - input: &shirabe_symfony_console::completion::completion_input::CompletionInput, - suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions, + input: &shirabe_symfony_console::completion::CompletionInput, + suggestions: &mut shirabe_symfony_console::completion::CompletionSuggestions, ) -> anyhow::Result<()> { crate::command::base_command::base_command_complete(self, input, suggestions) } diff --git a/crates/shirabe/src/console/application.rs b/crates/shirabe/src/console/application.rs index 8fed08e9..897408c0 100644 --- a/crates/shirabe/src/console/application.rs +++ b/crates/shirabe/src/console/application.rs @@ -67,35 +67,35 @@ use shirabe_php_shim::{ use shirabe_seld_json_lint::ParsingException; 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::command::HelpCommand; +use shirabe_symfony_console::command::SignalableCommandInterface; +use shirabe_symfony_console::command_loader::CommandLoaderInterface; +use shirabe_symfony_console::completion::CompletionInput; +use shirabe_symfony_console::completion::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::exception::InvalidArgumentException as ConsoleInvalidArgumentException; +use shirabe_symfony_console::exception::InvalidOptionException; +use shirabe_symfony_console::exception::LogicException as ConsoleLogicException; +use shirabe_symfony_console::exception::MissingInputException; +use shirabe_symfony_console::exception::NamespaceNotFoundException; +use shirabe_symfony_console::exception::RuntimeException as ConsoleRuntimeException; +use shirabe_symfony_console::formatter::OutputFormatter; +use shirabe_symfony_console::helper::Helper; 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::helper::{FormatBlockMessages, FormatterHelper}; +use shirabe_symfony_console::input::ArgvInput; +use shirabe_symfony_console::input::ArrayInput; +use shirabe_symfony_console::input::InputArgument; 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::ConsoleOutput; 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::output::{OutputInterface, output_interface}; +use shirabe_symfony_console::signal_registry::SignalRegistry; +use shirabe_symfony_console::style::StyleInterface; +use shirabe_symfony_console::style::SymfonyStyle; use shirabe_symfony_console::terminal::Terminal; use shirabe_symfony_process::exception::ProcessTimedOutException; @@ -777,12 +777,12 @@ impl Application { } } // array_filter($commandNames) - let filtered: Vec<shirabe_symfony_console::completion::completion_suggestions::StringOrSuggestion> = + let filtered: Vec<shirabe_symfony_console::completion::StringOrSuggestion> = command_names .into_iter() .filter(shirabe_php_shim::php_truthy) .map(|n| { - shirabe_symfony_console::completion::completion_suggestions::StringOrSuggestion::String( + shirabe_symfony_console::completion::StringOrSuggestion::String( shirabe_php_shim::php_to_string(&n), ) }) @@ -1563,7 +1563,7 @@ impl Application { /// Gets the default input definition (Symfony base; `parent::getDefaultInputDefinition`). pub fn base_get_default_input_definition(&self) -> InputDefinition { - use shirabe_symfony_console::input::input_definition::DefinitionItem; + use shirabe_symfony_console::input::DefinitionItem; InputDefinition::new(vec![ DefinitionItem::InputArgument( InputArgument::new( @@ -1646,10 +1646,10 @@ impl Application { pub fn base_get_default_commands( &self, ) -> Vec<std::rc::Rc<std::cell::RefCell<dyn SymfonyCommand>>> { - 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; + use shirabe_symfony_console::command::CompleteCommand; + use shirabe_symfony_console::command::DumpCompletionCommand; + use shirabe_symfony_console::command::HelpCommand; + use shirabe_symfony_console::command::ListCommand; vec![ std::rc::Rc::new(std::cell::RefCell::new(HelpCommand::new())) @@ -3067,10 +3067,9 @@ pub(crate) fn run_worker_reverse_command(name: &str, input_line: &str) -> anyhow } else { format!("{name} {trimmed}") }; - let input: std::rc::Rc<std::cell::RefCell<dyn InputInterface>> = - std::rc::Rc::new(std::cell::RefCell::new( - shirabe_symfony_console::input::string_input::StringInput::new(&line)?, - )); + let input: std::rc::Rc<std::cell::RefCell<dyn InputInterface>> = std::rc::Rc::new( + std::cell::RefCell::new(shirabe_symfony_console::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/input.rs b/crates/shirabe/src/console/input.rs index b8076247..6e515e7d 100644 --- a/crates/shirabe/src/console/input.rs +++ b/crates/shirabe/src/console/input.rs @@ -4,10 +4,8 @@ pub mod input_option; pub use input_argument::*; pub use input_option::*; -use shirabe_symfony_console::completion::completion_input::CompletionInput; -use shirabe_symfony_console::completion::completion_suggestions::{ - CompletionSuggestions, StringOrSuggestion, -}; +use shirabe_symfony_console::completion::CompletionInput; +use shirabe_symfony_console::completion::{CompletionSuggestions, StringOrSuggestion}; /// PHP: `\Closure(CompletionInput,CompletionSuggestions):list<string|Suggestion>`. /// @@ -88,10 +86,8 @@ pub enum InputDefinitionItem { impl InputDefinitionItem { /// Converts to the Symfony-typed definition item accepted by `CommandData::set_definition`. - pub(crate) fn to_definition_item( - &self, - ) -> shirabe_symfony_console::input::input_definition::DefinitionItem { - use shirabe_symfony_console::input::input_definition::DefinitionItem; + pub(crate) fn to_definition_item(&self) -> shirabe_symfony_console::input::DefinitionItem { + use shirabe_symfony_console::input::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 ab6f174c..1e550926 100644 --- a/crates/shirabe/src/console/input/input_argument.rs +++ b/crates/shirabe/src/console/input/input_argument.rs @@ -2,8 +2,8 @@ use crate::console::input::SuggestedValues; 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::completion::CompletionInput; +use shirabe_symfony_console::completion::CompletionSuggestions; use shirabe_symfony_console::input::InputArgument as BaseInputArgument; #[derive(Debug)] diff --git a/crates/shirabe/src/console/input/input_option.rs b/crates/shirabe/src/console/input/input_option.rs index 8a9c19f7..976f006f 100644 --- a/crates/shirabe/src/console/input/input_option.rs +++ b/crates/shirabe/src/console/input/input_option.rs @@ -2,8 +2,8 @@ use crate::console::input::SuggestedValues; 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::completion::CompletionInput; +use shirabe_symfony_console::completion::CompletionSuggestions; use shirabe_symfony_console::input::InputOption as BaseInputOption; #[derive(Debug)] diff --git a/crates/shirabe/src/factory.rs b/crates/shirabe/src/factory.rs index 6d20c3cb..926ca380 100644 --- a/crates/shirabe/src/factory.rs +++ b/crates/shirabe/src/factory.rs @@ -402,7 +402,7 @@ impl Factory { let formatter = OutputFormatter::new(false, styles); ConsoleOutput::new( - Some(shirabe_symfony_console::output::output_interface::VERBOSITY_NORMAL), + Some(shirabe_symfony_console::output::VERBOSITY_NORMAL), None, Some(std::rc::Rc::new(std::cell::RefCell::new(formatter))), ) diff --git a/crates/shirabe/src/io/console_io.rs b/crates/shirabe/src/io/console_io.rs index 043ef939..060fa0c6 100644 --- a/crates/shirabe/src/io/console_io.rs +++ b/crates/shirabe/src/io/console_io.rs @@ -21,7 +21,7 @@ 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::output::{OutputInterface, output_interface}; use shirabe_symfony_console::question::ChoiceQuestion; use shirabe_symfony_console::question::Question; use shirabe_symfony_console::question::QuestionInterface; diff --git a/crates/shirabe/src/lib.rs b/crates/shirabe/src/lib.rs index 7730bc66..701a8dfd 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_symfony_console::input::argv_input::ArgvInput; + use shirabe_symfony_console::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/php_plugin_proxy.rs b/crates/shirabe/src/plugin/php_plugin_proxy.rs index 8e24dbfe..e4384f1c 100644 --- a/crates/shirabe/src/plugin/php_plugin_proxy.rs +++ b/crates/shirabe/src/plugin/php_plugin_proxy.rs @@ -33,7 +33,7 @@ use shirabe_php_rpc::{ 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::command::Command; use shirabe_symfony_console::input::InputInterface; use shirabe_symfony_console::output::OutputInterface; @@ -2977,9 +2977,9 @@ impl PhpCommandProxy { handle: &PhpObjHandle, data: &crate::command::BaseCommandData, ) -> anyhow::Result<()> { - 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; + use shirabe_symfony_console::input::InputArgument; + use shirabe_symfony_console::input::InputOption; + use shirabe_symfony_console::input::{DefinitionItem, InputDefinition}; let value = unwrap_php_result(call_function_with_dispatcher( "__shirabe_read_command_definition", @@ -3084,9 +3084,9 @@ impl PhpCommandProxy { )?)); } data.command_data().set_definition( - shirabe_symfony_console::command::command::SetDefinitionArg::Definition( - InputDefinition::new(items)?, - ), + shirabe_symfony_console::command::SetDefinitionArg::Definition(InputDefinition::new( + items, + )?), ); match field(&mut map, "help") { diff --git a/crates/shirabe/tests/application_test.rs b/crates/shirabe/tests/application_test.rs index f0bde547..257bc861 100644 --- a/crates/shirabe/tests/application_test.rs +++ b/crates/shirabe/tests/application_test.rs @@ -14,10 +14,10 @@ use shirabe::console::application::ApplicationHandle; use shirabe::util::platform::Platform; 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; +use shirabe_symfony_console::input::ArrayInput; +use shirabe_symfony_console::input::InputInterface; +use shirabe_symfony_console::output::BufferedOutput; +use shirabe_symfony_console::output::OutputInterface; fn set_up() { Platform::put_env("COMPOSER_DISABLE_XDEBUG_WARN", "1"); diff --git a/crates/shirabe/tests/command/archive_command_test.rs b/crates/shirabe/tests/command/archive_command_test.rs index ac1ad462..90e13e5d 100644 --- a/crates/shirabe/tests/command/archive_command_test.rs +++ b/crates/shirabe/tests/command/archive_command_test.rs @@ -17,11 +17,11 @@ use shirabe::repository::{ use shirabe::util::Platform; use shirabe_php_shim::PhpMixed; use shirabe_semver::VersionParser; -use shirabe_symfony_console::command::command::Command; +use shirabe_symfony_console::command::Command; +use shirabe_symfony_console::input::ArrayInput; use shirabe_symfony_console::input::InputInterface; -use shirabe_symfony_console::input::array_input::ArrayInput; +use shirabe_symfony_console::output::BufferedOutput; 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/test_case.rs b/crates/shirabe/tests/common/test_case.rs index e15d2883..9de7d905 100644 --- a/crates/shirabe/tests/common/test_case.rs +++ b/crates/shirabe/tests/common/test_case.rs @@ -24,13 +24,13 @@ use shirabe::util::process_executor::ProcessExecutor; 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 shirabe_symfony_console::input::ArrayInput; +use shirabe_symfony_console::input::InputInterface; +use shirabe_symfony_console::input::StreamableInputInterface; +use shirabe_symfony_console::output::ConsoleOutput; +use shirabe_symfony_console::output::ConsoleOutputInterface; +use shirabe_symfony_console::output::OutputInterface; +use shirabe_symfony_console::output::StreamOutput; use std::path::PathBuf; use tempfile::TempDir; diff --git a/crates/shirabe/tests/completion_functional_test.rs b/crates/shirabe/tests/completion_functional_test.rs index 66f2f87b..6bbe955a 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_symfony_console::tester::command_completion_tester::CommandCompletionTester; +use shirabe_symfony_console::tester::CommandCompletionTester; struct RestoreCwd(std::path::PathBuf); diff --git a/crates/shirabe/tests/documentation_test.rs b/crates/shirabe/tests/documentation_test.rs index ad945aa3..33e5ec3f 100644 --- a/crates/shirabe/tests/documentation_test.rs +++ b/crates/shirabe/tests/documentation_test.rs @@ -2,7 +2,7 @@ use shirabe::console::application::ApplicationHandle; use shirabe_symfony_console::command::Command; -use shirabe_symfony_console::descriptor::application_description::ApplicationDescription; +use shirabe_symfony_console::descriptor::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/installer_test.rs b/crates/shirabe/tests/installer_test.rs index 295d9250..b6d19b10 100644 --- a/crates/shirabe/tests/installer_test.rs +++ b/crates/shirabe/tests/installer_test.rs @@ -46,14 +46,14 @@ 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; +use shirabe_symfony_console::command::Command as SymfonyCommand; +use shirabe_symfony_console::command::CommandData; +use shirabe_symfony_console::input::InputArgument; +use shirabe_symfony_console::input::InputInterface; +use shirabe_symfony_console::input::InputOption; +use shirabe_symfony_console::input::StringInput; +use shirabe_symfony_console::output::StreamOutput; +use shirabe_symfony_console::output::{OutputInterface, VERBOSITY_NORMAL}; // 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 5036a172..89c323c0 100644 --- a/crates/shirabe/tests/io/buffer_io_test.rs +++ b/crates/shirabe/tests/io/buffer_io_test.rs @@ -3,7 +3,7 @@ use shirabe::io::IOInterfaceImmutable; use shirabe::io::buffer_io::BufferIO; use shirabe_php_shim::PhpMixed; -use shirabe_symfony_console::output::output_interface::VERBOSITY_NORMAL; +use shirabe_symfony_console::output::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 c3240ea5..3c142cfe 100644 --- a/crates/shirabe/tests/io/console_io_test.rs +++ b/crates/shirabe/tests/io/console_io_test.rs @@ -18,13 +18,13 @@ use shirabe::io::IOInterfaceMutable; use shirabe::io::io_interface::NORMAL; 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; +use shirabe_symfony_console::input::ArrayInput; +use shirabe_symfony_console::input::InputInterface; +use shirabe_symfony_console::input::StreamableInputInterface; +use shirabe_symfony_console::output::BufferedOutput; +use shirabe_symfony_console::output::ConsoleOutput; +use shirabe_symfony_console::output::ConsoleOutputInterface; +use shirabe_symfony_console::output::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/plugin/plugin_installer_test.rs b/crates/shirabe/tests/plugin/plugin_installer_test.rs index b713104e..0e1f01ee 100644 --- a/crates/shirabe/tests/plugin/plugin_installer_test.rs +++ b/crates/shirabe/tests/plugin/plugin_installer_test.rs @@ -35,7 +35,7 @@ use shirabe_php_rpc::PluginValue; 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_console::output::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 3e1ae72e..0c163c84 100644 --- a/crates/shirabe/tests/question/strict_confirmation_question_test.rs +++ b/crates/shirabe/tests/question/strict_confirmation_question_test.rs @@ -2,11 +2,11 @@ use shirabe::question::StrictConfirmationQuestion; 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; +use shirabe_symfony_console::helper::{QuestionHelper, QuestionHelperInterface}; +use shirabe_symfony_console::input::ArrayInput; +use shirabe_symfony_console::input::StreamableInputInterface; +use shirabe_symfony_console::output::OutputInterface; +use shirabe_symfony_console::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 fcbfd925..2c6ca10b 100644 --- a/crates/shirabe/tests/util/http_downloader_test.rs +++ b/crates/shirabe/tests/util/http_downloader_test.rs @@ -12,7 +12,7 @@ use shirabe::util::Platform; use shirabe::util::http_downloader::HttpDownloader; use shirabe_php_shim::Catch as _; use shirabe_php_shim::{PHP_EOL, PhpMixed}; -use shirabe_symfony_console::output::output_interface::VERBOSITY_NORMAL; +use shirabe_symfony_console::output::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 b772c1bc..e1d8456b 100644 --- a/crates/shirabe/tests/util/process_executor_test.rs +++ b/crates/shirabe/tests/util/process_executor_test.rs @@ -10,12 +10,10 @@ use shirabe::io::buffer_io::BufferIO; use shirabe::util::process_executor::ProcessExecutor; 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_symfony_console::input::ArrayInput; +use shirabe_symfony_console::input::InputInterface; +use shirabe_symfony_console::output::BufferedOutput; +use shirabe_symfony_console::output::{OutputInterface, VERBOSITY_DEBUG, VERBOSITY_NORMAL}; #[test] fn test_execute_captures_output() { |