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/plugin/command_event.rs | 4 ++-- crates/shirabe/src/plugin/php_plugin_proxy.rs | 18 ++++++++---------- crates/shirabe/src/plugin/pre_command_run_event.rs | 2 +- 3 files changed, 11 insertions(+), 13 deletions(-) (limited to 'crates/shirabe/src/plugin') diff --git a/crates/shirabe/src/plugin/command_event.rs b/crates/shirabe/src/plugin/command_event.rs index afd93fbb..55fe9052 100644 --- a/crates/shirabe/src/plugin/command_event.rs +++ b/crates/shirabe/src/plugin/command_event.rs @@ -3,9 +3,9 @@ use crate::event_dispatcher::Event; use crate::event_dispatcher::EventInterface; use indexmap::IndexMap; -use shirabe_external_packages::symfony::console::input::InputInterface; -use shirabe_external_packages::symfony::console::output::OutputInterface; use shirabe_php_shim::PhpMixed; +use shirabe_symfony_console::input::InputInterface; +use shirabe_symfony_console::output::OutputInterface; #[derive(Debug)] pub struct CommandEvent { diff --git a/crates/shirabe/src/plugin/php_plugin_proxy.rs b/crates/shirabe/src/plugin/php_plugin_proxy.rs index af9d04db..715a21dd 100644 --- a/crates/shirabe/src/plugin/php_plugin_proxy.rs +++ b/crates/shirabe/src/plugin/php_plugin_proxy.rs @@ -28,14 +28,14 @@ use crate::repository::{ RepositoryInterfaceHandle, RepositoryManagerInterface, }; use indexmap::IndexMap; -use shirabe_external_packages::symfony::console::command::command::Command; -use shirabe_external_packages::symfony::console::input::InputInterface; -use shirabe_external_packages::symfony::console::output::OutputInterface; use shirabe_php_rpc::{ PhpObjHandle, PhpThrow, PluginValue, RustMethodDispatcher, RustObjHandle, call_function_with_dispatcher, call_php_method, release_php_handle, }; use shirabe_php_shim::PhpMixed; +use shirabe_symfony_console::command::command::Command; +use shirabe_symfony_console::input::InputInterface; +use shirabe_symfony_console::output::OutputInterface; /// A Rust-side entity a PHP proxy stub points back to. #[derive(Debug, Clone)] @@ -2901,11 +2901,9 @@ impl PhpCommandProxy { handle: &PhpObjHandle, data: &crate::command::BaseCommandData, ) -> anyhow::Result<()> { - use shirabe_external_packages::symfony::console::input::input_argument::InputArgument; - use shirabe_external_packages::symfony::console::input::input_definition::{ - DefinitionItem, InputDefinition, - }; - use shirabe_external_packages::symfony::console::input::input_option::InputOption; + use shirabe_symfony_console::input::input_argument::InputArgument; + use shirabe_symfony_console::input::input_definition::{DefinitionItem, InputDefinition}; + use shirabe_symfony_console::input::input_option::InputOption; let value = unwrap_php_result(call_function_with_dispatcher( "__shirabe_read_command_definition", @@ -3010,7 +3008,7 @@ impl PhpCommandProxy { )?)); } data.command_data().set_definition( - shirabe_external_packages::symfony::console::command::command::SetDefinitionArg::Definition( + shirabe_symfony_console::command::command::SetDefinitionArg::Definition( InputDefinition::new(items)?, ), ); @@ -3105,7 +3103,7 @@ impl Command for PhpCommandProxy { self.proxy_command } - shirabe_external_packages::delegate_command_trait_impls_to_inner!(base_command_data); + shirabe_symfony_console::delegate_command_trait_impls_to_inner!(base_command_data); } impl BaseCommand for PhpCommandProxy { diff --git a/crates/shirabe/src/plugin/pre_command_run_event.rs b/crates/shirabe/src/plugin/pre_command_run_event.rs index 50a182b6..23728e4c 100644 --- a/crates/shirabe/src/plugin/pre_command_run_event.rs +++ b/crates/shirabe/src/plugin/pre_command_run_event.rs @@ -4,8 +4,8 @@ use crate::event_dispatcher::Event; use crate::event_dispatcher::EventInterface; use indexmap::IndexMap; -use shirabe_external_packages::symfony::console::input::InputInterface; use shirabe_php_shim::PhpMixed; +use shirabe_symfony_console::input::InputInterface; #[derive(Debug)] pub struct PreCommandRunEvent { -- cgit v1.3.1-4-g156e