diff options
| author | nsfisis <nsfisis@gmail.com> | 2026-08-10 04:38:35 +0900 |
|---|---|---|
| committer | nsfisis <nsfisis@gmail.com> | 2026-08-10 04:38:35 +0900 |
| commit | 9d9da0d1512202af7802d13b1c3c33a1a077a84e (patch) | |
| tree | abe363b266a61da1713c6a16702b84ea68c70882 /crates/shirabe/tests | |
| parent | f38080643d80b258393f2b7ab20349b122fe4591 (diff) | |
| download | php-shirabe-9d9da0d1512202af7802d13b1c3c33a1a077a84e.tar.gz php-shirabe-9d9da0d1512202af7802d13b1c3c33a1a077a84e.tar.zst php-shirabe-9d9da0d1512202af7802d13b1c3c33a1a077a84e.zip | |
refactor(symfony): hide leaf modules behind their parent re-exports
Every parent module in the symfony-* crates already re-exported its leaf
modules with `pub use`, so each item was reachable by two paths. Make the
leaf modules private and route all callers through the single re-exported
path.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Diffstat (limited to 'crates/shirabe/tests')
| -rw-r--r-- | crates/shirabe/tests/application_test.rs | 8 | ||||
| -rw-r--r-- | crates/shirabe/tests/command/archive_command_test.rs | 6 | ||||
| -rw-r--r-- | crates/shirabe/tests/common/test_case.rs | 14 | ||||
| -rw-r--r-- | crates/shirabe/tests/completion_functional_test.rs | 2 | ||||
| -rw-r--r-- | crates/shirabe/tests/documentation_test.rs | 2 | ||||
| -rw-r--r-- | crates/shirabe/tests/installer_test.rs | 16 | ||||
| -rw-r--r-- | crates/shirabe/tests/io/buffer_io_test.rs | 2 | ||||
| -rw-r--r-- | crates/shirabe/tests/io/console_io_test.rs | 14 | ||||
| -rw-r--r-- | crates/shirabe/tests/plugin/plugin_installer_test.rs | 2 | ||||
| -rw-r--r-- | crates/shirabe/tests/question/strict_confirmation_question_test.rs | 10 | ||||
| -rw-r--r-- | crates/shirabe/tests/util/http_downloader_test.rs | 2 | ||||
| -rw-r--r-- | crates/shirabe/tests/util/process_executor_test.rs | 10 |
12 files changed, 43 insertions, 45 deletions
diff --git a/crates/shirabe/tests/application_test.rs b/crates/shirabe/tests/application_test.rs index f0bde547..257bc861 100644 --- a/crates/shirabe/tests/application_test.rs +++ b/crates/shirabe/tests/application_test.rs @@ -14,10 +14,10 @@ use shirabe::console::application::ApplicationHandle; use shirabe::util::platform::Platform; use shirabe_php_shim::{PHP_EOL, PHP_SERVER, PhpMixed, time}; use shirabe_symfony_console::command::Command; -use shirabe_symfony_console::input::array_input::ArrayInput; -use shirabe_symfony_console::input::input_interface::InputInterface; -use shirabe_symfony_console::output::buffered_output::BufferedOutput; -use shirabe_symfony_console::output::output_interface::OutputInterface; +use shirabe_symfony_console::input::ArrayInput; +use shirabe_symfony_console::input::InputInterface; +use shirabe_symfony_console::output::BufferedOutput; +use shirabe_symfony_console::output::OutputInterface; fn set_up() { Platform::put_env("COMPOSER_DISABLE_XDEBUG_WARN", "1"); diff --git a/crates/shirabe/tests/command/archive_command_test.rs b/crates/shirabe/tests/command/archive_command_test.rs index ac1ad462..90e13e5d 100644 --- a/crates/shirabe/tests/command/archive_command_test.rs +++ b/crates/shirabe/tests/command/archive_command_test.rs @@ -17,11 +17,11 @@ use shirabe::repository::{ use shirabe::util::Platform; use shirabe_php_shim::PhpMixed; use shirabe_semver::VersionParser; -use shirabe_symfony_console::command::command::Command; +use shirabe_symfony_console::command::Command; +use shirabe_symfony_console::input::ArrayInput; use shirabe_symfony_console::input::InputInterface; -use shirabe_symfony_console::input::array_input::ArrayInput; +use shirabe_symfony_console::output::BufferedOutput; use shirabe_symfony_console::output::OutputInterface; -use shirabe_symfony_console::output::buffered_output::BufferedOutput; // PHP mocks `Composer\Package\Archiver\ArchiveManager` with // getMockBuilder(...)->disableOriginalConstructor(). diff --git a/crates/shirabe/tests/common/test_case.rs b/crates/shirabe/tests/common/test_case.rs index e15d2883..9de7d905 100644 --- a/crates/shirabe/tests/common/test_case.rs +++ b/crates/shirabe/tests/common/test_case.rs @@ -24,13 +24,13 @@ use shirabe::util::process_executor::ProcessExecutor; use shirabe_php_shim::{PhpMixed, PhpResource}; use shirabe_semver::VersionParser; use shirabe_semver::constraint::{AnyConstraint, SimpleConstraint}; -use shirabe_symfony_console::input::array_input::ArrayInput; -use shirabe_symfony_console::input::input_interface::InputInterface; -use shirabe_symfony_console::input::streamable_input_interface::StreamableInputInterface; -use shirabe_symfony_console::output::console_output::ConsoleOutput; -use shirabe_symfony_console::output::console_output_interface::ConsoleOutputInterface; -use shirabe_symfony_console::output::output_interface::OutputInterface; -use shirabe_symfony_console::output::stream_output::StreamOutput; +use shirabe_symfony_console::input::ArrayInput; +use shirabe_symfony_console::input::InputInterface; +use shirabe_symfony_console::input::StreamableInputInterface; +use shirabe_symfony_console::output::ConsoleOutput; +use shirabe_symfony_console::output::ConsoleOutputInterface; +use shirabe_symfony_console::output::OutputInterface; +use shirabe_symfony_console::output::StreamOutput; use std::path::PathBuf; use tempfile::TempDir; diff --git a/crates/shirabe/tests/completion_functional_test.rs b/crates/shirabe/tests/completion_functional_test.rs index 66f2f87b..6bbe955a 100644 --- a/crates/shirabe/tests/completion_functional_test.rs +++ b/crates/shirabe/tests/completion_functional_test.rs @@ -14,7 +14,7 @@ mod bootstrap; use serial_test::serial; use shirabe::console::application::{Application, ApplicationHandle}; -use shirabe_symfony_console::tester::command_completion_tester::CommandCompletionTester; +use shirabe_symfony_console::tester::CommandCompletionTester; struct RestoreCwd(std::path::PathBuf); diff --git a/crates/shirabe/tests/documentation_test.rs b/crates/shirabe/tests/documentation_test.rs index ad945aa3..33e5ec3f 100644 --- a/crates/shirabe/tests/documentation_test.rs +++ b/crates/shirabe/tests/documentation_test.rs @@ -2,7 +2,7 @@ use shirabe::console::application::ApplicationHandle; use shirabe_symfony_console::command::Command; -use shirabe_symfony_console::descriptor::application_description::ApplicationDescription; +use shirabe_symfony_console::descriptor::ApplicationDescription; fn get_command_name(command: &std::rc::Rc<std::cell::RefCell<dyn Command>>) -> String { let mut name = command.borrow().get_name().unwrap_or_default(); diff --git a/crates/shirabe/tests/installer_test.rs b/crates/shirabe/tests/installer_test.rs index 295d9250..b6d19b10 100644 --- a/crates/shirabe/tests/installer_test.rs +++ b/crates/shirabe/tests/installer_test.rs @@ -46,14 +46,14 @@ use shirabe_pcre::preg::Preg; use shirabe_php_shim::{PREG_SPLIT_DELIM_CAPTURE, PhpMixed, php_regex}; use shirabe_semver::VersionParser; use shirabe_semver::constraint::AnyConstraint; -use shirabe_symfony_console::command::command::Command as SymfonyCommand; -use shirabe_symfony_console::command::command::CommandData; -use shirabe_symfony_console::input::input_argument::InputArgument; -use shirabe_symfony_console::input::input_interface::InputInterface; -use shirabe_symfony_console::input::input_option::InputOption; -use shirabe_symfony_console::input::string_input::StringInput; -use shirabe_symfony_console::output::output_interface::{OutputInterface, VERBOSITY_NORMAL}; -use shirabe_symfony_console::output::stream_output::StreamOutput; +use shirabe_symfony_console::command::Command as SymfonyCommand; +use shirabe_symfony_console::command::CommandData; +use shirabe_symfony_console::input::InputArgument; +use shirabe_symfony_console::input::InputInterface; +use shirabe_symfony_console::input::InputOption; +use shirabe_symfony_console::input::StringInput; +use shirabe_symfony_console::output::StreamOutput; +use shirabe_symfony_console::output::{OutputInterface, VERBOSITY_NORMAL}; // removeDirectory of tempComposerHome (a path produced by the unported install pipeline) is not // ported; the cwd management (setUp's chdir(__DIR__) / tearDown's chdir($this->prevCwd)) and the diff --git a/crates/shirabe/tests/io/buffer_io_test.rs b/crates/shirabe/tests/io/buffer_io_test.rs index 5036a172..89c323c0 100644 --- a/crates/shirabe/tests/io/buffer_io_test.rs +++ b/crates/shirabe/tests/io/buffer_io_test.rs @@ -3,7 +3,7 @@ use shirabe::io::IOInterfaceImmutable; use shirabe::io::buffer_io::BufferIO; use shirabe_php_shim::PhpMixed; -use shirabe_symfony_console::output::output_interface::VERBOSITY_NORMAL; +use shirabe_symfony_console::output::VERBOSITY_NORMAL; #[test] fn test_set_user_inputs() { diff --git a/crates/shirabe/tests/io/console_io_test.rs b/crates/shirabe/tests/io/console_io_test.rs index c3240ea5..3c142cfe 100644 --- a/crates/shirabe/tests/io/console_io_test.rs +++ b/crates/shirabe/tests/io/console_io_test.rs @@ -18,13 +18,13 @@ use shirabe::io::IOInterfaceMutable; use shirabe::io::io_interface::NORMAL; use shirabe_php_shim::PhpMixed; use shirabe_symfony_console::helper::QuestionHelper; -use shirabe_symfony_console::input::array_input::ArrayInput; -use shirabe_symfony_console::input::input_interface::InputInterface; -use shirabe_symfony_console::input::streamable_input_interface::StreamableInputInterface; -use shirabe_symfony_console::output::buffered_output::BufferedOutput; -use shirabe_symfony_console::output::console_output::ConsoleOutput; -use shirabe_symfony_console::output::console_output_interface::ConsoleOutputInterface; -use shirabe_symfony_console::output::output_interface::OutputInterface; +use shirabe_symfony_console::input::ArrayInput; +use shirabe_symfony_console::input::InputInterface; +use shirabe_symfony_console::input::StreamableInputInterface; +use shirabe_symfony_console::output::BufferedOutput; +use shirabe_symfony_console::output::ConsoleOutput; +use shirabe_symfony_console::output::ConsoleOutputInterface; +use shirabe_symfony_console::output::OutputInterface; /// Builds a ConsoleIO backed by real, side-effect-free Input/Output/QuestionHelper. PHP uses /// PHPUnit mocks here, but for tests that exercise only the authentication map they carry no diff --git a/crates/shirabe/tests/plugin/plugin_installer_test.rs b/crates/shirabe/tests/plugin/plugin_installer_test.rs index b713104e..0e1f01ee 100644 --- a/crates/shirabe/tests/plugin/plugin_installer_test.rs +++ b/crates/shirabe/tests/plugin/plugin_installer_test.rs @@ -35,7 +35,7 @@ use shirabe_php_rpc::PluginValue; use shirabe_php_shim::Catch as _; use shirabe_php_shim::PhpMixed; use shirabe_semver::VersionParser; -use shirabe_symfony_console::output::output_interface::VERBOSITY_NORMAL; +use shirabe_symfony_console::output::VERBOSITY_NORMAL; use shirabe_symfony_process::PhpExecutableFinder; use tempfile::TempDir; diff --git a/crates/shirabe/tests/question/strict_confirmation_question_test.rs b/crates/shirabe/tests/question/strict_confirmation_question_test.rs index 3e1ae72e..0c163c84 100644 --- a/crates/shirabe/tests/question/strict_confirmation_question_test.rs +++ b/crates/shirabe/tests/question/strict_confirmation_question_test.rs @@ -2,11 +2,11 @@ use shirabe::question::StrictConfirmationQuestion; use shirabe_php_shim::PhpMixed; -use shirabe_symfony_console::helper::question_helper::{QuestionHelper, QuestionHelperInterface}; -use shirabe_symfony_console::input::array_input::ArrayInput; -use shirabe_symfony_console::input::streamable_input_interface::StreamableInputInterface; -use shirabe_symfony_console::output::output_interface::OutputInterface; -use shirabe_symfony_console::output::stream_output::StreamOutput; +use shirabe_symfony_console::helper::{QuestionHelper, QuestionHelperInterface}; +use shirabe_symfony_console::input::ArrayInput; +use shirabe_symfony_console::input::StreamableInputInterface; +use shirabe_symfony_console::output::OutputInterface; +use shirabe_symfony_console::output::StreamOutput; const TRUE_ANSWER_REGEX: &str = "/^y(?:es)?$/i"; const FALSE_ANSWER_REGEX: &str = "/^no?$/i"; diff --git a/crates/shirabe/tests/util/http_downloader_test.rs b/crates/shirabe/tests/util/http_downloader_test.rs index fcbfd925..2c6ca10b 100644 --- a/crates/shirabe/tests/util/http_downloader_test.rs +++ b/crates/shirabe/tests/util/http_downloader_test.rs @@ -12,7 +12,7 @@ use shirabe::util::Platform; use shirabe::util::http_downloader::HttpDownloader; use shirabe_php_shim::Catch as _; use shirabe_php_shim::{PHP_EOL, PhpMixed}; -use shirabe_symfony_console::output::output_interface::VERBOSITY_NORMAL; +use shirabe_symfony_console::output::VERBOSITY_NORMAL; // PHP performs a live HTTP get to assert the URL's user:pass is captured via // setAuthentication. The credential capture happens in `add_job`, before any diff --git a/crates/shirabe/tests/util/process_executor_test.rs b/crates/shirabe/tests/util/process_executor_test.rs index b772c1bc..e1d8456b 100644 --- a/crates/shirabe/tests/util/process_executor_test.rs +++ b/crates/shirabe/tests/util/process_executor_test.rs @@ -10,12 +10,10 @@ use shirabe::io::buffer_io::BufferIO; use shirabe::util::process_executor::ProcessExecutor; use shirabe_php_shim::{PHP_EOL, ob_get_clean, ob_start, trim}; use shirabe_symfony_console::helper::QuestionHelper; -use shirabe_symfony_console::input::array_input::ArrayInput; -use shirabe_symfony_console::input::input_interface::InputInterface; -use shirabe_symfony_console::output::buffered_output::BufferedOutput; -use shirabe_symfony_console::output::output_interface::{ - OutputInterface, VERBOSITY_DEBUG, VERBOSITY_NORMAL, -}; +use shirabe_symfony_console::input::ArrayInput; +use shirabe_symfony_console::input::InputInterface; +use shirabe_symfony_console::output::BufferedOutput; +use shirabe_symfony_console::output::{OutputInterface, VERBOSITY_DEBUG, VERBOSITY_NORMAL}; #[test] fn test_execute_captures_output() { |
