diff options
| author | nsfisis <nsfisis@gmail.com> | 2026-06-08 02:23:31 +0900 |
|---|---|---|
| committer | nsfisis <nsfisis@gmail.com> | 2026-06-08 02:23:31 +0900 |
| commit | 06368584a9277022d9cfc42d22c37f4cc6e580f8 (patch) | |
| tree | a210e77273316ce94530391ea4e6dc4ee60b42ea /crates/shirabe/src | |
| parent | 318ea948f5932dfa7942081a269d62fd7161a9bf (diff) | |
| download | php-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/shirabe/src')
58 files changed, 154 insertions, 159 deletions
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, |
