From 6051927c8fa32cfffa102d2a170c5a6cf747a1b9 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Sun, 9 Aug 2026 11:19:03 +0900 Subject: refactor(symfony-console): extract symfony/console into the shirabe-symfony-console crate Move `Symfony\Component\Console` out of shirabe-external-packages and into its own crate, so the path is `shirabe_symfony_console::application::Application` instead of `shirabe_external_packages::symfony::console::application::Application`. The `delegate_to_inner!` and `delegate_command_trait_impls_to_inner!` macros move with it. Co-Authored-By: Claude Opus 5 (1M context) --- crates/shirabe/src/io/buffer_io.rs | 12 ++++++------ crates/shirabe/src/io/console_io.rs | 30 +++++++++++++----------------- 2 files changed, 19 insertions(+), 23 deletions(-) (limited to 'crates/shirabe/src/io') diff --git a/crates/shirabe/src/io/buffer_io.rs b/crates/shirabe/src/io/buffer_io.rs index 4b095e1c..75c850f5 100644 --- a/crates/shirabe/src/io/buffer_io.rs +++ b/crates/shirabe/src/io/buffer_io.rs @@ -1,17 +1,17 @@ //! ref: composer/src/Composer/IO/BufferIO.php use crate::io::ConsoleIO; -use shirabe_external_packages::symfony::console::formatter::OutputFormatterInterface; -use shirabe_external_packages::symfony::console::helper::QuestionHelper; -use shirabe_external_packages::symfony::console::input::InputInterface; -use shirabe_external_packages::symfony::console::input::StringInput; -use shirabe_external_packages::symfony::console::output::OutputInterface; -use shirabe_external_packages::symfony::console::output::StreamOutput; use shirabe_pcre::Preg; use shirabe_php_shim::{ PHP_EOL, PhpMixed, PhpResource, RuntimeException, SEEK_SET, fopen, fseek, fwrite, php_regex, rewind, stream_get_contents, strip_tags, }; +use shirabe_symfony_console::formatter::OutputFormatterInterface; +use shirabe_symfony_console::helper::QuestionHelper; +use shirabe_symfony_console::input::InputInterface; +use shirabe_symfony_console::input::StringInput; +use shirabe_symfony_console::output::OutputInterface; +use shirabe_symfony_console::output::StreamOutput; #[derive(Debug)] pub struct BufferIO { diff --git a/crates/shirabe/src/io/console_io.rs b/crates/shirabe/src/io/console_io.rs index 8d21242d..043ef939 100644 --- a/crates/shirabe/src/io/console_io.rs +++ b/crates/shirabe/src/io/console_io.rs @@ -9,24 +9,22 @@ use crate::io::io_interface; use crate::question::StrictConfirmationQuestion; use indexmap::IndexMap; use indexmap::indexmap; -use shirabe_external_packages::symfony::console::helper::ProgressBar; -use shirabe_external_packages::symfony::console::helper::QuestionHelper; -use shirabe_external_packages::symfony::console::helper::QuestionHelperInterface; -use shirabe_external_packages::symfony::console::helper::Table; -use shirabe_external_packages::symfony::console::input::InputInterface; -use shirabe_external_packages::symfony::console::output::ConsoleOutput; -use shirabe_external_packages::symfony::console::output::ConsoleOutputInterface; -use shirabe_external_packages::symfony::console::output::output_interface::{ - self, OutputInterface, -}; -use shirabe_external_packages::symfony::console::question::ChoiceQuestion; -use shirabe_external_packages::symfony::console::question::Question; -use shirabe_external_packages::symfony::console::question::QuestionInterface; use shirabe_pcre::Preg; use shirabe_php_shim::{ PhpMixed, array_search, implode, in_array_strict, is_array, is_string, microtime, str_repeat, strip_tags, strlen, }; +use shirabe_symfony_console::helper::ProgressBar; +use shirabe_symfony_console::helper::QuestionHelper; +use shirabe_symfony_console::helper::QuestionHelperInterface; +use shirabe_symfony_console::helper::Table; +use shirabe_symfony_console::input::InputInterface; +use shirabe_symfony_console::output::ConsoleOutput; +use shirabe_symfony_console::output::ConsoleOutputInterface; +use shirabe_symfony_console::output::output_interface::{self, OutputInterface}; +use shirabe_symfony_console::question::ChoiceQuestion; +use shirabe_symfony_console::question::Question; +use shirabe_symfony_console::question::QuestionInterface; /// The Input/Output helper. #[derive(Debug)] @@ -486,13 +484,11 @@ impl IOInterfaceImmutable for ConsoleIO { Option, ) -> Result< PhpMixed, - shirabe_external_packages::symfony::console::exception::InvalidArgumentException, + shirabe_symfony_console::exception::InvalidArgumentException, >, > = Box::new(move |answer: Option| { validator(answer.unwrap_or(PhpMixed::Null)).map_err(|e| { - shirabe_external_packages::symfony::console::exception::InvalidArgumentException::new( - e.to_string(), - ) + shirabe_symfony_console::exception::InvalidArgumentException::new(e.to_string()) }) }); question.set_validator(Some(adapted)); -- cgit v1.3.1-4-g156e