aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates
diff options
context:
space:
mode:
authornsfisis <nsfisis@gmail.com>2026-06-08 02:23:31 +0900
committernsfisis <nsfisis@gmail.com>2026-06-08 02:23:31 +0900
commit06368584a9277022d9cfc42d22c37f4cc6e580f8 (patch)
treea210e77273316ce94530391ea4e6dc4ee60b42ea /crates
parent318ea948f5932dfa7942081a269d62fd7161a9bf (diff)
downloadphp-shirabe-06368584a9277022d9cfc42d22c37f4cc6e580f8.tar.gz
php-shirabe-06368584a9277022d9cfc42d22c37f4cc6e580f8.tar.zst
php-shirabe-06368584a9277022d9cfc42d22c37f4cc6e580f8.zip
refactor(external-packages): drop component segment from symfony paths
Align the Symfony namespace mapping with the documented convention (symfony::component::X -> symfony::X) and remove now-unused console stub files. Update all import paths across the workspace. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Diffstat (limited to 'crates')
-rw-r--r--crates/shirabe-class-map-generator/src/class_map_generator.rs4
-rw-r--r--crates/shirabe-external-packages/src/symfony/component/console/completion/completion_input.rs24
-rw-r--r--crates/shirabe-external-packages/src/symfony/component/console/completion/completion_suggestions.rs14
-rw-r--r--crates/shirabe-external-packages/src/symfony/component/console/completion/mod.rs5
-rw-r--r--crates/shirabe-external-packages/src/symfony/component/console/exception/invalid_argument_exception.rs13
-rw-r--r--crates/shirabe-external-packages/src/symfony/component/console/exception/mod.rs7
-rw-r--r--crates/shirabe-external-packages/src/symfony/component/console/formatter/mod.rs5
-rw-r--r--crates/shirabe-external-packages/src/symfony/component/console/formatter/output_formatter.rs36
-rw-r--r--crates/shirabe-external-packages/src/symfony/component/console/formatter/output_formatter_style.rs12
-rw-r--r--crates/shirabe-external-packages/src/symfony/component/console/helper/helper_set.rs22
-rw-r--r--crates/shirabe-external-packages/src/symfony/component/console/helper/mod.rs15
-rw-r--r--crates/shirabe-external-packages/src/symfony/component/console/helper/question_helper.rs18
-rw-r--r--crates/shirabe-external-packages/src/symfony/component/console/helper/table.rs47
-rw-r--r--crates/shirabe-external-packages/src/symfony/component/console/input/array_input.rs69
-rw-r--r--crates/shirabe-external-packages/src/symfony/component/console/input/input_interface.rs32
-rw-r--r--crates/shirabe-external-packages/src/symfony/component/console/input/input_option.rs46
-rw-r--r--crates/shirabe-external-packages/src/symfony/component/console/input/mod.rs11
-rw-r--r--crates/shirabe-external-packages/src/symfony/component/console/input/string_input.rs66
-rw-r--r--crates/shirabe-external-packages/src/symfony/component/console/mod.rs23
-rw-r--r--crates/shirabe-external-packages/src/symfony/component/console/output/mod.rs7
-rw-r--r--crates/shirabe-external-packages/src/symfony/component/console/output/output_interface.rs45
-rw-r--r--crates/shirabe-external-packages/src/symfony/component/console/question/mod.rs5
-rw-r--r--crates/shirabe-external-packages/src/symfony/component/console/question/question.rs49
-rw-r--r--crates/shirabe-external-packages/src/symfony/component/mod.rs9
-rw-r--r--crates/shirabe-external-packages/src/symfony/component/process/executable_finder.rs22
-rw-r--r--crates/shirabe-external-packages/src/symfony/component/process/mod.rs9
-rw-r--r--crates/shirabe-external-packages/src/symfony/console/application.rs (renamed from crates/shirabe-external-packages/src/symfony/component/console/application.rs)4
-rw-r--r--crates/shirabe-external-packages/src/symfony/console/command/command.rs (renamed from crates/shirabe-external-packages/src/symfony/component/console/command/command.rs)0
-rw-r--r--crates/shirabe-external-packages/src/symfony/console/command/mod.rs (renamed from crates/shirabe-external-packages/src/symfony/component/console/command/mod.rs)0
-rw-r--r--crates/shirabe-external-packages/src/symfony/console/exception/command_not_found_exception.rs (renamed from crates/shirabe-external-packages/src/symfony/component/console/exception/command_not_found_exception.rs)0
-rw-r--r--crates/shirabe-external-packages/src/symfony/console/exception/exception_interface.rs (renamed from crates/shirabe-external-packages/src/symfony/component/console/exception/exception_interface.rs)0
-rw-r--r--crates/shirabe-external-packages/src/symfony/console/exception/mod.rs4
-rw-r--r--crates/shirabe-external-packages/src/symfony/console/formatter/output_formatter.rs11
-rw-r--r--crates/shirabe-external-packages/src/symfony/console/helper/formatter_helper.rs (renamed from crates/shirabe-external-packages/src/symfony/component/console/helper/formatter_helper.rs)0
-rw-r--r--crates/shirabe-external-packages/src/symfony/console/helper/helper.rs (renamed from crates/shirabe-external-packages/src/symfony/component/console/helper/helper.rs)0
-rw-r--r--crates/shirabe-external-packages/src/symfony/console/helper/mod.rs8
-rw-r--r--crates/shirabe-external-packages/src/symfony/console/helper/progress_bar.rs (renamed from crates/shirabe-external-packages/src/symfony/component/console/helper/progress_bar.rs)2
-rw-r--r--crates/shirabe-external-packages/src/symfony/console/helper/question_helper.rs9
-rw-r--r--crates/shirabe-external-packages/src/symfony/console/helper/table.rs26
-rw-r--r--crates/shirabe-external-packages/src/symfony/console/helper/table_separator.rs (renamed from crates/shirabe-external-packages/src/symfony/component/console/helper/table_separator.rs)0
-rw-r--r--crates/shirabe-external-packages/src/symfony/console/input/array_input.rs9
-rw-r--r--crates/shirabe-external-packages/src/symfony/console/input/input_definition.rs (renamed from crates/shirabe-external-packages/src/symfony/component/console/input/input_definition.rs)0
-rw-r--r--crates/shirabe-external-packages/src/symfony/console/input/input_interface.rs11
-rw-r--r--crates/shirabe-external-packages/src/symfony/console/input/mod.rs2
-rw-r--r--crates/shirabe-external-packages/src/symfony/console/input/string_input.rs4
-rw-r--r--crates/shirabe-external-packages/src/symfony/console/mod.rs8
-rw-r--r--crates/shirabe-external-packages/src/symfony/console/output/console_output.rs (renamed from crates/shirabe-external-packages/src/symfony/component/console/output/console_output.rs)6
-rw-r--r--crates/shirabe-external-packages/src/symfony/console/output/console_output_interface.rs (renamed from crates/shirabe-external-packages/src/symfony/component/console/output/console_output_interface.rs)2
-rw-r--r--crates/shirabe-external-packages/src/symfony/console/output/mod.rs4
-rw-r--r--crates/shirabe-external-packages/src/symfony/console/output/output_interface.rs23
-rw-r--r--crates/shirabe-external-packages/src/symfony/console/output/stream_output.rs15
-rw-r--r--crates/shirabe-external-packages/src/symfony/console/question/choice_question.rs (renamed from crates/shirabe-external-packages/src/symfony/component/console/question/choice_question.rs)2
-rw-r--r--crates/shirabe-external-packages/src/symfony/console/question/mod.rs2
-rw-r--r--crates/shirabe-external-packages/src/symfony/console/question/question.rs16
-rw-r--r--crates/shirabe-external-packages/src/symfony/console/single_command_application.rs (renamed from crates/shirabe-external-packages/src/symfony/component/console/single_command_application.rs)0
-rw-r--r--crates/shirabe-external-packages/src/symfony/console/style/symfony_style.rs4
-rw-r--r--crates/shirabe-external-packages/src/symfony/console/terminal.rs (renamed from crates/shirabe-external-packages/src/symfony/component/console/terminal.rs)0
-rw-r--r--crates/shirabe-external-packages/src/symfony/filesystem/exception/io_exception.rs (renamed from crates/shirabe-external-packages/src/symfony/component/filesystem/exception/io_exception.rs)0
-rw-r--r--crates/shirabe-external-packages/src/symfony/filesystem/exception/mod.rs (renamed from crates/shirabe-external-packages/src/symfony/component/filesystem/exception/mod.rs)0
-rw-r--r--crates/shirabe-external-packages/src/symfony/filesystem/filesystem.rs (renamed from crates/shirabe-external-packages/src/symfony/component/filesystem/filesystem.rs)0
-rw-r--r--crates/shirabe-external-packages/src/symfony/filesystem/mod.rs (renamed from crates/shirabe-external-packages/src/symfony/component/filesystem/mod.rs)0
-rw-r--r--crates/shirabe-external-packages/src/symfony/finder/finder.rs (renamed from crates/shirabe-external-packages/src/symfony/component/finder/finder.rs)2
-rw-r--r--crates/shirabe-external-packages/src/symfony/finder/glob.rs (renamed from crates/shirabe-external-packages/src/symfony/component/finder/glob.rs)0
-rw-r--r--crates/shirabe-external-packages/src/symfony/finder/mod.rs (renamed from crates/shirabe-external-packages/src/symfony/component/finder/mod.rs)0
-rw-r--r--crates/shirabe-external-packages/src/symfony/finder/spl_file_info.rs (renamed from crates/shirabe-external-packages/src/symfony/component/finder/spl_file_info.rs)0
-rw-r--r--crates/shirabe-external-packages/src/symfony/mod.rs6
-rw-r--r--crates/shirabe-external-packages/src/symfony/process/exception/mod.rs (renamed from crates/shirabe-external-packages/src/symfony/component/process/exception/mod.rs)0
-rw-r--r--crates/shirabe-external-packages/src/symfony/process/exception/process_signaled_exception.rs (renamed from crates/shirabe-external-packages/src/symfony/component/process/exception/process_signaled_exception.rs)0
-rw-r--r--crates/shirabe-external-packages/src/symfony/process/exception/process_timed_out_exception.rs (renamed from crates/shirabe-external-packages/src/symfony/component/process/exception/process_timed_out_exception.rs)0
-rw-r--r--crates/shirabe-external-packages/src/symfony/process/exception/runtime_exception.rs (renamed from crates/shirabe-external-packages/src/symfony/component/process/exception/runtime_exception.rs)0
-rw-r--r--crates/shirabe-external-packages/src/symfony/process/mod.rs6
-rw-r--r--crates/shirabe-external-packages/src/symfony/process/php_executable_finder.rs (renamed from crates/shirabe-external-packages/src/symfony/component/process/php_executable_finder.rs)0
-rw-r--r--crates/shirabe-external-packages/src/symfony/process/process.rs (renamed from crates/shirabe-external-packages/src/symfony/component/process/process.rs)0
-rw-r--r--crates/shirabe/src/autoload/autoload_generator.rs2
-rw-r--r--crates/shirabe/src/cache.rs2
-rw-r--r--crates/shirabe/src/command/about_command.rs4
-rw-r--r--crates/shirabe/src/command/archive_command.rs4
-rw-r--r--crates/shirabe/src/command/audit_command.rs4
-rw-r--r--crates/shirabe/src/command/base_command.rs12
-rw-r--r--crates/shirabe/src/command/base_config_command.rs4
-rw-r--r--crates/shirabe/src/command/base_dependency_command.rs6
-rw-r--r--crates/shirabe/src/command/bump_command.rs4
-rw-r--r--crates/shirabe/src/command/check_platform_reqs_command.rs4
-rw-r--r--crates/shirabe/src/command/clear_cache_command.rs4
-rw-r--r--crates/shirabe/src/command/config_command.rs4
-rw-r--r--crates/shirabe/src/command/create_project_command.rs6
-rw-r--r--crates/shirabe/src/command/depends_command.rs4
-rw-r--r--crates/shirabe/src/command/diagnose_command.rs6
-rw-r--r--crates/shirabe/src/command/dump_autoload_command.rs4
-rw-r--r--crates/shirabe/src/command/exec_command.rs4
-rw-r--r--crates/shirabe/src/command/fund_command.rs4
-rw-r--r--crates/shirabe/src/command/global_command.rs6
-rw-r--r--crates/shirabe/src/command/home_command.rs4
-rw-r--r--crates/shirabe/src/command/init_command.rs8
-rw-r--r--crates/shirabe/src/command/install_command.rs4
-rw-r--r--crates/shirabe/src/command/licenses_command.rs4
-rw-r--r--crates/shirabe/src/command/outdated_command.rs6
-rw-r--r--crates/shirabe/src/command/package_discovery_trait.rs4
-rw-r--r--crates/shirabe/src/command/prohibits_command.rs4
-rw-r--r--crates/shirabe/src/command/reinstall_command.rs4
-rw-r--r--crates/shirabe/src/command/remove_command.rs6
-rw-r--r--crates/shirabe/src/command/repository_command.rs4
-rw-r--r--crates/shirabe/src/command/require_command.rs4
-rw-r--r--crates/shirabe/src/command/run_script_command.rs4
-rw-r--r--crates/shirabe/src/command/script_alias_command.rs4
-rw-r--r--crates/shirabe/src/command/search_command.rs4
-rw-r--r--crates/shirabe/src/command/self_update_command.rs6
-rw-r--r--crates/shirabe/src/command/show_command.rs4
-rw-r--r--crates/shirabe/src/command/status_command.rs4
-rw-r--r--crates/shirabe/src/command/suggests_command.rs4
-rw-r--r--crates/shirabe/src/command/update_command.rs6
-rw-r--r--crates/shirabe/src/command/validate_command.rs4
-rw-r--r--crates/shirabe/src/compiler.rs4
-rw-r--r--crates/shirabe/src/console/application.rs26
-rw-r--r--crates/shirabe/src/downloader/archive_downloader.rs2
-rw-r--r--crates/shirabe/src/downloader/path_downloader.rs4
-rw-r--r--crates/shirabe/src/downloader/zip_downloader.rs4
-rw-r--r--crates/shirabe/src/event_dispatcher/event_dispatcher.rs10
-rw-r--r--crates/shirabe/src/factory.rs6
-rw-r--r--crates/shirabe/src/installer/suggested_packages_reporter.rs2
-rw-r--r--crates/shirabe/src/io/buffer_io.rs29
-rw-r--r--crates/shirabe/src/io/console_io.rs16
-rw-r--r--crates/shirabe/src/package/archiver/archivable_files_finder.rs2
-rw-r--r--crates/shirabe/src/package/archiver/base_exclude_filter.rs2
-rw-r--r--crates/shirabe/src/package/version/version_guesser.rs2
-rw-r--r--crates/shirabe/src/plugin/command_event.rs4
-rw-r--r--crates/shirabe/src/plugin/pre_command_run_event.rs2
-rw-r--r--crates/shirabe/src/util/filesystem.rs4
-rw-r--r--crates/shirabe/src/util/loop.rs2
-rw-r--r--crates/shirabe/src/util/perforce.rs4
-rw-r--r--crates/shirabe/src/util/process_executor.rs8
131 files changed, 298 insertions, 816 deletions
diff --git a/crates/shirabe-class-map-generator/src/class_map_generator.rs b/crates/shirabe-class-map-generator/src/class_map_generator.rs
index 817e578..f33c93c 100644
--- a/crates/shirabe-class-map-generator/src/class_map_generator.rs
+++ b/crates/shirabe-class-map-generator/src/class_map_generator.rs
@@ -5,8 +5,8 @@ use crate::file_list::FileList;
use crate::php_file_parser::PhpFileParser;
use indexmap::indexmap;
use shirabe_external_packages::composer::pcre::{CaptureKey, Preg};
-use shirabe_external_packages::symfony::component::finder::Finder;
-use shirabe_external_packages::symfony::component::finder::SplFileInfo;
+use shirabe_external_packages::symfony::finder::Finder;
+use shirabe_external_packages::symfony::finder::SplFileInfo;
use shirabe_php_shim::{
DIRECTORY_SEPARATOR, InvalidArgumentException, LogicException, PATHINFO_EXTENSION, PHP_INT_MAX,
PhpMixed, RuntimeException, explode, getcwd, implode, in_array, is_dir, is_file, is_string,
diff --git a/crates/shirabe-external-packages/src/symfony/component/console/completion/completion_input.rs b/crates/shirabe-external-packages/src/symfony/component/console/completion/completion_input.rs
deleted file mode 100644
index 1203ec8..0000000
--- a/crates/shirabe-external-packages/src/symfony/component/console/completion/completion_input.rs
+++ /dev/null
@@ -1,24 +0,0 @@
-#[derive(Debug)]
-pub struct CompletionInput;
-
-impl CompletionInput {
- pub fn get_completion_type(&self) -> String {
- todo!()
- }
-
- pub fn get_completion_name(&self) -> Option<String> {
- todo!()
- }
-
- pub fn get_completion_value(&self) -> String {
- todo!()
- }
-
- pub fn must_suggest_option_values_for(&self, _name: &str) -> bool {
- todo!()
- }
-
- pub fn must_suggest_argument_values_for(&self, _name: &str) -> bool {
- todo!()
- }
-}
diff --git a/crates/shirabe-external-packages/src/symfony/component/console/completion/completion_suggestions.rs b/crates/shirabe-external-packages/src/symfony/component/console/completion/completion_suggestions.rs
deleted file mode 100644
index 7dae1fc..0000000
--- a/crates/shirabe-external-packages/src/symfony/component/console/completion/completion_suggestions.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-use shirabe_php_shim::PhpMixed;
-
-#[derive(Debug)]
-pub struct CompletionSuggestions;
-
-impl CompletionSuggestions {
- pub fn suggest_values(&mut self, _values: Vec<PhpMixed>) {
- todo!()
- }
-
- pub fn suggest_value(&mut self, _value: PhpMixed) {
- todo!()
- }
-}
diff --git a/crates/shirabe-external-packages/src/symfony/component/console/completion/mod.rs b/crates/shirabe-external-packages/src/symfony/component/console/completion/mod.rs
deleted file mode 100644
index 0d15845..0000000
--- a/crates/shirabe-external-packages/src/symfony/component/console/completion/mod.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-pub mod completion_input;
-pub mod completion_suggestions;
-
-pub use completion_input::*;
-pub use completion_suggestions::*;
diff --git a/crates/shirabe-external-packages/src/symfony/component/console/exception/invalid_argument_exception.rs b/crates/shirabe-external-packages/src/symfony/component/console/exception/invalid_argument_exception.rs
deleted file mode 100644
index 658ed8c..0000000
--- a/crates/shirabe-external-packages/src/symfony/component/console/exception/invalid_argument_exception.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-#[derive(Debug)]
-pub struct InvalidArgumentException {
- pub message: String,
- pub code: i64,
-}
-
-impl std::fmt::Display for InvalidArgumentException {
- fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
- write!(f, "{}", self.message)
- }
-}
-
-impl std::error::Error for InvalidArgumentException {}
diff --git a/crates/shirabe-external-packages/src/symfony/component/console/exception/mod.rs b/crates/shirabe-external-packages/src/symfony/component/console/exception/mod.rs
deleted file mode 100644
index 25750a1..0000000
--- a/crates/shirabe-external-packages/src/symfony/component/console/exception/mod.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-pub mod command_not_found_exception;
-pub mod exception_interface;
-pub mod invalid_argument_exception;
-
-pub use command_not_found_exception::*;
-pub use exception_interface::*;
-pub use invalid_argument_exception::*;
diff --git a/crates/shirabe-external-packages/src/symfony/component/console/formatter/mod.rs b/crates/shirabe-external-packages/src/symfony/component/console/formatter/mod.rs
deleted file mode 100644
index 540d3b3..0000000
--- a/crates/shirabe-external-packages/src/symfony/component/console/formatter/mod.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-pub mod output_formatter;
-pub mod output_formatter_style;
-
-pub use output_formatter::*;
-pub use output_formatter_style::*;
diff --git a/crates/shirabe-external-packages/src/symfony/component/console/formatter/output_formatter.rs b/crates/shirabe-external-packages/src/symfony/component/console/formatter/output_formatter.rs
deleted file mode 100644
index 9c78e14..0000000
--- a/crates/shirabe-external-packages/src/symfony/component/console/formatter/output_formatter.rs
+++ /dev/null
@@ -1,36 +0,0 @@
-#[derive(Debug)]
-pub struct OutputFormatter;
-
-impl OutputFormatter {
- pub fn new(_decorated: bool) -> Self {
- todo!()
- }
-
- pub fn format(&self, _message: &str) -> String {
- todo!()
- }
-
- pub fn is_decorated(&self) -> bool {
- todo!()
- }
-
- pub fn set_decorated(&mut self, _decorated: bool) {
- todo!()
- }
-
- pub fn escape(_text: &str) -> String {
- todo!()
- }
-
- pub fn escape_trailing_backslash(_text: &str) -> String {
- todo!()
- }
-
- pub fn set_style(
- &mut self,
- _name: &str,
- _style: crate::symfony::component::console::formatter::OutputFormatterStyle,
- ) {
- todo!()
- }
-}
diff --git a/crates/shirabe-external-packages/src/symfony/component/console/formatter/output_formatter_style.rs b/crates/shirabe-external-packages/src/symfony/component/console/formatter/output_formatter_style.rs
deleted file mode 100644
index 6299157..0000000
--- a/crates/shirabe-external-packages/src/symfony/component/console/formatter/output_formatter_style.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-#[derive(Debug)]
-pub struct OutputFormatterStyle;
-
-impl OutputFormatterStyle {
- pub fn new(
- _foreground: Option<&str>,
- _background: Option<&str>,
- _options: Option<Vec<String>>,
- ) -> Self {
- todo!()
- }
-}
diff --git a/crates/shirabe-external-packages/src/symfony/component/console/helper/helper_set.rs b/crates/shirabe-external-packages/src/symfony/component/console/helper/helper_set.rs
deleted file mode 100644
index 26af492..0000000
--- a/crates/shirabe-external-packages/src/symfony/component/console/helper/helper_set.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-use shirabe_php_shim::PhpMixed;
-
-#[derive(Debug)]
-pub struct HelperSet;
-
-impl HelperSet {
- pub fn new(_helpers: Vec<PhpMixed>) -> Self {
- todo!()
- }
-
- pub fn get(&self, _name: &str) -> PhpMixed {
- todo!()
- }
-
- pub fn set(&mut self, _helper: PhpMixed, _alias: Option<&str>) {
- todo!()
- }
-
- pub fn has(&self, _name: &str) -> bool {
- todo!()
- }
-}
diff --git a/crates/shirabe-external-packages/src/symfony/component/console/helper/mod.rs b/crates/shirabe-external-packages/src/symfony/component/console/helper/mod.rs
deleted file mode 100644
index b31517a..0000000
--- a/crates/shirabe-external-packages/src/symfony/component/console/helper/mod.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-pub mod formatter_helper;
-pub mod helper;
-pub mod helper_set;
-pub mod progress_bar;
-pub mod question_helper;
-pub mod table;
-pub mod table_separator;
-
-pub use formatter_helper::*;
-pub use helper::*;
-pub use helper_set::*;
-pub use progress_bar::*;
-pub use question_helper::*;
-pub use table::*;
-pub use table_separator::*;
diff --git a/crates/shirabe-external-packages/src/symfony/component/console/helper/question_helper.rs b/crates/shirabe-external-packages/src/symfony/component/console/helper/question_helper.rs
deleted file mode 100644
index 5d452c7..0000000
--- a/crates/shirabe-external-packages/src/symfony/component/console/helper/question_helper.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-use crate::symfony::component::console::input::InputInterface;
-use crate::symfony::component::console::output::OutputInterface;
-use crate::symfony::component::console::question::Question;
-use shirabe_php_shim::PhpMixed;
-
-#[derive(Debug)]
-pub struct QuestionHelper;
-
-impl QuestionHelper {
- pub fn ask(
- &self,
- _input: std::rc::Rc<std::cell::RefCell<dyn InputInterface>>,
- _output: std::rc::Rc<std::cell::RefCell<dyn OutputInterface>>,
- _question: &Question,
- ) -> Option<PhpMixed> {
- todo!()
- }
-}
diff --git a/crates/shirabe-external-packages/src/symfony/component/console/helper/table.rs b/crates/shirabe-external-packages/src/symfony/component/console/helper/table.rs
deleted file mode 100644
index f580965..0000000
--- a/crates/shirabe-external-packages/src/symfony/component/console/helper/table.rs
+++ /dev/null
@@ -1,47 +0,0 @@
-use crate::symfony::component::console::output::OutputInterface;
-use shirabe_php_shim::PhpMixed;
-
-#[derive(Debug)]
-pub struct Table;
-
-impl Table {
- pub fn new(_output: std::rc::Rc<std::cell::RefCell<dyn OutputInterface>>) -> Self {
- todo!()
- }
-
- pub fn set_headers(&mut self, _headers: Vec<PhpMixed>) -> &mut Self {
- todo!()
- }
-
- pub fn set_rows(&mut self, _rows: Vec<PhpMixed>) -> &mut Self {
- todo!()
- }
-
- pub fn add_row(&mut self, _row: PhpMixed) -> &mut Self {
- todo!()
- }
-
- pub fn render(&mut self) {
- todo!()
- }
-
- pub fn set_style(&mut self, _style: &str) -> &mut Self {
- todo!()
- }
-
- pub fn set_column_width(&mut self, _column_index: usize, _width: i64) -> &mut Self {
- todo!()
- }
-
- pub fn set_column_widths(&mut self, _widths: Vec<i64>) -> &mut Self {
- todo!()
- }
-
- pub fn set_column_max_width(&mut self, _column_index: usize, _width: i64) -> &mut Self {
- todo!()
- }
-
- pub fn set_horizontal(&mut self, _horizontal: bool) -> &mut Self {
- todo!()
- }
-}
diff --git a/crates/shirabe-external-packages/src/symfony/component/console/input/array_input.rs b/crates/shirabe-external-packages/src/symfony/component/console/input/array_input.rs
deleted file mode 100644
index 86c982d..0000000
--- a/crates/shirabe-external-packages/src/symfony/component/console/input/array_input.rs
+++ /dev/null
@@ -1,69 +0,0 @@
-use crate::symfony::component::console::input::InputDefinition;
-use crate::symfony::component::console::input::InputInterface;
-use indexmap::IndexMap;
-use shirabe_php_shim::PhpMixed;
-
-#[derive(Debug)]
-pub struct ArrayInput;
-
-impl ArrayInput {
- pub fn new(
- _parameters: IndexMap<String, PhpMixed>,
- _definition: Option<InputDefinition>,
- ) -> Self {
- todo!()
- }
-}
-
-impl InputInterface for ArrayInput {
- fn get_first_argument(&self) -> Option<String> {
- todo!()
- }
- fn has_parameter_option(&self, _values: &[&str], _only_params: bool) -> bool {
- todo!()
- }
- fn get_parameter_option(
- &self,
- _values: &[&str],
- _default: PhpMixed,
- _only_params: bool,
- ) -> PhpMixed {
- todo!()
- }
- fn bind(&mut self, _definition: &InputDefinition) -> anyhow::Result<()> {
- todo!()
- }
- fn validate(&self) -> anyhow::Result<()> {
- todo!()
- }
- fn get_arguments(&self) -> IndexMap<String, PhpMixed> {
- todo!()
- }
- fn get_argument(&self, _name: &str) -> PhpMixed {
- todo!()
- }
- fn set_argument(&mut self, _name: &str, _value: PhpMixed) -> anyhow::Result<()> {
- todo!()
- }
- fn has_argument(&self, _name: &str) -> bool {
- todo!()
- }
- fn get_options(&self) -> IndexMap<String, PhpMixed> {
- todo!()
- }
- fn get_option(&self, _name: &str) -> PhpMixed {
- todo!()
- }
- fn set_option(&mut self, _name: &str, _value: PhpMixed) -> anyhow::Result<()> {
- todo!()
- }
- fn has_option(&self, _name: &str) -> bool {
- todo!()
- }
- fn is_interactive(&self) -> bool {
- todo!()
- }
- fn set_interactive(&mut self, _interactive: bool) {
- todo!()
- }
-}
diff --git a/crates/shirabe-external-packages/src/symfony/component/console/input/input_interface.rs b/crates/shirabe-external-packages/src/symfony/component/console/input/input_interface.rs
deleted file mode 100644
index a556198..0000000
--- a/crates/shirabe-external-packages/src/symfony/component/console/input/input_interface.rs
+++ /dev/null
@@ -1,32 +0,0 @@
-use shirabe_php_shim::PhpMixed;
-
-pub trait InputInterface: std::fmt::Debug {
- fn get_first_argument(&self) -> Option<String>;
- fn has_parameter_option(&self, values: &[&str], only_params: bool) -> bool;
- fn get_parameter_option(
- &self,
- values: &[&str],
- default: PhpMixed,
- only_params: bool,
- ) -> PhpMixed;
- fn bind(
- &mut self,
- definition: &crate::symfony::component::console::input::InputDefinition,
- ) -> anyhow::Result<()>;
- fn validate(&self) -> anyhow::Result<()>;
- fn get_arguments(&self) -> indexmap::IndexMap<String, PhpMixed>;
- fn get_argument(&self, name: &str) -> PhpMixed;
- fn set_argument(&mut self, name: &str, value: PhpMixed) -> anyhow::Result<()>;
- fn has_argument(&self, name: &str) -> bool;
- fn get_options(&self) -> indexmap::IndexMap<String, PhpMixed>;
- fn get_option(&self, name: &str) -> PhpMixed;
- fn set_option(&mut self, name: &str, value: PhpMixed) -> anyhow::Result<()>;
- fn has_option(&self, name: &str) -> bool;
- fn is_interactive(&self) -> bool;
- fn set_interactive(&mut self, interactive: bool);
-
- /// Equivalent to PHP `(string) $input` (Input::__toString).
- fn to_input_string(&self) -> String {
- todo!()
- }
-}
diff --git a/crates/shirabe-external-packages/src/symfony/component/console/input/input_option.rs b/crates/shirabe-external-packages/src/symfony/component/console/input/input_option.rs
deleted file mode 100644
index 673ca07..0000000
--- a/crates/shirabe-external-packages/src/symfony/component/console/input/input_option.rs
+++ /dev/null
@@ -1,46 +0,0 @@
-use shirabe_php_shim::PhpMixed;
-
-#[derive(Debug)]
-pub struct InputOption;
-
-impl InputOption {
- pub const VALUE_NONE: i64 = 1;
- pub const VALUE_REQUIRED: i64 = 2;
- pub const VALUE_OPTIONAL: i64 = 4;
- pub const VALUE_IS_ARRAY: i64 = 8;
- pub const VALUE_NEGATABLE: i64 = 16;
-
- pub fn new(
- _name: &str,
- _shortcut: Option<&str>,
- _mode: Option<i64>,
- _description: &str,
- _default: PhpMixed,
- ) -> Self {
- todo!()
- }
-
- pub fn get_name(&self) -> String {
- todo!()
- }
-
- pub fn accept_value(&self) -> bool {
- todo!()
- }
-
- pub fn is_value_required(&self) -> bool {
- todo!()
- }
-
- pub fn is_value_optional(&self) -> bool {
- todo!()
- }
-
- pub fn is_array(&self) -> bool {
- todo!()
- }
-
- pub fn get_default(&self) -> PhpMixed {
- todo!()
- }
-}
diff --git a/crates/shirabe-external-packages/src/symfony/component/console/input/mod.rs b/crates/shirabe-external-packages/src/symfony/component/console/input/mod.rs
deleted file mode 100644
index 2071388..0000000
--- a/crates/shirabe-external-packages/src/symfony/component/console/input/mod.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-pub mod array_input;
-pub mod input_definition;
-pub mod input_interface;
-pub mod input_option;
-pub mod string_input;
-
-pub use array_input::*;
-pub use input_definition::*;
-pub use input_interface::*;
-pub use input_option::*;
-pub use string_input::*;
diff --git a/crates/shirabe-external-packages/src/symfony/component/console/input/string_input.rs b/crates/shirabe-external-packages/src/symfony/component/console/input/string_input.rs
deleted file mode 100644
index 140082e..0000000
--- a/crates/shirabe-external-packages/src/symfony/component/console/input/string_input.rs
+++ /dev/null
@@ -1,66 +0,0 @@
-use crate::symfony::component::console::input::InputDefinition;
-use crate::symfony::component::console::input::InputInterface;
-use indexmap::IndexMap;
-use shirabe_php_shim::PhpMixed;
-
-#[derive(Debug)]
-pub struct StringInput;
-
-impl StringInput {
- pub fn new(_input: &str) -> Self {
- todo!()
- }
-}
-
-impl InputInterface for StringInput {
- fn get_first_argument(&self) -> Option<String> {
- todo!()
- }
- fn has_parameter_option(&self, _values: &[&str], _only_params: bool) -> bool {
- todo!()
- }
- fn get_parameter_option(
- &self,
- _values: &[&str],
- _default: PhpMixed,
- _only_params: bool,
- ) -> PhpMixed {
- todo!()
- }
- fn bind(&mut self, _definition: &InputDefinition) -> anyhow::Result<()> {
- todo!()
- }
- fn validate(&self) -> anyhow::Result<()> {
- todo!()
- }
- fn get_arguments(&self) -> IndexMap<String, PhpMixed> {
- todo!()
- }
- fn get_argument(&self, _name: &str) -> PhpMixed {
- todo!()
- }
- fn set_argument(&mut self, _name: &str, _value: PhpMixed) -> anyhow::Result<()> {
- todo!()
- }
- fn has_argument(&self, _name: &str) -> bool {
- todo!()
- }
- fn get_options(&self) -> IndexMap<String, PhpMixed> {
- todo!()
- }
- fn get_option(&self, _name: &str) -> PhpMixed {
- todo!()
- }
- fn set_option(&mut self, _name: &str, _value: PhpMixed) -> anyhow::Result<()> {
- todo!()
- }
- fn has_option(&self, _name: &str) -> bool {
- todo!()
- }
- fn is_interactive(&self) -> bool {
- todo!()
- }
- fn set_interactive(&mut self, _interactive: bool) {
- todo!()
- }
-}
diff --git a/crates/shirabe-external-packages/src/symfony/component/console/mod.rs b/crates/shirabe-external-packages/src/symfony/component/console/mod.rs
deleted file mode 100644
index ffb85d3..0000000
--- a/crates/shirabe-external-packages/src/symfony/component/console/mod.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-pub mod application;
-pub mod command;
-pub mod completion;
-pub mod exception;
-pub mod formatter;
-pub mod helper;
-pub mod input;
-pub mod output;
-pub mod question;
-pub mod single_command_application;
-pub mod terminal;
-
-pub use application::*;
-pub use command::*;
-pub use completion::*;
-pub use exception::*;
-pub use formatter::*;
-pub use helper::*;
-pub use input::*;
-pub use output::*;
-pub use question::*;
-pub use single_command_application::*;
-pub use terminal::*;
diff --git a/crates/shirabe-external-packages/src/symfony/component/console/output/mod.rs b/crates/shirabe-external-packages/src/symfony/component/console/output/mod.rs
deleted file mode 100644
index 92a0789..0000000
--- a/crates/shirabe-external-packages/src/symfony/component/console/output/mod.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-pub mod console_output;
-pub mod console_output_interface;
-pub mod output_interface;
-
-pub use console_output::*;
-pub use console_output_interface::*;
-pub use output_interface::*;
diff --git a/crates/shirabe-external-packages/src/symfony/component/console/output/output_interface.rs b/crates/shirabe-external-packages/src/symfony/component/console/output/output_interface.rs
deleted file mode 100644
index 9e58a3e..0000000
--- a/crates/shirabe-external-packages/src/symfony/component/console/output/output_interface.rs
+++ /dev/null
@@ -1,45 +0,0 @@
-use crate::symfony::component::console::formatter::OutputFormatter;
-use crate::symfony::component::console::output::ConsoleOutputInterface;
-
-pub trait OutputInterface: std::fmt::Debug {
- // PHP class semantics: OutputInterface methods take &self with interior mutability,
- // because output objects are shared by reference across the PHP code.
- fn write(&self, messages: &str, newline: bool, r#type: i64);
- fn writeln(&self, messages: &str, r#type: i64);
- fn set_verbosity(&self, level: i64);
- fn get_verbosity(&self) -> i64;
- fn is_quiet(&self) -> bool;
- fn is_verbose(&self) -> bool;
- fn is_very_verbose(&self) -> bool;
- fn is_debug(&self) -> bool;
- fn set_decorated(&self, decorated: bool);
- fn is_decorated(&self) -> bool;
- fn set_formatter(&self, formatter: OutputFormatter);
- fn get_formatter(&self) -> &OutputFormatter;
-
- /// PHP: `$output instanceof ConsoleOutputInterface`. Default false; ConsoleOutput overrides.
- fn is_console_output_interface(&self) -> bool {
- false
- }
-
- /// PHP: `$output instanceof ConsoleOutputInterface`. Returns the output as a
- /// ConsoleOutputInterface trait object when it is one. Default None; ConsoleOutput overrides.
- fn as_console_output_interface(&self) -> Option<&dyn ConsoleOutputInterface> {
- None
- }
-
- /// PHP: only StreamOutput exposes `getStream()`. Default panics for outputs without one.
- fn get_stream(&self) -> shirabe_php_shim::PhpResource {
- todo!("get_stream not available on this OutputInterface implementation")
- }
-}
-
-pub const VERBOSITY_QUIET: i64 = 16;
-pub const VERBOSITY_NORMAL: i64 = 32;
-pub const VERBOSITY_VERBOSE: i64 = 64;
-pub const VERBOSITY_VERY_VERBOSE: i64 = 128;
-pub const VERBOSITY_DEBUG: i64 = 256;
-
-pub const OUTPUT_NORMAL: i64 = 1;
-pub const OUTPUT_RAW: i64 = 2;
-pub const OUTPUT_PLAIN: i64 = 4;
diff --git a/crates/shirabe-external-packages/src/symfony/component/console/question/mod.rs b/crates/shirabe-external-packages/src/symfony/component/console/question/mod.rs
deleted file mode 100644
index 67e7e7b..0000000
--- a/crates/shirabe-external-packages/src/symfony/component/console/question/mod.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-pub mod choice_question;
-pub mod question;
-
-pub use choice_question::*;
-pub use question::*;
diff --git a/crates/shirabe-external-packages/src/symfony/component/console/question/question.rs b/crates/shirabe-external-packages/src/symfony/component/console/question/question.rs
deleted file mode 100644
index c83bbcd..0000000
--- a/crates/shirabe-external-packages/src/symfony/component/console/question/question.rs
+++ /dev/null
@@ -1,49 +0,0 @@
-use shirabe_php_shim::PhpMixed;
-
-#[derive(Debug)]
-pub struct Question;
-
-impl Question {
- pub fn new(_question: &str, _default: Option<PhpMixed>) -> Self {
- todo!()
- }
-
- pub fn set_validator(
- &mut self,
- _validator: Option<Box<dyn Fn(Option<PhpMixed>) -> anyhow::Result<PhpMixed>>>,
- ) {
- todo!()
- }
-
- pub fn set_max_attempts(&mut self, _attempts: Option<i64>) {
- todo!()
- }
-
- pub fn set_hidden(&mut self, _hidden: bool) {
- todo!()
- }
-
- pub fn set_hidden_fallback(&mut self, _fallback: bool) {
- todo!()
- }
-
- pub fn get_question(&self) -> String {
- todo!()
- }
-
- pub fn get_default(&self) -> Option<PhpMixed> {
- todo!()
- }
-
- pub fn is_hidden(&self) -> bool {
- todo!()
- }
-
- pub fn get_validator(&self) -> Option<&dyn Fn(Option<PhpMixed>) -> anyhow::Result<PhpMixed>> {
- todo!()
- }
-
- pub fn get_max_attempts(&self) -> Option<i64> {
- todo!()
- }
-}
diff --git a/crates/shirabe-external-packages/src/symfony/component/mod.rs b/crates/shirabe-external-packages/src/symfony/component/mod.rs
deleted file mode 100644
index f176d3a..0000000
--- a/crates/shirabe-external-packages/src/symfony/component/mod.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-pub mod console;
-pub mod filesystem;
-pub mod finder;
-pub mod process;
-
-pub use console::*;
-pub use filesystem::*;
-pub use finder::*;
-pub use process::*;
diff --git a/crates/shirabe-external-packages/src/symfony/component/process/executable_finder.rs b/crates/shirabe-external-packages/src/symfony/component/process/executable_finder.rs
deleted file mode 100644
index ae8e5dc..0000000
--- a/crates/shirabe-external-packages/src/symfony/component/process/executable_finder.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-#[derive(Debug)]
-pub struct ExecutableFinder;
-
-impl Default for ExecutableFinder {
- fn default() -> Self {
- Self::new()
- }
-}
-
-impl ExecutableFinder {
- pub fn new() -> Self {
- todo!()
- }
-
- pub fn add_suffix(&mut self, _suffix: &str) {
- todo!()
- }
-
- pub fn find(&self, _name: &str, _default: Option<&str>, _dirs: &[String]) -> Option<String> {
- todo!()
- }
-}
diff --git a/crates/shirabe-external-packages/src/symfony/component/process/mod.rs b/crates/shirabe-external-packages/src/symfony/component/process/mod.rs
deleted file mode 100644
index 6dd64e1..0000000
--- a/crates/shirabe-external-packages/src/symfony/component/process/mod.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-pub mod exception;
-pub mod executable_finder;
-pub mod php_executable_finder;
-pub mod process;
-
-pub use exception::*;
-pub use executable_finder::*;
-pub use php_executable_finder::*;
-pub use process::*;
diff --git a/crates/shirabe-external-packages/src/symfony/component/console/application.rs b/crates/shirabe-external-packages/src/symfony/console/application.rs
index becf1a5..f937473 100644
--- a/crates/shirabe-external-packages/src/symfony/component/console/application.rs
+++ b/crates/shirabe-external-packages/src/symfony/console/application.rs
@@ -1,5 +1,5 @@
-use crate::symfony::component::console::input::InputInterface;
-use crate::symfony::component::console::output::OutputInterface;
+use crate::symfony::console::input::InputInterface;
+use crate::symfony::console::output::OutputInterface;
use shirabe_php_shim::PhpMixed;
#[derive(Debug)]
diff --git a/crates/shirabe-external-packages/src/symfony/component/console/command/command.rs b/crates/shirabe-external-packages/src/symfony/console/command/command.rs
index 32965cf..32965cf 100644
--- a/crates/shirabe-external-packages/src/symfony/component/console/command/command.rs
+++ b/crates/shirabe-external-packages/src/symfony/console/command/command.rs
diff --git a/crates/shirabe-external-packages/src/symfony/component/console/command/mod.rs b/crates/shirabe-external-packages/src/symfony/console/command/mod.rs
index 375170c..375170c 100644
--- a/crates/shirabe-external-packages/src/symfony/component/console/command/mod.rs
+++ b/crates/shirabe-external-packages/src/symfony/console/command/mod.rs
diff --git a/crates/shirabe-external-packages/src/symfony/component/console/exception/command_not_found_exception.rs b/crates/shirabe-external-packages/src/symfony/console/exception/command_not_found_exception.rs
index f1ed60b..f1ed60b 100644
--- a/crates/shirabe-external-packages/src/symfony/component/console/exception/command_not_found_exception.rs
+++ b/crates/shirabe-external-packages/src/symfony/console/exception/command_not_found_exception.rs
diff --git a/crates/shirabe-external-packages/src/symfony/component/console/exception/exception_interface.rs b/crates/shirabe-external-packages/src/symfony/console/exception/exception_interface.rs
index 3c42009..3c42009 100644
--- a/crates/shirabe-external-packages/src/symfony/component/console/exception/exception_interface.rs
+++ b/crates/shirabe-external-packages/src/symfony/console/exception/exception_interface.rs
diff --git a/crates/shirabe-external-packages/src/symfony/console/exception/mod.rs b/crates/shirabe-external-packages/src/symfony/console/exception/mod.rs
index e76b8d9..25750a1 100644
--- a/crates/shirabe-external-packages/src/symfony/console/exception/mod.rs
+++ b/crates/shirabe-external-packages/src/symfony/console/exception/mod.rs
@@ -1,3 +1,7 @@
+pub mod command_not_found_exception;
+pub mod exception_interface;
pub mod invalid_argument_exception;
+pub use command_not_found_exception::*;
+pub use exception_interface::*;
pub use invalid_argument_exception::*;
diff --git a/crates/shirabe-external-packages/src/symfony/console/formatter/output_formatter.rs b/crates/shirabe-external-packages/src/symfony/console/formatter/output_formatter.rs
index 77ebde5..4b499b8 100644
--- a/crates/shirabe-external-packages/src/symfony/console/formatter/output_formatter.rs
+++ b/crates/shirabe-external-packages/src/symfony/console/formatter/output_formatter.rs
@@ -1,12 +1,13 @@
-use indexmap::IndexMap;
-
#[derive(Debug)]
pub struct OutputFormatter;
impl OutputFormatter {
pub fn new(
_decorated: bool,
- _styles: IndexMap<String, crate::symfony::console::formatter::OutputFormatterStyle>,
+ _styles: indexmap::IndexMap<
+ String,
+ crate::symfony::console::formatter::OutputFormatterStyle,
+ >,
) -> Self {
todo!()
}
@@ -27,6 +28,10 @@ impl OutputFormatter {
todo!()
}
+ pub fn escape_trailing_backslash(_text: &str) -> String {
+ todo!()
+ }
+
pub fn set_style(
&mut self,
_name: &str,
diff --git a/crates/shirabe-external-packages/src/symfony/component/console/helper/formatter_helper.rs b/crates/shirabe-external-packages/src/symfony/console/helper/formatter_helper.rs
index 656828e..656828e 100644
--- a/crates/shirabe-external-packages/src/symfony/component/console/helper/formatter_helper.rs
+++ b/crates/shirabe-external-packages/src/symfony/console/helper/formatter_helper.rs
diff --git a/crates/shirabe-external-packages/src/symfony/component/console/helper/helper.rs b/crates/shirabe-external-packages/src/symfony/console/helper/helper.rs
index 881aabd..881aabd 100644
--- a/crates/shirabe-external-packages/src/symfony/component/console/helper/helper.rs
+++ b/crates/shirabe-external-packages/src/symfony/console/helper/helper.rs
diff --git a/crates/shirabe-external-packages/src/symfony/console/helper/mod.rs b/crates/shirabe-external-packages/src/symfony/console/helper/mod.rs
index 5908bd6..b31517a 100644
--- a/crates/shirabe-external-packages/src/symfony/console/helper/mod.rs
+++ b/crates/shirabe-external-packages/src/symfony/console/helper/mod.rs
@@ -1,7 +1,15 @@
+pub mod formatter_helper;
+pub mod helper;
pub mod helper_set;
+pub mod progress_bar;
pub mod question_helper;
pub mod table;
+pub mod table_separator;
+pub use formatter_helper::*;
+pub use helper::*;
pub use helper_set::*;
+pub use progress_bar::*;
pub use question_helper::*;
pub use table::*;
+pub use table_separator::*;
diff --git a/crates/shirabe-external-packages/src/symfony/component/console/helper/progress_bar.rs b/crates/shirabe-external-packages/src/symfony/console/helper/progress_bar.rs
index 77bc4fd..e2a728f 100644
--- a/crates/shirabe-external-packages/src/symfony/component/console/helper/progress_bar.rs
+++ b/crates/shirabe-external-packages/src/symfony/console/helper/progress_bar.rs
@@ -1,4 +1,4 @@
-use crate::symfony::component::console::output::OutputInterface;
+use crate::symfony::console::output::OutputInterface;
#[derive(Debug)]
pub struct ProgressBar;
diff --git a/crates/shirabe-external-packages/src/symfony/console/helper/question_helper.rs b/crates/shirabe-external-packages/src/symfony/console/helper/question_helper.rs
index c7d55be..70a9572 100644
--- a/crates/shirabe-external-packages/src/symfony/console/helper/question_helper.rs
+++ b/crates/shirabe-external-packages/src/symfony/console/helper/question_helper.rs
@@ -1,3 +1,6 @@
+use crate::symfony::console::input::InputInterface;
+use crate::symfony::console::output::OutputInterface;
+use crate::symfony::console::question::Question;
use shirabe_php_shim::PhpMixed;
#[derive(Debug)]
@@ -6,9 +9,9 @@ pub struct QuestionHelper;
impl QuestionHelper {
pub fn ask(
&self,
- _input: &mut dyn std::any::Any,
- _output: &mut dyn std::any::Any,
- _question: &dyn std::any::Any,
+ _input: std::rc::Rc<std::cell::RefCell<dyn InputInterface>>,
+ _output: std::rc::Rc<std::cell::RefCell<dyn OutputInterface>>,
+ _question: &Question,
) -> Option<PhpMixed> {
todo!()
}
diff --git a/crates/shirabe-external-packages/src/symfony/console/helper/table.rs b/crates/shirabe-external-packages/src/symfony/console/helper/table.rs
index 30c008c..4ff5a5e 100644
--- a/crates/shirabe-external-packages/src/symfony/console/helper/table.rs
+++ b/crates/shirabe-external-packages/src/symfony/console/helper/table.rs
@@ -1,4 +1,4 @@
-use crate::symfony::component::console::output::OutputInterface;
+use crate::symfony::console::output::OutputInterface;
use shirabe_php_shim::PhpMixed;
#[derive(Debug)]
@@ -9,10 +9,6 @@ impl Table {
todo!()
}
- pub fn set_style(&mut self, _style: &str) -> &mut Self {
- todo!()
- }
-
pub fn set_headers(&mut self, _headers: Vec<PhpMixed>) -> &mut Self {
todo!()
}
@@ -28,4 +24,24 @@ impl Table {
pub fn render(&mut self) {
todo!()
}
+
+ pub fn set_style(&mut self, _style: &str) -> &mut Self {
+ todo!()
+ }
+
+ pub fn set_column_width(&mut self, _column_index: usize, _width: i64) -> &mut Self {
+ todo!()
+ }
+
+ pub fn set_column_widths(&mut self, _widths: Vec<i64>) -> &mut Self {
+ todo!()
+ }
+
+ pub fn set_column_max_width(&mut self, _column_index: usize, _width: i64) -> &mut Self {
+ todo!()
+ }
+
+ pub fn set_horizontal(&mut self, _horizontal: bool) -> &mut Self {
+ todo!()
+ }
}
diff --git a/crates/shirabe-external-packages/src/symfony/component/console/helper/table_separator.rs b/crates/shirabe-external-packages/src/symfony/console/helper/table_separator.rs
index 22ac013..22ac013 100644
--- a/crates/shirabe-external-packages/src/symfony/component/console/helper/table_separator.rs
+++ b/crates/shirabe-external-packages/src/symfony/console/helper/table_separator.rs
diff --git a/crates/shirabe-external-packages/src/symfony/console/input/array_input.rs b/crates/shirabe-external-packages/src/symfony/console/input/array_input.rs
index 0304649..0c68cf2 100644
--- a/crates/shirabe-external-packages/src/symfony/console/input/array_input.rs
+++ b/crates/shirabe-external-packages/src/symfony/console/input/array_input.rs
@@ -1,3 +1,4 @@
+use crate::symfony::console::input::InputDefinition;
use crate::symfony::console::input::InputInterface;
use indexmap::IndexMap;
use shirabe_php_shim::PhpMixed;
@@ -6,7 +7,10 @@ use shirabe_php_shim::PhpMixed;
pub struct ArrayInput;
impl ArrayInput {
- pub fn new(_parameters: IndexMap<String, PhpMixed>) -> Self {
+ pub fn new(
+ _parameters: IndexMap<String, PhpMixed>,
+ _definition: Option<InputDefinition>,
+ ) -> Self {
todo!()
}
}
@@ -26,6 +30,9 @@ impl InputInterface for ArrayInput {
) -> PhpMixed {
todo!()
}
+ fn bind(&mut self, _definition: &InputDefinition) -> anyhow::Result<()> {
+ todo!()
+ }
fn validate(&self) -> anyhow::Result<()> {
todo!()
}
diff --git a/crates/shirabe-external-packages/src/symfony/component/console/input/input_definition.rs b/crates/shirabe-external-packages/src/symfony/console/input/input_definition.rs
index 74839fc..74839fc 100644
--- a/crates/shirabe-external-packages/src/symfony/component/console/input/input_definition.rs
+++ b/crates/shirabe-external-packages/src/symfony/console/input/input_definition.rs
diff --git a/crates/shirabe-external-packages/src/symfony/console/input/input_interface.rs b/crates/shirabe-external-packages/src/symfony/console/input/input_interface.rs
index 5ec5896..14458e4 100644
--- a/crates/shirabe-external-packages/src/symfony/console/input/input_interface.rs
+++ b/crates/shirabe-external-packages/src/symfony/console/input/input_interface.rs
@@ -1,7 +1,6 @@
-use indexmap::IndexMap;
use shirabe_php_shim::PhpMixed;
-pub trait InputInterface {
+pub trait InputInterface: std::fmt::Debug {
fn get_first_argument(&self) -> Option<String>;
fn has_parameter_option(&self, values: &[&str], only_params: bool) -> bool;
fn get_parameter_option(
@@ -10,12 +9,16 @@ pub trait InputInterface {
default: PhpMixed,
only_params: bool,
) -> PhpMixed;
+ fn bind(
+ &mut self,
+ definition: &crate::symfony::console::input::InputDefinition,
+ ) -> anyhow::Result<()>;
fn validate(&self) -> anyhow::Result<()>;
- fn get_arguments(&self) -> IndexMap<String, PhpMixed>;
+ fn get_arguments(&self) -> indexmap::IndexMap<String, PhpMixed>;
fn get_argument(&self, name: &str) -> PhpMixed;
fn set_argument(&mut self, name: &str, value: PhpMixed) -> anyhow::Result<()>;
fn has_argument(&self, name: &str) -> bool;
- fn get_options(&self) -> IndexMap<String, PhpMixed>;
+ fn get_options(&self) -> indexmap::IndexMap<String, PhpMixed>;
fn get_option(&self, name: &str) -> PhpMixed;
fn set_option(&mut self, name: &str, value: PhpMixed) -> anyhow::Result<()>;
fn has_option(&self, name: &str) -> bool;
diff --git a/crates/shirabe-external-packages/src/symfony/console/input/mod.rs b/crates/shirabe-external-packages/src/symfony/console/input/mod.rs
index 77a6f66..8c6a28f 100644
--- a/crates/shirabe-external-packages/src/symfony/console/input/mod.rs
+++ b/crates/shirabe-external-packages/src/symfony/console/input/mod.rs
@@ -1,5 +1,6 @@
pub mod array_input;
pub mod input_argument;
+pub mod input_definition;
pub mod input_interface;
pub mod input_option;
pub mod streamable_input_interface;
@@ -7,6 +8,7 @@ pub mod string_input;
pub use array_input::*;
pub use input_argument::*;
+pub use input_definition::*;
pub use input_interface::*;
pub use input_option::*;
pub use streamable_input_interface::*;
diff --git a/crates/shirabe-external-packages/src/symfony/console/input/string_input.rs b/crates/shirabe-external-packages/src/symfony/console/input/string_input.rs
index 3d19823..34b2bfc 100644
--- a/crates/shirabe-external-packages/src/symfony/console/input/string_input.rs
+++ b/crates/shirabe-external-packages/src/symfony/console/input/string_input.rs
@@ -1,3 +1,4 @@
+use crate::symfony::console::input::InputDefinition;
use crate::symfony::console::input::InputInterface;
use indexmap::IndexMap;
use shirabe_php_shim::PhpMixed;
@@ -26,6 +27,9 @@ impl InputInterface for StringInput {
) -> PhpMixed {
todo!()
}
+ fn bind(&mut self, _definition: &InputDefinition) -> anyhow::Result<()> {
+ todo!()
+ }
fn validate(&self) -> anyhow::Result<()> {
todo!()
}
diff --git a/crates/shirabe-external-packages/src/symfony/console/mod.rs b/crates/shirabe-external-packages/src/symfony/console/mod.rs
index 6812ab6..b5b557d 100644
--- a/crates/shirabe-external-packages/src/symfony/console/mod.rs
+++ b/crates/shirabe-external-packages/src/symfony/console/mod.rs
@@ -1,3 +1,5 @@
+pub mod application;
+pub mod command;
pub mod completion;
pub mod exception;
pub mod formatter;
@@ -5,8 +7,12 @@ pub mod helper;
pub mod input;
pub mod output;
pub mod question;
+pub mod single_command_application;
pub mod style;
+pub mod terminal;
+pub use application::*;
+pub use command::*;
pub use completion::*;
pub use exception::*;
pub use formatter::*;
@@ -14,4 +20,6 @@ pub use helper::*;
pub use input::*;
pub use output::*;
pub use question::*;
+pub use single_command_application::*;
pub use style::*;
+pub use terminal::*;
diff --git a/crates/shirabe-external-packages/src/symfony/component/console/output/console_output.rs b/crates/shirabe-external-packages/src/symfony/console/output/console_output.rs
index 00b9324..5aa6ff0 100644
--- a/crates/shirabe-external-packages/src/symfony/component/console/output/console_output.rs
+++ b/crates/shirabe-external-packages/src/symfony/console/output/console_output.rs
@@ -1,6 +1,6 @@
-use crate::symfony::component::console::formatter::OutputFormatter;
-use crate::symfony::component::console::output::ConsoleOutputInterface;
-use crate::symfony::component::console::output::OutputInterface;
+use crate::symfony::console::formatter::OutputFormatter;
+use crate::symfony::console::output::ConsoleOutputInterface;
+use crate::symfony::console::output::OutputInterface;
#[derive(Debug)]
pub struct ConsoleOutput;
diff --git a/crates/shirabe-external-packages/src/symfony/component/console/output/console_output_interface.rs b/crates/shirabe-external-packages/src/symfony/console/output/console_output_interface.rs
index 83ec1de..0b5b432 100644
--- a/crates/shirabe-external-packages/src/symfony/component/console/output/console_output_interface.rs
+++ b/crates/shirabe-external-packages/src/symfony/console/output/console_output_interface.rs
@@ -1,4 +1,4 @@
-use crate::symfony::component::console::output::OutputInterface;
+use crate::symfony::console::output::OutputInterface;
pub trait ConsoleOutputInterface: OutputInterface {
fn get_error_output(&self) -> std::rc::Rc<std::cell::RefCell<dyn OutputInterface>>;
diff --git a/crates/shirabe-external-packages/src/symfony/console/output/mod.rs b/crates/shirabe-external-packages/src/symfony/console/output/mod.rs
index 8f0c7f1..ac2b687 100644
--- a/crates/shirabe-external-packages/src/symfony/console/output/mod.rs
+++ b/crates/shirabe-external-packages/src/symfony/console/output/mod.rs
@@ -1,5 +1,9 @@
+pub mod console_output;
+pub mod console_output_interface;
pub mod output_interface;
pub mod stream_output;
+pub use console_output::*;
+pub use console_output_interface::*;
pub use output_interface::*;
pub use stream_output::*;
diff --git a/crates/shirabe-external-packages/src/symfony/console/output/output_interface.rs b/crates/shirabe-external-packages/src/symfony/console/output/output_interface.rs
index 4d5b7c7..18eadfb 100644
--- a/crates/shirabe-external-packages/src/symfony/console/output/output_interface.rs
+++ b/crates/shirabe-external-packages/src/symfony/console/output/output_interface.rs
@@ -1,24 +1,33 @@
use crate::symfony::console::formatter::OutputFormatter;
+use crate::symfony::console::output::ConsoleOutputInterface;
-pub trait OutputInterface {
- fn write(&mut self, messages: &str, newline: bool, r#type: i64);
- fn writeln(&mut self, messages: &str, r#type: i64);
- fn set_verbosity(&mut self, level: i64);
+pub trait OutputInterface: std::fmt::Debug {
+ // PHP class semantics: OutputInterface methods take &self with interior mutability,
+ // because output objects are shared by reference across the PHP code.
+ fn write(&self, messages: &str, newline: bool, r#type: i64);
+ fn writeln(&self, messages: &str, r#type: i64);
+ fn set_verbosity(&self, level: i64);
fn get_verbosity(&self) -> i64;
fn is_quiet(&self) -> bool;
fn is_verbose(&self) -> bool;
fn is_very_verbose(&self) -> bool;
fn is_debug(&self) -> bool;
- fn set_decorated(&mut self, decorated: bool);
+ fn set_decorated(&self, decorated: bool);
fn is_decorated(&self) -> bool;
- fn set_formatter(&mut self, formatter: OutputFormatter);
- fn get_formatter(&mut self) -> &mut OutputFormatter;
+ fn set_formatter(&self, formatter: OutputFormatter);
+ fn get_formatter(&self) -> &OutputFormatter;
/// PHP: `$output instanceof ConsoleOutputInterface`. Default false; ConsoleOutput overrides.
fn is_console_output_interface(&self) -> bool {
false
}
+ /// PHP: `$output instanceof ConsoleOutputInterface`. Returns the output as a
+ /// ConsoleOutputInterface trait object when it is one. Default None; ConsoleOutput overrides.
+ fn as_console_output_interface(&self) -> Option<&dyn ConsoleOutputInterface> {
+ None
+ }
+
/// PHP: only StreamOutput exposes `getStream()`. Default panics for outputs without one.
fn get_stream(&self) -> shirabe_php_shim::PhpResource {
todo!("get_stream not available on this OutputInterface implementation")
diff --git a/crates/shirabe-external-packages/src/symfony/console/output/stream_output.rs b/crates/shirabe-external-packages/src/symfony/console/output/stream_output.rs
index 654e7f6..6aa79b8 100644
--- a/crates/shirabe-external-packages/src/symfony/console/output/stream_output.rs
+++ b/crates/shirabe-external-packages/src/symfony/console/output/stream_output.rs
@@ -12,13 +12,13 @@ impl StreamOutput {
}
impl OutputInterface for StreamOutput {
- fn write(&mut self, _messages: &str, _newline: bool, _type: i64) {
+ fn write(&self, _messages: &str, _newline: bool, _type: i64) {
todo!()
}
- fn writeln(&mut self, _messages: &str, _type: i64) {
+ fn writeln(&self, _messages: &str, _type: i64) {
todo!()
}
- fn set_verbosity(&mut self, _level: i64) {
+ fn set_verbosity(&self, _level: i64) {
todo!()
}
fn get_verbosity(&self) -> i64 {
@@ -36,16 +36,19 @@ impl OutputInterface for StreamOutput {
fn is_debug(&self) -> bool {
todo!()
}
- fn set_decorated(&mut self, _decorated: bool) {
+ fn set_decorated(&self, _decorated: bool) {
todo!()
}
fn is_decorated(&self) -> bool {
todo!()
}
- fn set_formatter(&mut self, _formatter: OutputFormatter) {
+ fn set_formatter(&self, _formatter: OutputFormatter) {
todo!()
}
- fn get_formatter(&mut self) -> &mut OutputFormatter {
+ fn get_formatter(&self) -> &OutputFormatter {
+ todo!()
+ }
+ fn get_stream(&self) -> shirabe_php_shim::PhpResource {
todo!()
}
}
diff --git a/crates/shirabe-external-packages/src/symfony/component/console/question/choice_question.rs b/crates/shirabe-external-packages/src/symfony/console/question/choice_question.rs
index 67ffe4c..5eb5818 100644
--- a/crates/shirabe-external-packages/src/symfony/component/console/question/choice_question.rs
+++ b/crates/shirabe-external-packages/src/symfony/console/question/choice_question.rs
@@ -1,4 +1,4 @@
-use crate::symfony::component::console::question::Question;
+use crate::symfony::console::question::Question;
use shirabe_php_shim::PhpMixed;
#[derive(Debug)]
diff --git a/crates/shirabe-external-packages/src/symfony/console/question/mod.rs b/crates/shirabe-external-packages/src/symfony/console/question/mod.rs
index 60c3107..67e7e7b 100644
--- a/crates/shirabe-external-packages/src/symfony/console/question/mod.rs
+++ b/crates/shirabe-external-packages/src/symfony/console/question/mod.rs
@@ -1,3 +1,5 @@
+pub mod choice_question;
pub mod question;
+pub use choice_question::*;
pub use question::*;
diff --git a/crates/shirabe-external-packages/src/symfony/console/question/question.rs b/crates/shirabe-external-packages/src/symfony/console/question/question.rs
index 02402ce..552f780 100644
--- a/crates/shirabe-external-packages/src/symfony/console/question/question.rs
+++ b/crates/shirabe-external-packages/src/symfony/console/question/question.rs
@@ -15,11 +15,11 @@ impl Question {
todo!()
}
- pub fn set_normalizer(&mut self, _normalizer: Box<dyn Fn(&PhpMixed) -> PhpMixed>) {
+ pub fn set_max_attempts(&mut self, _attempts: Option<i64>) {
todo!()
}
- pub fn set_max_attempts(&mut self, _attempts: Option<i64>) {
+ pub fn set_normalizer(&mut self, _normalizer: Box<dyn Fn(&PhpMixed) -> PhpMixed>) {
todo!()
}
@@ -27,6 +27,10 @@ impl Question {
todo!()
}
+ pub fn set_hidden_fallback(&mut self, _fallback: bool) {
+ todo!()
+ }
+
pub fn get_question(&self) -> String {
todo!()
}
@@ -38,4 +42,12 @@ impl Question {
pub fn is_hidden(&self) -> bool {
todo!()
}
+
+ pub fn get_validator(&self) -> Option<&dyn Fn(Option<PhpMixed>) -> anyhow::Result<PhpMixed>> {
+ todo!()
+ }
+
+ pub fn get_max_attempts(&self) -> Option<i64> {
+ todo!()
+ }
}
diff --git a/crates/shirabe-external-packages/src/symfony/component/console/single_command_application.rs b/crates/shirabe-external-packages/src/symfony/console/single_command_application.rs
index 9273477..9273477 100644
--- a/crates/shirabe-external-packages/src/symfony/component/console/single_command_application.rs
+++ b/crates/shirabe-external-packages/src/symfony/console/single_command_application.rs
diff --git a/crates/shirabe-external-packages/src/symfony/console/style/symfony_style.rs b/crates/shirabe-external-packages/src/symfony/console/style/symfony_style.rs
index b5dfded..c26ca30 100644
--- a/crates/shirabe-external-packages/src/symfony/console/style/symfony_style.rs
+++ b/crates/shirabe-external-packages/src/symfony/console/style/symfony_style.rs
@@ -1,5 +1,5 @@
-use crate::symfony::component::console::input::InputInterface;
-use crate::symfony::component::console::output::OutputInterface;
+use crate::symfony::console::input::InputInterface;
+use crate::symfony::console::output::OutputInterface;
use shirabe_php_shim::PhpMixed;
#[derive(Debug)]
diff --git a/crates/shirabe-external-packages/src/symfony/component/console/terminal.rs b/crates/shirabe-external-packages/src/symfony/console/terminal.rs
index 251d71e..251d71e 100644
--- a/crates/shirabe-external-packages/src/symfony/component/console/terminal.rs
+++ b/crates/shirabe-external-packages/src/symfony/console/terminal.rs
diff --git a/crates/shirabe-external-packages/src/symfony/component/filesystem/exception/io_exception.rs b/crates/shirabe-external-packages/src/symfony/filesystem/exception/io_exception.rs
index a5f2844..a5f2844 100644
--- a/crates/shirabe-external-packages/src/symfony/component/filesystem/exception/io_exception.rs
+++ b/crates/shirabe-external-packages/src/symfony/filesystem/exception/io_exception.rs
diff --git a/crates/shirabe-external-packages/src/symfony/component/filesystem/exception/mod.rs b/crates/shirabe-external-packages/src/symfony/filesystem/exception/mod.rs
index 2c19405..2c19405 100644
--- a/crates/shirabe-external-packages/src/symfony/component/filesystem/exception/mod.rs
+++ b/crates/shirabe-external-packages/src/symfony/filesystem/exception/mod.rs
diff --git a/crates/shirabe-external-packages/src/symfony/component/filesystem/filesystem.rs b/crates/shirabe-external-packages/src/symfony/filesystem/filesystem.rs
index 522309e..522309e 100644
--- a/crates/shirabe-external-packages/src/symfony/component/filesystem/filesystem.rs
+++ b/crates/shirabe-external-packages/src/symfony/filesystem/filesystem.rs
diff --git a/crates/shirabe-external-packages/src/symfony/component/filesystem/mod.rs b/crates/shirabe-external-packages/src/symfony/filesystem/mod.rs
index 24be2ed..24be2ed 100644
--- a/crates/shirabe-external-packages/src/symfony/component/filesystem/mod.rs
+++ b/crates/shirabe-external-packages/src/symfony/filesystem/mod.rs
diff --git a/crates/shirabe-external-packages/src/symfony/component/finder/finder.rs b/crates/shirabe-external-packages/src/symfony/finder/finder.rs
index 9e84e26..59a6ad1 100644
--- a/crates/shirabe-external-packages/src/symfony/component/finder/finder.rs
+++ b/crates/shirabe-external-packages/src/symfony/finder/finder.rs
@@ -1,4 +1,4 @@
-use crate::symfony::component::finder::SplFileInfo;
+use crate::symfony::finder::SplFileInfo;
/// Helper trait so `Finder::exclude` accepts both single strings and slices
/// (PHP's variadic / array argument compatibility).
diff --git a/crates/shirabe-external-packages/src/symfony/component/finder/glob.rs b/crates/shirabe-external-packages/src/symfony/finder/glob.rs
index 08ab6df..08ab6df 100644
--- a/crates/shirabe-external-packages/src/symfony/component/finder/glob.rs
+++ b/crates/shirabe-external-packages/src/symfony/finder/glob.rs
diff --git a/crates/shirabe-external-packages/src/symfony/component/finder/mod.rs b/crates/shirabe-external-packages/src/symfony/finder/mod.rs
index 4b2d4b8..4b2d4b8 100644
--- a/crates/shirabe-external-packages/src/symfony/component/finder/mod.rs
+++ b/crates/shirabe-external-packages/src/symfony/finder/mod.rs
diff --git a/crates/shirabe-external-packages/src/symfony/component/finder/spl_file_info.rs b/crates/shirabe-external-packages/src/symfony/finder/spl_file_info.rs
index 3c1be6d..3c1be6d 100644
--- a/crates/shirabe-external-packages/src/symfony/component/finder/spl_file_info.rs
+++ b/crates/shirabe-external-packages/src/symfony/finder/spl_file_info.rs
diff --git a/crates/shirabe-external-packages/src/symfony/mod.rs b/crates/shirabe-external-packages/src/symfony/mod.rs
index aaafe15..f176d3a 100644
--- a/crates/shirabe-external-packages/src/symfony/mod.rs
+++ b/crates/shirabe-external-packages/src/symfony/mod.rs
@@ -1,7 +1,9 @@
-pub mod component;
pub mod console;
+pub mod filesystem;
+pub mod finder;
pub mod process;
-pub use component::*;
pub use console::*;
+pub use filesystem::*;
+pub use finder::*;
pub use process::*;
diff --git a/crates/shirabe-external-packages/src/symfony/component/process/exception/mod.rs b/crates/shirabe-external-packages/src/symfony/process/exception/mod.rs
index 8d275c1..8d275c1 100644
--- a/crates/shirabe-external-packages/src/symfony/component/process/exception/mod.rs
+++ b/crates/shirabe-external-packages/src/symfony/process/exception/mod.rs
diff --git a/crates/shirabe-external-packages/src/symfony/component/process/exception/process_signaled_exception.rs b/crates/shirabe-external-packages/src/symfony/process/exception/process_signaled_exception.rs
index 154a7a7..154a7a7 100644
--- a/crates/shirabe-external-packages/src/symfony/component/process/exception/process_signaled_exception.rs
+++ b/crates/shirabe-external-packages/src/symfony/process/exception/process_signaled_exception.rs
diff --git a/crates/shirabe-external-packages/src/symfony/component/process/exception/process_timed_out_exception.rs b/crates/shirabe-external-packages/src/symfony/process/exception/process_timed_out_exception.rs
index cbcdaa4..cbcdaa4 100644
--- a/crates/shirabe-external-packages/src/symfony/component/process/exception/process_timed_out_exception.rs
+++ b/crates/shirabe-external-packages/src/symfony/process/exception/process_timed_out_exception.rs
diff --git a/crates/shirabe-external-packages/src/symfony/component/process/exception/runtime_exception.rs b/crates/shirabe-external-packages/src/symfony/process/exception/runtime_exception.rs
index 3ac2c8b..3ac2c8b 100644
--- a/crates/shirabe-external-packages/src/symfony/component/process/exception/runtime_exception.rs
+++ b/crates/shirabe-external-packages/src/symfony/process/exception/runtime_exception.rs
diff --git a/crates/shirabe-external-packages/src/symfony/process/mod.rs b/crates/shirabe-external-packages/src/symfony/process/mod.rs
index aeca4ff..6dd64e1 100644
--- a/crates/shirabe-external-packages/src/symfony/process/mod.rs
+++ b/crates/shirabe-external-packages/src/symfony/process/mod.rs
@@ -1,3 +1,9 @@
+pub mod exception;
pub mod executable_finder;
+pub mod php_executable_finder;
+pub mod process;
+pub use exception::*;
pub use executable_finder::*;
+pub use php_executable_finder::*;
+pub use process::*;
diff --git a/crates/shirabe-external-packages/src/symfony/component/process/php_executable_finder.rs b/crates/shirabe-external-packages/src/symfony/process/php_executable_finder.rs
index 0346d10..0346d10 100644
--- a/crates/shirabe-external-packages/src/symfony/component/process/php_executable_finder.rs
+++ b/crates/shirabe-external-packages/src/symfony/process/php_executable_finder.rs
diff --git a/crates/shirabe-external-packages/src/symfony/component/process/process.rs b/crates/shirabe-external-packages/src/symfony/process/process.rs
index 227606b..227606b 100644
--- a/crates/shirabe-external-packages/src/symfony/component/process/process.rs
+++ b/crates/shirabe-external-packages/src/symfony/process/process.rs
diff --git a/crates/shirabe/src/autoload/autoload_generator.rs b/crates/shirabe/src/autoload/autoload_generator.rs
index 54f67a5..a0e51e9 100644
--- a/crates/shirabe/src/autoload/autoload_generator.rs
+++ b/crates/shirabe/src/autoload/autoload_generator.rs
@@ -5,7 +5,7 @@ use indexmap::IndexMap;
use shirabe_class_map_generator::class_map::ClassMap;
use shirabe_class_map_generator::class_map_generator::ClassMapGenerator;
use shirabe_external_packages::composer::pcre::{CaptureKey, Preg};
-use shirabe_external_packages::symfony::component::console::formatter::OutputFormatter;
+use shirabe_external_packages::symfony::console::formatter::OutputFormatter;
use shirabe_php_shim::{
InvalidArgumentException, PhpMixed, RuntimeException, array_filter, array_keys, array_map,
array_merge, array_merge_map, array_merge_recursive, array_reverse, array_shift, array_slice,
diff --git a/crates/shirabe/src/cache.rs b/crates/shirabe/src/cache.rs
index c6566f2..1a1f67f 100644
--- a/crates/shirabe/src/cache.rs
+++ b/crates/shirabe/src/cache.rs
@@ -5,7 +5,7 @@ use std::sync::Mutex;
use anyhow::Result;
use chrono::Utc;
use shirabe_external_packages::composer::pcre::Preg;
-use shirabe_external_packages::symfony::component::finder::Finder;
+use shirabe_external_packages::symfony::finder::Finder;
use shirabe_php_shim::{
abs, bin2hex, dirname, file_exists, file_get_contents, file_put_contents, filemtime, hash_file,
is_dir, is_writable, mkdir, random_bytes, random_int, rename, time, unlink,
diff --git a/crates/shirabe/src/command/about_command.rs b/crates/shirabe/src/command/about_command.rs
index e26e41e..9b3fca5 100644
--- a/crates/shirabe/src/command/about_command.rs
+++ b/crates/shirabe/src/command/about_command.rs
@@ -7,8 +7,8 @@ use crate::composer;
use crate::composer::ComposerHandle;
use crate::io::IOInterface;
use crate::io::IOInterfaceImmutable;
-use shirabe_external_packages::symfony::component::console::input::InputInterface;
-use shirabe_external_packages::symfony::component::console::output::OutputInterface;
+use shirabe_external_packages::symfony::console::input::InputInterface;
+use shirabe_external_packages::symfony::console::output::OutputInterface;
#[derive(Debug)]
pub struct AboutCommand {
diff --git a/crates/shirabe/src/command/archive_command.rs b/crates/shirabe/src/command/archive_command.rs
index 8ac5b9f..53159f8 100644
--- a/crates/shirabe/src/command/archive_command.rs
+++ b/crates/shirabe/src/command/archive_command.rs
@@ -3,8 +3,8 @@
use anyhow::Result;
use indexmap::IndexMap;
use shirabe_external_packages::composer::pcre::{CaptureKey, Preg};
-use shirabe_external_packages::symfony::component::console::input::InputInterface;
-use shirabe_external_packages::symfony::component::console::output::OutputInterface;
+use shirabe_external_packages::symfony::console::input::InputInterface;
+use shirabe_external_packages::symfony::console::output::OutputInterface;
use shirabe_php_shim::{LogicException, get_debug_type};
use crate::command::{BaseCommand, BaseCommandData, HasBaseCommandData};
diff --git a/crates/shirabe/src/command/audit_command.rs b/crates/shirabe/src/command/audit_command.rs
index f739029..2d25052 100644
--- a/crates/shirabe/src/command/audit_command.rs
+++ b/crates/shirabe/src/command/audit_command.rs
@@ -13,8 +13,8 @@ use crate::repository::RepositoryInterface;
use crate::repository::RepositorySet;
use crate::repository::RepositoryUtils;
use anyhow::Result;
-use shirabe_external_packages::symfony::component::console::input::InputInterface;
-use shirabe_external_packages::symfony::component::console::output::OutputInterface;
+use shirabe_external_packages::symfony::console::input::InputInterface;
+use shirabe_external_packages::symfony::console::output::OutputInterface;
use shirabe_php_shim::{
InvalidArgumentException, PhpMixed, UnexpectedValueException, array_fill_keys, array_merge,
implode, in_array,
diff --git a/crates/shirabe/src/command/base_command.rs b/crates/shirabe/src/command/base_command.rs
index d0818bf..d7418ff 100644
--- a/crates/shirabe/src/command/base_command.rs
+++ b/crates/shirabe/src/command/base_command.rs
@@ -3,12 +3,12 @@
use anyhow::Result;
use indexmap::IndexMap;
-use shirabe_external_packages::symfony::component::console::Terminal;
-use shirabe_external_packages::symfony::component::console::helper::Table;
-use shirabe_external_packages::symfony::component::console::helper::TableSeparator;
-use shirabe_external_packages::symfony::component::console::input::InputDefinition;
-use shirabe_external_packages::symfony::component::console::input::InputInterface;
-use shirabe_external_packages::symfony::component::console::output::OutputInterface;
+use shirabe_external_packages::symfony::console::Terminal;
+use shirabe_external_packages::symfony::console::helper::Table;
+use shirabe_external_packages::symfony::console::helper::TableSeparator;
+use shirabe_external_packages::symfony::console::input::InputDefinition;
+use shirabe_external_packages::symfony::console::input::InputInterface;
+use shirabe_external_packages::symfony::console::output::OutputInterface;
use shirabe_php_shim::{
InvalidArgumentException, LogicException, PhpMixed, RuntimeException, UnexpectedValueException,
count, explode, in_array, is_string, max,
diff --git a/crates/shirabe/src/command/base_config_command.rs b/crates/shirabe/src/command/base_config_command.rs
index d681870..bfdd33a 100644
--- a/crates/shirabe/src/command/base_config_command.rs
+++ b/crates/shirabe/src/command/base_config_command.rs
@@ -8,8 +8,8 @@ use crate::json::JsonFile;
use crate::util::Platform;
use crate::util::Silencer;
use indexmap::IndexMap;
-use shirabe_external_packages::symfony::component::console::input::InputInterface;
-use shirabe_external_packages::symfony::component::console::output::OutputInterface;
+use shirabe_external_packages::symfony::console::input::InputInterface;
+use shirabe_external_packages::symfony::console::output::OutputInterface;
use shirabe_php_shim::{PhpMixed, chmod, touch};
pub trait BaseConfigCommand: BaseCommand {
diff --git a/crates/shirabe/src/command/base_dependency_command.rs b/crates/shirabe/src/command/base_dependency_command.rs
index a9ed7cd..1f4d5d4 100644
--- a/crates/shirabe/src/command/base_dependency_command.rs
+++ b/crates/shirabe/src/command/base_dependency_command.rs
@@ -1,10 +1,10 @@
//! ref: composer/src/Composer/Command/BaseDependencyCommand.php
use indexmap::IndexMap;
-use shirabe_external_packages::symfony::component::console::formatter::OutputFormatterStyle;
-use shirabe_external_packages::symfony::component::console::input::InputInterface;
-use shirabe_external_packages::symfony::component::console::output::OutputInterface;
use shirabe_external_packages::symfony::console::formatter::OutputFormatter;
+use shirabe_external_packages::symfony::console::formatter::OutputFormatterStyle;
+use shirabe_external_packages::symfony::console::input::InputInterface;
+use shirabe_external_packages::symfony::console::output::OutputInterface;
use shirabe_php_shim::{InvalidArgumentException, PhpMixed, UnexpectedValueException};
use shirabe_semver::constraint::AnyConstraint;
use shirabe_semver::constraint::Bound;
diff --git a/crates/shirabe/src/command/bump_command.rs b/crates/shirabe/src/command/bump_command.rs
index ac207bc..92b1331 100644
--- a/crates/shirabe/src/command/bump_command.rs
+++ b/crates/shirabe/src/command/bump_command.rs
@@ -4,8 +4,8 @@ use crate::io::io_interface;
use crate::package::base_package;
use anyhow::Result;
use shirabe_external_packages::composer::pcre::Preg;
-use shirabe_external_packages::symfony::component::console::input::InputInterface;
-use shirabe_external_packages::symfony::component::console::output::OutputInterface;
+use shirabe_external_packages::symfony::console::input::InputInterface;
+use shirabe_external_packages::symfony::console::output::OutputInterface;
use shirabe_php_shim::{PhpMixed, file_get_contents, file_put_contents, is_writable, strtolower};
use crate::command::{BaseCommand, BaseCommandData, HasBaseCommandData};
diff --git a/crates/shirabe/src/command/check_platform_reqs_command.rs b/crates/shirabe/src/command/check_platform_reqs_command.rs
index 7b50d25..2742f6f 100644
--- a/crates/shirabe/src/command/check_platform_reqs_command.rs
+++ b/crates/shirabe/src/command/check_platform_reqs_command.rs
@@ -2,8 +2,8 @@
use anyhow::Result;
use indexmap::IndexMap;
-use shirabe_external_packages::symfony::component::console::input::InputInterface;
-use shirabe_external_packages::symfony::component::console::output::OutputInterface;
+use shirabe_external_packages::symfony::console::input::InputInterface;
+use shirabe_external_packages::symfony::console::output::OutputInterface;
use shirabe_php_shim::{PhpMixed, array_merge_map, strip_tags};
use shirabe_semver::constraint::AnyConstraint;
use shirabe_semver::constraint::SimpleConstraint;
diff --git a/crates/shirabe/src/command/clear_cache_command.rs b/crates/shirabe/src/command/clear_cache_command.rs
index 1ceca69..28b303e 100644
--- a/crates/shirabe/src/command/clear_cache_command.rs
+++ b/crates/shirabe/src/command/clear_cache_command.rs
@@ -5,8 +5,8 @@ use crate::composer;
use crate::composer::ComposerHandle;
use crate::factory::Factory;
use indexmap::IndexMap;
-use shirabe_external_packages::symfony::component::console::input::InputInterface;
-use shirabe_external_packages::symfony::component::console::output::OutputInterface;
+use shirabe_external_packages::symfony::console::input::InputInterface;
+use shirabe_external_packages::symfony::console::output::OutputInterface;
#[derive(Debug)]
pub struct ClearCacheCommand {
diff --git a/crates/shirabe/src/command/config_command.rs b/crates/shirabe/src/command/config_command.rs
index 2099bcc..135b47f 100644
--- a/crates/shirabe/src/command/config_command.rs
+++ b/crates/shirabe/src/command/config_command.rs
@@ -5,8 +5,8 @@ use indexmap::IndexMap;
use crate::console::input::InputOption;
use shirabe_external_packages::composer::pcre::{CaptureKey, Preg};
-use shirabe_external_packages::symfony::component::console::input::InputInterface;
-use shirabe_external_packages::symfony::component::console::output::OutputInterface;
+use shirabe_external_packages::symfony::console::input::InputInterface;
+use shirabe_external_packages::symfony::console::output::OutputInterface;
use shirabe_php_shim::{
ArrayObject, InvalidArgumentException, JsonObject, PhpMixed, RuntimeException, array_filter,
array_filter_use_key, array_is_list, array_map, array_merge, array_unique, count,
diff --git a/crates/shirabe/src/command/create_project_command.rs b/crates/shirabe/src/command/create_project_command.rs
index c2e9b99..77cbea7 100644
--- a/crates/shirabe/src/command/create_project_command.rs
+++ b/crates/shirabe/src/command/create_project_command.rs
@@ -4,9 +4,9 @@ use anyhow::Result;
use indexmap::IndexMap;
use shirabe_external_packages::composer::pcre::{CaptureKey, Preg};
use shirabe_external_packages::seld::signal::SignalHandler;
-use shirabe_external_packages::symfony::component::console::input::InputInterface;
-use shirabe_external_packages::symfony::component::console::output::OutputInterface;
-use shirabe_external_packages::symfony::component::finder::Finder;
+use shirabe_external_packages::symfony::console::input::InputInterface;
+use shirabe_external_packages::symfony::console::output::OutputInterface;
+use shirabe_external_packages::symfony::finder::Finder;
use shirabe_php_shim::{
DIRECTORY_SEPARATOR, InvalidArgumentException, PhpMixed, RuntimeException,
UnexpectedValueException, array_pop, chdir, explode_with_limit, file_exists, getcwd, implode,
diff --git a/crates/shirabe/src/command/depends_command.rs b/crates/shirabe/src/command/depends_command.rs
index a53aab7..5c77b51 100644
--- a/crates/shirabe/src/command/depends_command.rs
+++ b/crates/shirabe/src/command/depends_command.rs
@@ -5,8 +5,8 @@ use crate::command::{BaseCommand, BaseCommandData, HasBaseCommandData};
use crate::console::input::InputArgument;
use crate::console::input::InputOption;
use crate::io::IOInterface;
-use shirabe_external_packages::symfony::component::console::input::InputInterface;
-use shirabe_external_packages::symfony::component::console::output::OutputInterface;
+use shirabe_external_packages::symfony::console::input::InputInterface;
+use shirabe_external_packages::symfony::console::output::OutputInterface;
#[derive(Debug)]
pub struct DependsCommand {
diff --git a/crates/shirabe/src/command/diagnose_command.rs b/crates/shirabe/src/command/diagnose_command.rs
index 59df4f9..2d6d1eb 100644
--- a/crates/shirabe/src/command/diagnose_command.rs
+++ b/crates/shirabe/src/command/diagnose_command.rs
@@ -4,9 +4,9 @@ use indexmap::IndexMap;
use shirabe_external_packages::composer::pcre::{CaptureKey, Preg};
use shirabe_external_packages::composer::xdebug_handler::XdebugHandler;
-use shirabe_external_packages::symfony::component::console::input::InputInterface;
-use shirabe_external_packages::symfony::component::console::output::OutputInterface;
-use shirabe_external_packages::symfony::component::process::ExecutableFinder;
+use shirabe_external_packages::symfony::console::input::InputInterface;
+use shirabe_external_packages::symfony::console::output::OutputInterface;
+use shirabe_external_packages::symfony::process::ExecutableFinder;
use shirabe_php_shim::{
CURL_HTTP_VERSION_2_0, CURL_VERSION_HTTP2, CURL_VERSION_HTTP3, CURL_VERSION_ZSTD,
FILTER_VALIDATE_BOOLEAN, INFO_GENERAL, InvalidArgumentException, OPENSSL_VERSION_NUMBER,
diff --git a/crates/shirabe/src/command/dump_autoload_command.rs b/crates/shirabe/src/command/dump_autoload_command.rs
index 011fc56..de0a57d 100644
--- a/crates/shirabe/src/command/dump_autoload_command.rs
+++ b/crates/shirabe/src/command/dump_autoload_command.rs
@@ -1,8 +1,8 @@
//! ref: composer/src/Composer/Command/DumpAutoloadCommand.php
use anyhow::Result;
-use shirabe_external_packages::symfony::component::console::input::InputInterface;
-use shirabe_external_packages::symfony::component::console::output::OutputInterface;
+use shirabe_external_packages::symfony::console::input::InputInterface;
+use shirabe_external_packages::symfony::console::output::OutputInterface;
use shirabe_php_shim::{InvalidArgumentException, PhpMixed, file_exists};
use crate::command::{BaseCommand, BaseCommandData, HasBaseCommandData};
diff --git a/crates/shirabe/src/command/exec_command.rs b/crates/shirabe/src/command/exec_command.rs
index b086937..3aec024 100644
--- a/crates/shirabe/src/command/exec_command.rs
+++ b/crates/shirabe/src/command/exec_command.rs
@@ -1,8 +1,8 @@
//! ref: composer/src/Composer/Command/ExecCommand.php
use anyhow::Result;
-use shirabe_external_packages::symfony::component::console::input::InputInterface;
-use shirabe_external_packages::symfony::component::console::output::OutputInterface;
+use shirabe_external_packages::symfony::console::input::InputInterface;
+use shirabe_external_packages::symfony::console::output::OutputInterface;
use shirabe_php_shim::{PhpMixed, RuntimeException, basename, chdir, getcwd, glob};
use crate::command::{BaseCommand, BaseCommandData, HasBaseCommandData};
diff --git a/crates/shirabe/src/command/fund_command.rs b/crates/shirabe/src/command/fund_command.rs
index cb60eb0..277d3e4 100644
--- a/crates/shirabe/src/command/fund_command.rs
+++ b/crates/shirabe/src/command/fund_command.rs
@@ -5,9 +5,9 @@ use std::any::Any;
use anyhow::Result;
use indexmap::IndexMap;
use shirabe_external_packages::composer::pcre::Preg;
-use shirabe_external_packages::symfony::component::console::input::InputInterface;
-use shirabe_external_packages::symfony::component::console::output::OutputInterface;
use shirabe_external_packages::symfony::console::formatter::OutputFormatter;
+use shirabe_external_packages::symfony::console::input::InputInterface;
+use shirabe_external_packages::symfony::console::output::OutputInterface;
use shirabe_php_shim::PhpMixed;
use shirabe_semver::constraint::AnyConstraint;
use shirabe_semver::constraint::MatchAllConstraint;
diff --git a/crates/shirabe/src/command/global_command.rs b/crates/shirabe/src/command/global_command.rs
index e5d06b7..fa52adc 100644
--- a/crates/shirabe/src/command/global_command.rs
+++ b/crates/shirabe/src/command/global_command.rs
@@ -4,9 +4,9 @@ use std::path::Path;
use anyhow::Result;
use shirabe_external_packages::composer::pcre::Preg;
-use shirabe_external_packages::symfony::component::console::input::InputInterface;
-use shirabe_external_packages::symfony::component::console::input::StringInput;
-use shirabe_external_packages::symfony::component::console::output::OutputInterface;
+use shirabe_external_packages::symfony::console::input::InputInterface;
+use shirabe_external_packages::symfony::console::input::StringInput;
+use shirabe_external_packages::symfony::console::output::OutputInterface;
use shirabe_php_shim::{LogicException, RuntimeException, chdir};
use crate::command::{BaseCommand, BaseCommandData, HasBaseCommandData};
diff --git a/crates/shirabe/src/command/home_command.rs b/crates/shirabe/src/command/home_command.rs
index 86909f5..6ddf0ca 100644
--- a/crates/shirabe/src/command/home_command.rs
+++ b/crates/shirabe/src/command/home_command.rs
@@ -1,8 +1,8 @@
//! ref: composer/src/Composer/Command/HomeCommand.php
use anyhow::Result;
-use shirabe_external_packages::symfony::component::console::input::InputInterface;
-use shirabe_external_packages::symfony::component::console::output::OutputInterface;
+use shirabe_external_packages::symfony::console::input::InputInterface;
+use shirabe_external_packages::symfony::console::output::OutputInterface;
use shirabe_php_shim::{FILTER_VALIDATE_URL, PhpMixed, filter_var};
use crate::command::{BaseCommand, BaseCommandData, HasBaseCommandData};
diff --git a/crates/shirabe/src/command/init_command.rs b/crates/shirabe/src/command/init_command.rs
index 2a67532..f146b30 100644
--- a/crates/shirabe/src/command/init_command.rs
+++ b/crates/shirabe/src/command/init_command.rs
@@ -5,10 +5,10 @@ use anyhow::Result;
use indexmap::IndexMap;
use shirabe_external_packages::composer::pcre::{CaptureKey, Preg};
use shirabe_external_packages::composer::spdx_licenses::SpdxLicenses;
-use shirabe_external_packages::symfony::component::console::helper::FormatterHelper;
-use shirabe_external_packages::symfony::component::console::input::ArrayInput;
-use shirabe_external_packages::symfony::component::console::input::InputInterface;
-use shirabe_external_packages::symfony::component::console::output::OutputInterface;
+use shirabe_external_packages::symfony::console::helper::FormatterHelper;
+use shirabe_external_packages::symfony::console::input::ArrayInput;
+use shirabe_external_packages::symfony::console::input::InputInterface;
+use shirabe_external_packages::symfony::console::output::OutputInterface;
use shirabe_php_shim::{
FILE_IGNORE_NEW_LINES, FILTER_VALIDATE_EMAIL, InvalidArgumentException, PHP_EOL, PhpMixed,
array_filter, array_flip, array_flip_strings, array_intersect_key, array_keys, array_map,
diff --git a/crates/shirabe/src/command/install_command.rs b/crates/shirabe/src/command/install_command.rs
index de68f87..f491820 100644
--- a/crates/shirabe/src/command/install_command.rs
+++ b/crates/shirabe/src/command/install_command.rs
@@ -1,8 +1,8 @@
//! ref: composer/src/Composer/Command/InstallCommand.php
use anyhow::Result;
-use shirabe_external_packages::symfony::component::console::input::InputInterface;
-use shirabe_external_packages::symfony::component::console::output::OutputInterface;
+use shirabe_external_packages::symfony::console::input::InputInterface;
+use shirabe_external_packages::symfony::console::output::OutputInterface;
use shirabe_php_shim::PhpMixed;
use crate::advisory::Auditor;
diff --git a/crates/shirabe/src/command/licenses_command.rs b/crates/shirabe/src/command/licenses_command.rs
index 79c86d1..b8fa01d 100644
--- a/crates/shirabe/src/command/licenses_command.rs
+++ b/crates/shirabe/src/command/licenses_command.rs
@@ -4,10 +4,10 @@ use std::any::Any;
use anyhow::Result;
use indexmap::IndexMap;
-use shirabe_external_packages::symfony::component::console::input::InputInterface;
-use shirabe_external_packages::symfony::component::console::output::OutputInterface;
use shirabe_external_packages::symfony::console::formatter::OutputFormatter;
use shirabe_external_packages::symfony::console::helper::Table;
+use shirabe_external_packages::symfony::console::input::InputInterface;
+use shirabe_external_packages::symfony::console::output::OutputInterface;
use shirabe_external_packages::symfony::console::style::SymfonyStyle;
use shirabe_php_shim::{PhpMixed, RuntimeException, UnexpectedValueException};
diff --git a/crates/shirabe/src/command/outdated_command.rs b/crates/shirabe/src/command/outdated_command.rs
index f14ebe3..6511b2b 100644
--- a/crates/shirabe/src/command/outdated_command.rs
+++ b/crates/shirabe/src/command/outdated_command.rs
@@ -6,9 +6,9 @@ use crate::console::input::InputOption;
use crate::io::IOInterface;
use anyhow::Result;
use indexmap::IndexMap;
-use shirabe_external_packages::symfony::component::console::input::InputInterface;
-use shirabe_external_packages::symfony::component::console::output::OutputInterface;
use shirabe_external_packages::symfony::console::input::ArrayInput;
+use shirabe_external_packages::symfony::console::input::InputInterface;
+use shirabe_external_packages::symfony::console::output::OutputInterface;
use shirabe_php_shim::PhpMixed;
#[derive(Debug)]
@@ -178,7 +178,7 @@ impl OutdatedCommand {
args.insert("--format".to_string(), input.borrow().get_option("format"));
args.insert("--ignore".to_string(), input.borrow().get_option("ignore"));
- let input = ArrayInput::new(args);
+ let input = ArrayInput::new(args, None);
// TODO(phase-b): convert ArrayInput/output references to dyn trait objects expected by Application::run
let _ = input;
diff --git a/crates/shirabe/src/command/package_discovery_trait.rs b/crates/shirabe/src/command/package_discovery_trait.rs
index 58361b5..32e5e21 100644
--- a/crates/shirabe/src/command/package_discovery_trait.rs
+++ b/crates/shirabe/src/command/package_discovery_trait.rs
@@ -6,8 +6,8 @@ use std::any::Any;
use anyhow::Result;
use indexmap::IndexMap;
use shirabe_external_packages::composer::pcre::{CaptureKey, Preg};
-use shirabe_external_packages::symfony::component::console::input::InputInterface;
-use shirabe_external_packages::symfony::component::console::output::OutputInterface;
+use shirabe_external_packages::symfony::console::input::InputInterface;
+use shirabe_external_packages::symfony::console::output::OutputInterface;
use shirabe_php_shim::{
Exception, InvalidArgumentException, LogicException, PHP_EOL, PhpMixed, array_keys,
array_slice, array_unshift, array_values, asort, count, explode, file_get_contents, implode,
diff --git a/crates/shirabe/src/command/prohibits_command.rs b/crates/shirabe/src/command/prohibits_command.rs
index 6fca061..0df87fd 100644
--- a/crates/shirabe/src/command/prohibits_command.rs
+++ b/crates/shirabe/src/command/prohibits_command.rs
@@ -5,8 +5,8 @@ use crate::command::{BaseCommand, BaseCommandData, HasBaseCommandData};
use crate::console::input::InputArgument;
use crate::console::input::InputOption;
use crate::io::IOInterface;
-use shirabe_external_packages::symfony::component::console::input::InputInterface;
-use shirabe_external_packages::symfony::component::console::output::OutputInterface;
+use shirabe_external_packages::symfony::console::input::InputInterface;
+use shirabe_external_packages::symfony::console::output::OutputInterface;
#[derive(Debug)]
pub struct ProhibitsCommand {
diff --git a/crates/shirabe/src/command/reinstall_command.rs b/crates/shirabe/src/command/reinstall_command.rs
index e72a177..e56e24b 100644
--- a/crates/shirabe/src/command/reinstall_command.rs
+++ b/crates/shirabe/src/command/reinstall_command.rs
@@ -4,8 +4,8 @@ use std::any::Any;
use anyhow::Result;
use shirabe_external_packages::composer::pcre::Preg;
-use shirabe_external_packages::symfony::component::console::input::InputInterface;
-use shirabe_external_packages::symfony::component::console::output::OutputInterface;
+use shirabe_external_packages::symfony::console::input::InputInterface;
+use shirabe_external_packages::symfony::console::output::OutputInterface;
use shirabe_php_shim::InvalidArgumentException;
use crate::command::{BaseCommand, BaseCommandData, HasBaseCommandData};
diff --git a/crates/shirabe/src/command/remove_command.rs b/crates/shirabe/src/command/remove_command.rs
index c2a358b..ddb14f0 100644
--- a/crates/shirabe/src/command/remove_command.rs
+++ b/crates/shirabe/src/command/remove_command.rs
@@ -2,9 +2,9 @@
use indexmap::IndexMap;
use shirabe_external_packages::composer::pcre::Preg;
-use shirabe_external_packages::symfony::component::console::exception::InvalidArgumentException;
-use shirabe_external_packages::symfony::component::console::input::InputInterface;
-use shirabe_external_packages::symfony::component::console::output::OutputInterface;
+use shirabe_external_packages::symfony::console::exception::InvalidArgumentException;
+use shirabe_external_packages::symfony::console::input::InputInterface;
+use shirabe_external_packages::symfony::console::output::OutputInterface;
use shirabe_php_shim::{PhpMixed, UnexpectedValueException, array_map, strtolower};
use crate::advisory::Auditor;
diff --git a/crates/shirabe/src/command/repository_command.rs b/crates/shirabe/src/command/repository_command.rs
index 975dd32..a44df0d 100644
--- a/crates/shirabe/src/command/repository_command.rs
+++ b/crates/shirabe/src/command/repository_command.rs
@@ -2,8 +2,8 @@
use indexmap::IndexMap;
use shirabe_external_packages::composer::pcre::Preg;
-use shirabe_external_packages::symfony::component::console::input::InputInterface;
-use shirabe_external_packages::symfony::component::console::output::OutputInterface;
+use shirabe_external_packages::symfony::console::input::InputInterface;
+use shirabe_external_packages::symfony::console::output::OutputInterface;
use shirabe_php_shim::{
InvalidArgumentException, PHP_URL_HOST, PhpMixed, RuntimeException, parse_url, strtolower,
};
diff --git a/crates/shirabe/src/command/require_command.rs b/crates/shirabe/src/command/require_command.rs
index d3d17a7..0ec809c 100644
--- a/crates/shirabe/src/command/require_command.rs
+++ b/crates/shirabe/src/command/require_command.rs
@@ -5,8 +5,8 @@ use anyhow::Result;
use indexmap::IndexMap;
use shirabe_external_packages::composer::pcre::Preg;
use shirabe_external_packages::seld::signal::SignalHandler;
-use shirabe_external_packages::symfony::component::console::input::InputInterface;
-use shirabe_external_packages::symfony::component::console::output::OutputInterface;
+use shirabe_external_packages::symfony::console::input::InputInterface;
+use shirabe_external_packages::symfony::console::output::OutputInterface;
use shirabe_php_shim::{
PhpMixed, RuntimeException, UnexpectedValueException, array_fill_keys, array_intersect,
array_keys, array_map, array_merge, array_merge_recursive, array_unique, count, empty,
diff --git a/crates/shirabe/src/command/run_script_command.rs b/crates/shirabe/src/command/run_script_command.rs
index 3fe0855..ce072e4 100644
--- a/crates/shirabe/src/command/run_script_command.rs
+++ b/crates/shirabe/src/command/run_script_command.rs
@@ -2,8 +2,8 @@
use anyhow::Result;
use indexmap::IndexMap;
-use shirabe_external_packages::symfony::component::console::input::InputInterface;
-use shirabe_external_packages::symfony::component::console::output::OutputInterface;
+use shirabe_external_packages::symfony::console::input::InputInterface;
+use shirabe_external_packages::symfony::console::output::OutputInterface;
use shirabe_php_shim::{InvalidArgumentException, PhpMixed, RuntimeException};
use crate::command::{BaseCommand, BaseCommandData, HasBaseCommandData};
diff --git a/crates/shirabe/src/command/script_alias_command.rs b/crates/shirabe/src/command/script_alias_command.rs
index 7c6e9fb..50e7e80 100644
--- a/crates/shirabe/src/command/script_alias_command.rs
+++ b/crates/shirabe/src/command/script_alias_command.rs
@@ -7,8 +7,8 @@ use crate::io::IOInterface;
use crate::util::Platform;
use anyhow::Result;
use shirabe_external_packages::composer::pcre::Preg;
-use shirabe_external_packages::symfony::component::console::input::InputInterface;
-use shirabe_external_packages::symfony::component::console::output::OutputInterface;
+use shirabe_external_packages::symfony::console::input::InputInterface;
+use shirabe_external_packages::symfony::console::output::OutputInterface;
use shirabe_php_shim::{InvalidArgumentException, LogicException, PhpMixed, is_string};
#[derive(Debug)]
diff --git a/crates/shirabe/src/command/search_command.rs b/crates/shirabe/src/command/search_command.rs
index bf68b2d..1cd8e59 100644
--- a/crates/shirabe/src/command/search_command.rs
+++ b/crates/shirabe/src/command/search_command.rs
@@ -14,9 +14,9 @@ use crate::repository::RepositoryInterfaceHandle;
use crate::repository::repository_interface::{self, RepositoryInterface};
use anyhow::Result;
use indexmap::IndexMap;
-use shirabe_external_packages::symfony::component::console::input::InputInterface;
-use shirabe_external_packages::symfony::component::console::output::OutputInterface;
use shirabe_external_packages::symfony::console::formatter::OutputFormatter;
+use shirabe_external_packages::symfony::console::input::InputInterface;
+use shirabe_external_packages::symfony::console::output::OutputInterface;
use shirabe_php_shim::{InvalidArgumentException, PhpMixed, implode, in_array, preg_quote};
#[derive(Debug)]
diff --git a/crates/shirabe/src/command/self_update_command.rs b/crates/shirabe/src/command/self_update_command.rs
index d0ffcde..edc2db8 100644
--- a/crates/shirabe/src/command/self_update_command.rs
+++ b/crates/shirabe/src/command/self_update_command.rs
@@ -4,9 +4,9 @@ use crate::io::io_interface;
use anyhow::Result;
use indexmap::IndexMap;
use shirabe_external_packages::composer::pcre::{CaptureKey, Preg};
-use shirabe_external_packages::symfony::component::console::input::InputInterface;
-use shirabe_external_packages::symfony::component::console::output::OutputInterface;
-use shirabe_external_packages::symfony::component::finder::Finder;
+use shirabe_external_packages::symfony::console::input::InputInterface;
+use shirabe_external_packages::symfony::console::output::OutputInterface;
+use shirabe_external_packages::symfony::finder::Finder;
use shirabe_php_shim::{
InvalidArgumentException, OPENSSL_ALGO_SHA384, PHP_EOL, PHP_VERSION_ID, Phar, PharException,
PhpMixed, RuntimeException, UnexpectedValueException, array_map, base64_decode,
diff --git a/crates/shirabe/src/command/show_command.rs b/crates/shirabe/src/command/show_command.rs
index a316c19..7a2c452 100644
--- a/crates/shirabe/src/command/show_command.rs
+++ b/crates/shirabe/src/command/show_command.rs
@@ -4,10 +4,10 @@ use indexmap::IndexMap;
use shirabe_external_packages::composer::pcre::{CaptureKey, Preg};
use shirabe_external_packages::composer::semver::Semver;
use shirabe_external_packages::composer::spdx_licenses::SpdxLicenses;
-use shirabe_external_packages::symfony::component::console::input::InputInterface;
-use shirabe_external_packages::symfony::component::console::output::OutputInterface;
use shirabe_external_packages::symfony::console::formatter::OutputFormatter;
use shirabe_external_packages::symfony::console::formatter::OutputFormatterStyle;
+use shirabe_external_packages::symfony::console::input::InputInterface;
+use shirabe_external_packages::symfony::console::output::OutputInterface;
use shirabe_php_shim::{
InvalidArgumentException, LogicException, PhpMixed, UnexpectedValueException, array_search,
date, extension_loaded, in_array, realpath, strtolower, version_compare,
diff --git a/crates/shirabe/src/command/status_command.rs b/crates/shirabe/src/command/status_command.rs
index 0c9abc9..0febf1e 100644
--- a/crates/shirabe/src/command/status_command.rs
+++ b/crates/shirabe/src/command/status_command.rs
@@ -2,8 +2,8 @@
use anyhow::Result;
use indexmap::IndexMap;
-use shirabe_external_packages::symfony::component::console::input::InputInterface;
-use shirabe_external_packages::symfony::component::console::output::OutputInterface;
+use shirabe_external_packages::symfony::console::input::InputInterface;
+use shirabe_external_packages::symfony::console::output::OutputInterface;
use crate::command::{BaseCommand, BaseCommandData, HasBaseCommandData};
use crate::console::input::InputOption;
diff --git a/crates/shirabe/src/command/suggests_command.rs b/crates/shirabe/src/command/suggests_command.rs
index 223aa6c..5c021b2 100644
--- a/crates/shirabe/src/command/suggests_command.rs
+++ b/crates/shirabe/src/command/suggests_command.rs
@@ -12,8 +12,8 @@ use crate::repository::RepositoryInterfaceHandle;
use crate::repository::RootPackageRepository;
use anyhow::Result;
use indexmap::IndexMap;
-use shirabe_external_packages::symfony::component::console::input::InputInterface;
-use shirabe_external_packages::symfony::component::console::output::OutputInterface;
+use shirabe_external_packages::symfony::console::input::InputInterface;
+use shirabe_external_packages::symfony::console::output::OutputInterface;
use shirabe_php_shim::{PhpMixed, empty, in_array};
#[derive(Debug)]
diff --git a/crates/shirabe/src/command/update_command.rs b/crates/shirabe/src/command/update_command.rs
index efde845..f0dc830 100644
--- a/crates/shirabe/src/command/update_command.rs
+++ b/crates/shirabe/src/command/update_command.rs
@@ -5,9 +5,9 @@ use crate::package::base_package;
use anyhow::Result;
use indexmap::IndexMap;
use shirabe_external_packages::composer::pcre::Preg;
-use shirabe_external_packages::symfony::component::console::helper::Table;
-use shirabe_external_packages::symfony::component::console::input::InputInterface;
-use shirabe_external_packages::symfony::component::console::output::OutputInterface;
+use shirabe_external_packages::symfony::console::helper::Table;
+use shirabe_external_packages::symfony::console::input::InputInterface;
+use shirabe_external_packages::symfony::console::output::OutputInterface;
use shirabe_php_shim::{
InvalidArgumentException, PhpMixed, RuntimeException, array_filter, array_intersect,
array_keys, array_merge, array_search, count, empty, in_array, sprintf, strtolower,
diff --git a/crates/shirabe/src/command/validate_command.rs b/crates/shirabe/src/command/validate_command.rs
index e9fd424..73de63b 100644
--- a/crates/shirabe/src/command/validate_command.rs
+++ b/crates/shirabe/src/command/validate_command.rs
@@ -1,8 +1,8 @@
//! ref: composer/src/Composer/Command/ValidateCommand.php
use anyhow::Result;
-use shirabe_external_packages::symfony::component::console::input::InputInterface;
-use shirabe_external_packages::symfony::component::console::output::OutputInterface;
+use shirabe_external_packages::symfony::console::input::InputInterface;
+use shirabe_external_packages::symfony::console::output::OutputInterface;
use crate::command::{BaseCommand, BaseCommandData, HasBaseCommandData};
use crate::console::input::InputArgument;
diff --git a/crates/shirabe/src/compiler.rs b/crates/shirabe/src/compiler.rs
index e9a0ca4..1088477 100644
--- a/crates/shirabe/src/compiler.rs
+++ b/crates/shirabe/src/compiler.rs
@@ -5,8 +5,8 @@ use shirabe_external_packages::composer::ca_bundle::CaBundle;
use shirabe_external_packages::composer::pcre::Preg;
use shirabe_external_packages::seld::phar_utils::Linter;
use shirabe_external_packages::seld::phar_utils::Timestamps;
-use shirabe_external_packages::symfony::component::finder::Finder;
-use shirabe_external_packages::symfony::component::finder::SplFileInfo;
+use shirabe_external_packages::symfony::finder::Finder;
+use shirabe_external_packages::symfony::finder::SplFileInfo;
use shirabe_php_shim::{
Phar, PhpMixed, RuntimeException, T_COMMENT, T_DOC_COMMENT, T_WHITESPACE,
UnexpectedValueException, array_search, file_exists, file_get_contents, strcmp, strtr,
diff --git a/crates/shirabe/src/console/application.rs b/crates/shirabe/src/console/application.rs
index fbde9bd..9fdb50b 100644
--- a/crates/shirabe/src/console/application.rs
+++ b/crates/shirabe/src/console/application.rs
@@ -5,21 +5,21 @@ use indexmap::IndexMap;
use shirabe_external_packages::composer::xdebug_handler::XdebugHandler;
use shirabe_external_packages::seld::json_lint::ParsingException;
-use shirabe_external_packages::symfony::component::console::Application as BaseApplication;
-use shirabe_external_packages::symfony::component::console::SingleCommandApplication;
-use shirabe_external_packages::symfony::component::console::command::Command;
-use shirabe_external_packages::symfony::component::console::exception::CommandNotFoundException;
-use shirabe_external_packages::symfony::component::console::exception::ExceptionInterface;
-use shirabe_external_packages::symfony::component::console::helper::HelperSet;
-use shirabe_external_packages::symfony::component::console::helper::QuestionHelper;
-use shirabe_external_packages::symfony::component::console::input::InputDefinition;
-use shirabe_external_packages::symfony::component::console::input::InputInterface;
-use shirabe_external_packages::symfony::component::console::input::InputOption;
-use shirabe_external_packages::symfony::component::console::output::ConsoleOutputInterface;
-use shirabe_external_packages::symfony::component::console::output::output_interface::{
+use shirabe_external_packages::symfony::console::Application as BaseApplication;
+use shirabe_external_packages::symfony::console::SingleCommandApplication;
+use shirabe_external_packages::symfony::console::command::Command;
+use shirabe_external_packages::symfony::console::exception::CommandNotFoundException;
+use shirabe_external_packages::symfony::console::exception::ExceptionInterface;
+use shirabe_external_packages::symfony::console::helper::HelperSet;
+use shirabe_external_packages::symfony::console::helper::QuestionHelper;
+use shirabe_external_packages::symfony::console::input::InputDefinition;
+use shirabe_external_packages::symfony::console::input::InputInterface;
+use shirabe_external_packages::symfony::console::input::InputOption;
+use shirabe_external_packages::symfony::console::output::ConsoleOutputInterface;
+use shirabe_external_packages::symfony::console::output::output_interface::{
self as output_interface, OutputInterface,
};
-use shirabe_external_packages::symfony::component::process::exception::ProcessTimedOutException;
+use shirabe_external_packages::symfony::process::exception::ProcessTimedOutException;
use shirabe_php_shim::{
LogicException as ShimLogicException, PHP_BINARY, PHP_VERSION, PHP_VERSION_ID, PhpMixed,
RuntimeException, UnexpectedValueException, array_merge, bin2hex, chdir, clone, count,
diff --git a/crates/shirabe/src/downloader/archive_downloader.rs b/crates/shirabe/src/downloader/archive_downloader.rs
index 61ecfd1..a44e9c5 100644
--- a/crates/shirabe/src/downloader/archive_downloader.rs
+++ b/crates/shirabe/src/downloader/archive_downloader.rs
@@ -2,7 +2,7 @@
use anyhow::Result;
use indexmap::IndexMap;
-use shirabe_external_packages::symfony::component::finder::{Finder, SplFileInfo};
+use shirabe_external_packages::symfony::finder::{Finder, SplFileInfo};
use shirabe_php_shim::{
DIRECTORY_SEPARATOR, PhpMixed, RuntimeException, basename, bin2hex, file_exists, is_dir,
random_bytes, realpath,
diff --git a/crates/shirabe/src/downloader/path_downloader.rs b/crates/shirabe/src/downloader/path_downloader.rs
index a215bb3..d44bd8a 100644
--- a/crates/shirabe/src/downloader/path_downloader.rs
+++ b/crates/shirabe/src/downloader/path_downloader.rs
@@ -3,8 +3,8 @@
use crate::io::io_interface;
use anyhow::Result;
use indexmap::IndexMap;
-use shirabe_external_packages::symfony::component::filesystem::Filesystem as SymfonyFilesystem;
-use shirabe_external_packages::symfony::component::filesystem::exception::IOException;
+use shirabe_external_packages::symfony::filesystem::Filesystem as SymfonyFilesystem;
+use shirabe_external_packages::symfony::filesystem::exception::IOException;
use shirabe_php_shim::{
DIRECTORY_SEPARATOR, PHP_WINDOWS_VERSION_MAJOR, PHP_WINDOWS_VERSION_MINOR, PhpMixed,
RuntimeException, file_exists, function_exists, is_dir, realpath,
diff --git a/crates/shirabe/src/downloader/zip_downloader.rs b/crates/shirabe/src/downloader/zip_downloader.rs
index 3875e7e..c5c2526 100644
--- a/crates/shirabe/src/downloader/zip_downloader.rs
+++ b/crates/shirabe/src/downloader/zip_downloader.rs
@@ -12,8 +12,8 @@ use crate::util::Platform;
use anyhow::Result;
use indexmap::IndexMap;
use shirabe_external_packages::composer::pcre::{CaptureKey, Preg};
-use shirabe_external_packages::symfony::component::process::ExecutableFinder;
-use shirabe_external_packages::symfony::component::process::Process;
+use shirabe_external_packages::symfony::process::ExecutableFinder;
+use shirabe_external_packages::symfony::process::Process;
use shirabe_php_shim::{
DIRECTORY_SEPARATOR, ErrorException, PhpMixed, RuntimeException, UnexpectedValueException,
ZipArchive, bin2hex, class_exists, file_exists, file_get_contents, filesize, function_exists,
diff --git a/crates/shirabe/src/event_dispatcher/event_dispatcher.rs b/crates/shirabe/src/event_dispatcher/event_dispatcher.rs
index 797083c..affecdd 100644
--- a/crates/shirabe/src/event_dispatcher/event_dispatcher.rs
+++ b/crates/shirabe/src/event_dispatcher/event_dispatcher.rs
@@ -3,11 +3,11 @@
use indexmap::IndexMap;
use shirabe_external_packages::composer::pcre::{CaptureKey, Preg};
-use shirabe_external_packages::symfony::component::console::Application;
-use shirabe_external_packages::symfony::component::console::input::StringInput;
-use shirabe_external_packages::symfony::component::console::output::ConsoleOutput;
-use shirabe_external_packages::symfony::component::process::ExecutableFinder;
-use shirabe_external_packages::symfony::component::process::PhpExecutableFinder;
+use shirabe_external_packages::symfony::console::Application;
+use shirabe_external_packages::symfony::console::input::StringInput;
+use shirabe_external_packages::symfony::console::output::ConsoleOutput;
+use shirabe_external_packages::symfony::process::ExecutableFinder;
+use shirabe_external_packages::symfony::process::PhpExecutableFinder;
use shirabe_php_shim::{
Exception, InvalidArgumentException, LogicException, PATH_SEPARATOR, PHP_VERSION_ID, PhpMixed,
RuntimeException, array_pop, array_push, array_search_in_vec, array_splice, class_exists,
diff --git a/crates/shirabe/src/factory.rs b/crates/shirabe/src/factory.rs
index c9de808..e0eb42c 100644
--- a/crates/shirabe/src/factory.rs
+++ b/crates/shirabe/src/factory.rs
@@ -2,9 +2,9 @@
use indexmap::IndexMap;
-use shirabe_external_packages::symfony::component::console::formatter::OutputFormatter;
-use shirabe_external_packages::symfony::component::console::formatter::OutputFormatterStyle;
-use shirabe_external_packages::symfony::component::console::output::ConsoleOutput;
+use shirabe_external_packages::symfony::console::formatter::OutputFormatter;
+use shirabe_external_packages::symfony::console::formatter::OutputFormatterStyle;
+use shirabe_external_packages::symfony::console::output::ConsoleOutput;
use shirabe_php_shim::{
InvalidArgumentException, PATHINFO_EXTENSION, PHP_EOL, Phar, PhpMixed, RuntimeException,
UnexpectedValueException, ZipArchive, array_keys, array_replace_recursive, class_exists,
diff --git a/crates/shirabe/src/installer/suggested_packages_reporter.rs b/crates/shirabe/src/installer/suggested_packages_reporter.rs
index b2f8876..65977ac 100644
--- a/crates/shirabe/src/installer/suggested_packages_reporter.rs
+++ b/crates/shirabe/src/installer/suggested_packages_reporter.rs
@@ -7,7 +7,7 @@ use crate::repository::InstalledRepository;
use crate::repository::RepositoryInterface;
use indexmap::IndexMap;
use shirabe_external_packages::composer::pcre::Preg;
-use shirabe_external_packages::symfony::component::console::formatter::OutputFormatter;
+use shirabe_external_packages::symfony::console::formatter::OutputFormatter;
#[derive(Debug)]
pub struct SuggestedPackagesReporter {
diff --git a/crates/shirabe/src/io/buffer_io.rs b/crates/shirabe/src/io/buffer_io.rs
index 7c999f8..079b470 100644
--- a/crates/shirabe/src/io/buffer_io.rs
+++ b/crates/shirabe/src/io/buffer_io.rs
@@ -3,12 +3,12 @@
use crate::io::ConsoleIO;
use anyhow::Result;
use shirabe_external_packages::composer::pcre::Preg;
-use shirabe_external_packages::symfony::component::console::helper::HelperSet;
-use shirabe_external_packages::symfony::component::console::input::InputInterface;
-use shirabe_external_packages::symfony::component::console::input::StringInput;
-use shirabe_external_packages::symfony::component::console::output::OutputInterface;
use shirabe_external_packages::symfony::console::formatter::OutputFormatterInterface;
+use shirabe_external_packages::symfony::console::helper::HelperSet;
use shirabe_external_packages::symfony::console::helper::QuestionHelper;
+use shirabe_external_packages::symfony::console::input::InputInterface;
+use shirabe_external_packages::symfony::console::input::StringInput;
+use shirabe_external_packages::symfony::console::output::OutputInterface;
use shirabe_external_packages::symfony::console::output::StreamOutput;
use shirabe_php_shim::{
PHP_EOL, PhpMixed, RuntimeException, fopen, fseek, fwrite, rewind, stream_get_contents,
@@ -39,16 +39,14 @@ impl BufferIO {
}
let decorated = formatter.as_ref().map_or(false, |f| f.is_decorated());
- // TODO(phase-b): StreamOutput lives under `symfony::console` (not `symfony::component::console`)
- // and so does not implement the `component::console::output::OutputInterface` ConsoleIO expects.
- // Real fix requires unifying the two crate paths.
+ // TODO(phase-c): wire StreamOutput as the output. The console tree merge made StreamOutput
+ // implement the unified OutputInterface; StreamOutput::new is still a stub.
let _ = formatter;
let _ = StreamOutput::new(stream, verbosity, Some(decorated));
let output: std::rc::Rc<std::cell::RefCell<dyn OutputInterface>> =
- todo!("StreamOutput as std::rc::Rc<std::cell::RefCell<dyn OutputInterface>>");
+ todo!("wire StreamOutput as the ConsoleIO output");
- // TODO(phase-b): symfony console helper modules live under both `symfony::console`
- // and `symfony::component::console`; QuestionHelper::new is not yet provided.
+ // TODO(phase-c): construct the QuestionHelper and register it in the HelperSet.
let helpers: Vec<PhpMixed> = vec![/* PhpMixed::Object(QuestionHelper::new()) */];
let _ = std::marker::PhantomData::<QuestionHelper>;
let inner = ConsoleIO::new(
@@ -103,14 +101,11 @@ impl BufferIO {
// PHP: `if (!$this->input instanceof StreamableInputInterface) { throw ... }`
// `$this->input->setStream($this->createStream($inputs)); $this->input->setInteractive(true);`
//
- // TODO(phase-b): blocked on the symfony console crate-path duplication (see `new`/`get_output`):
- // `StreamableInputInterface` lives under `symfony::console::input`, but ConsoleIO's input is
- // a `symfony::component::console::input::InputInterface` from a separate, unrelated trait
- // tree, so the `instanceof` downcast cannot be expressed until those trees are unified.
+ // TODO(phase-c): unblocked by the console tree merge (StreamableInputInterface and
+ // InputInterface now share one tree). Wiring the downcast still needs an as_streamable
+ // accessor on InputInterface to reach ConsoleIO's input.
let _ = inputs;
- todo!(
- "BufferIO::set_user_inputs: blocked on unifying symfony::console / symfony::component::console input trait trees"
- )
+ todo!("BufferIO::set_user_inputs: needs an as_streamable accessor on InputInterface")
}
fn create_stream(&self, inputs: Vec<String>) -> Result<PhpMixed> {
diff --git a/crates/shirabe/src/io/console_io.rs b/crates/shirabe/src/io/console_io.rs
index edb0a97..987819d 100644
--- a/crates/shirabe/src/io/console_io.rs
+++ b/crates/shirabe/src/io/console_io.rs
@@ -5,16 +5,16 @@ use crate::io::io_interface;
use indexmap::IndexMap;
use indexmap::indexmap;
use shirabe_external_packages::composer::pcre::Preg;
-use shirabe_external_packages::symfony::component::console::helper::HelperSet;
-use shirabe_external_packages::symfony::component::console::helper::ProgressBar;
-use shirabe_external_packages::symfony::component::console::helper::Table;
-use shirabe_external_packages::symfony::component::console::input::InputInterface;
-use shirabe_external_packages::symfony::component::console::output::ConsoleOutputInterface;
-use shirabe_external_packages::symfony::component::console::output::output_interface::{
+use shirabe_external_packages::symfony::console::helper::HelperSet;
+use shirabe_external_packages::symfony::console::helper::ProgressBar;
+use shirabe_external_packages::symfony::console::helper::Table;
+use shirabe_external_packages::symfony::console::input::InputInterface;
+use shirabe_external_packages::symfony::console::output::ConsoleOutputInterface;
+use shirabe_external_packages::symfony::console::output::output_interface::{
self as output_interface, OutputInterface,
};
-use shirabe_external_packages::symfony::component::console::question::ChoiceQuestion;
-use shirabe_external_packages::symfony::component::console::question::Question;
+use shirabe_external_packages::symfony::console::question::ChoiceQuestion;
+use shirabe_external_packages::symfony::console::question::Question;
use shirabe_php_shim::{
PhpMixed, array_filter, array_keys, array_search, count, function_exists, implode, in_array,
is_array, is_string, mb_check_encoding, mb_convert_encoding, microtime, sprintf, str_repeat,
diff --git a/crates/shirabe/src/package/archiver/archivable_files_finder.rs b/crates/shirabe/src/package/archiver/archivable_files_finder.rs
index f88f9b8..2e9a3f2 100644
--- a/crates/shirabe/src/package/archiver/archivable_files_finder.rs
+++ b/crates/shirabe/src/package/archiver/archivable_files_finder.rs
@@ -4,7 +4,7 @@ use crate::package::archiver::ComposerExcludeFilter;
use crate::package::archiver::GitExcludeFilter;
use crate::util::Filesystem;
use shirabe_external_packages::composer::pcre::Preg;
-use shirabe_external_packages::symfony::component::finder::Finder;
+use shirabe_external_packages::symfony::finder::Finder;
use shirabe_php_shim::{RuntimeException, preg_quote, realpath};
use std::path::{Path, PathBuf};
diff --git a/crates/shirabe/src/package/archiver/base_exclude_filter.rs b/crates/shirabe/src/package/archiver/base_exclude_filter.rs
index d3c0da1..4de3cbb 100644
--- a/crates/shirabe/src/package/archiver/base_exclude_filter.rs
+++ b/crates/shirabe/src/package/archiver/base_exclude_filter.rs
@@ -1,7 +1,7 @@
//! ref: composer/src/Composer/Package/Archiver/BaseExcludeFilter.php
use shirabe_external_packages::composer::pcre::Preg;
-use shirabe_external_packages::symfony::component::finder::Glob;
+use shirabe_external_packages::symfony::finder::Glob;
#[derive(Debug)]
pub struct BaseExcludeFilterBase {
diff --git a/crates/shirabe/src/package/version/version_guesser.rs b/crates/shirabe/src/package/version/version_guesser.rs
index d8559b7..1afe910 100644
--- a/crates/shirabe/src/package/version/version_guesser.rs
+++ b/crates/shirabe/src/package/version/version_guesser.rs
@@ -3,7 +3,7 @@
use anyhow::Result;
use indexmap::IndexMap;
use shirabe_external_packages::composer::pcre::{CaptureKey, Preg};
-use shirabe_external_packages::symfony::component::process::Process;
+use shirabe_external_packages::symfony::process::Process;
use shirabe_php_shim::{
PHP_INT_MAX, PhpMixed, RuntimeException, array_keys, array_map, array_merge, empty,
function_exists, implode, is_string, json_encode, preg_quote, str_replace, strlen,
diff --git a/crates/shirabe/src/plugin/command_event.rs b/crates/shirabe/src/plugin/command_event.rs
index 838260c..fc19fcb 100644
--- a/crates/shirabe/src/plugin/command_event.rs
+++ b/crates/shirabe/src/plugin/command_event.rs
@@ -2,8 +2,8 @@
use crate::event_dispatcher::Event;
use indexmap::IndexMap;
-use shirabe_external_packages::symfony::component::console::input::InputInterface;
-use shirabe_external_packages::symfony::component::console::output::OutputInterface;
+use shirabe_external_packages::symfony::console::input::InputInterface;
+use shirabe_external_packages::symfony::console::output::OutputInterface;
use shirabe_php_shim::PhpMixed;
#[derive(Debug)]
diff --git a/crates/shirabe/src/plugin/pre_command_run_event.rs b/crates/shirabe/src/plugin/pre_command_run_event.rs
index 21eb232..29567cb 100644
--- a/crates/shirabe/src/plugin/pre_command_run_event.rs
+++ b/crates/shirabe/src/plugin/pre_command_run_event.rs
@@ -2,7 +2,7 @@
// TODO(plugin): this event is part of the plugin API and is dispatched before a command runs
use crate::event_dispatcher::Event;
-use shirabe_external_packages::symfony::component::console::input::InputInterface;
+use shirabe_external_packages::symfony::console::input::InputInterface;
#[derive(Debug)]
pub struct PreCommandRunEvent {
diff --git a/crates/shirabe/src/util/filesystem.rs b/crates/shirabe/src/util/filesystem.rs
index da9369e..f54dfca 100644
--- a/crates/shirabe/src/util/filesystem.rs
+++ b/crates/shirabe/src/util/filesystem.rs
@@ -1,8 +1,8 @@
//! ref: composer/src/Composer/Util/Filesystem.php
use shirabe_external_packages::composer::pcre::Preg;
-use shirabe_external_packages::symfony::component::filesystem::exception::IOException;
-use shirabe_external_packages::symfony::component::finder::Finder;
+use shirabe_external_packages::symfony::filesystem::exception::IOException;
+use shirabe_external_packages::symfony::finder::Finder;
use shirabe_php_shim::{
DIRECTORY_SEPARATOR, ErrorException, InvalidArgumentException, LogicException, PhpMixed,
RuntimeException, UnexpectedValueException, array_pop, basename, chdir, clearstatcache,
diff --git a/crates/shirabe/src/util/loop.rs b/crates/shirabe/src/util/loop.rs
index 5512211..8cbd49d 100644
--- a/crates/shirabe/src/util/loop.rs
+++ b/crates/shirabe/src/util/loop.rs
@@ -3,7 +3,7 @@
use crate::util::HttpDownloader;
use crate::util::ProcessExecutor;
use anyhow::Result;
-use shirabe_external_packages::symfony::component::console::helper::ProgressBar;
+use shirabe_external_packages::symfony::console::helper::ProgressBar;
#[derive(Debug)]
pub struct Loop {
diff --git a/crates/shirabe/src/util/perforce.rs b/crates/shirabe/src/util/perforce.rs
index d84e4ea..2a17fa9 100644
--- a/crates/shirabe/src/util/perforce.rs
+++ b/crates/shirabe/src/util/perforce.rs
@@ -3,8 +3,8 @@
use anyhow::Result;
use indexmap::IndexMap;
use shirabe_external_packages::composer::pcre::Preg;
-use shirabe_external_packages::symfony::component::process::ExecutableFinder;
-use shirabe_external_packages::symfony::component::process::Process;
+use shirabe_external_packages::symfony::process::ExecutableFinder;
+use shirabe_external_packages::symfony::process::Process;
use shirabe_php_shim::{
Exception, PHP_EOL, PhpMixed, chdir, count, date, explode, fclose, feof, fgets,
file_get_contents, fopen, fwrite, gethostname, json_decode, str_replace_array, strcmp, strlen,
diff --git a/crates/shirabe/src/util/process_executor.rs b/crates/shirabe/src/util/process_executor.rs
index 0b88b9f..837fb32 100644
--- a/crates/shirabe/src/util/process_executor.rs
+++ b/crates/shirabe/src/util/process_executor.rs
@@ -7,10 +7,10 @@ use std::sync::{LazyLock, Mutex};
use shirabe_external_packages::composer::pcre::{CaptureKey, Preg};
use shirabe_external_packages::seld::signal::SignalHandler;
-use shirabe_external_packages::symfony::component::process::ExecutableFinder;
-use shirabe_external_packages::symfony::component::process::Process;
-use shirabe_external_packages::symfony::component::process::exception::ProcessSignaledException;
-use shirabe_external_packages::symfony::component::process::exception::RuntimeException as SymfonyProcessRuntimeException;
+use shirabe_external_packages::symfony::process::ExecutableFinder;
+use shirabe_external_packages::symfony::process::Process;
+use shirabe_external_packages::symfony::process::exception::ProcessSignaledException;
+use shirabe_external_packages::symfony::process::exception::RuntimeException as SymfonyProcessRuntimeException;
use shirabe_php_shim::{
LogicException, PhpMixed, RuntimeException, array_intersect, array_map, call_user_func,
defined, escapeshellarg, explode, implode, in_array, is_array, is_callable, is_dir, is_numeric,