aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authornsfisis <nsfisis@gmail.com>2026-08-09 11:19:03 +0900
committernsfisis <nsfisis@gmail.com>2026-08-09 11:19:03 +0900
commit6051927c8fa32cfffa102d2a170c5a6cf747a1b9 (patch)
tree3fe6769c90cb03ca8f1b9b825e38ad459182361e
parente3e8806aec771e482899ed3470e920f7b291fa95 (diff)
downloadphp-shirabe-6051927c8fa32cfffa102d2a170c5a6cf747a1b9.tar.gz
php-shirabe-6051927c8fa32cfffa102d2a170c5a6cf747a1b9.tar.zst
php-shirabe-6051927c8fa32cfffa102d2a170c5a6cf747a1b9.zip
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) <noreply@anthropic.com>
-rw-r--r--Cargo.lock14
-rw-r--r--Cargo.toml1
-rw-r--r--crates/shirabe-external-packages/src/lib.rs1
-rw-r--r--crates/shirabe-external-packages/src/symfony.rs1
-rw-r--r--crates/shirabe-symfony-console/Cargo.toml16
-rw-r--r--crates/shirabe-symfony-console/src/Resources/completion.bash (renamed from crates/shirabe-external-packages/src/symfony/console/Resources/completion.bash)0
-rw-r--r--crates/shirabe-symfony-console/src/application.rs (renamed from crates/shirabe-external-packages/src/symfony/console/application.rs)10
-rw-r--r--crates/shirabe-symfony-console/src/attribute.rs (renamed from crates/shirabe-external-packages/src/symfony/console/attribute.rs)0
-rw-r--r--crates/shirabe-symfony-console/src/attribute/as_command.rs (renamed from crates/shirabe-external-packages/src/symfony/console/attribute/as_command.rs)0
-rw-r--r--crates/shirabe-symfony-console/src/color.rs (renamed from crates/shirabe-external-packages/src/symfony/console/color.rs)2
-rw-r--r--crates/shirabe-symfony-console/src/command.rs (renamed from crates/shirabe-external-packages/src/symfony/console/command.rs)0
-rw-r--r--crates/shirabe-symfony-console/src/command/command.rs (renamed from crates/shirabe-external-packages/src/symfony/console/command/command.rs)60
-rw-r--r--crates/shirabe-symfony-console/src/command/complete_command.rs (renamed from crates/shirabe-external-packages/src/symfony/console/command/complete_command.rs)18
-rw-r--r--crates/shirabe-symfony-console/src/command/dump_completion_command.rs (renamed from crates/shirabe-external-packages/src/symfony/console/command/dump_completion_command.rs)16
-rw-r--r--crates/shirabe-symfony-console/src/command/help_command.rs (renamed from crates/shirabe-external-packages/src/symfony/console/command/help_command.rs)24
-rw-r--r--crates/shirabe-symfony-console/src/command/list_command.rs (renamed from crates/shirabe-external-packages/src/symfony/console/command/list_command.rs)24
-rw-r--r--crates/shirabe-symfony-console/src/command/signalable_command_interface.rs (renamed from crates/shirabe-external-packages/src/symfony/console/command/signalable_command_interface.rs)0
-rw-r--r--crates/shirabe-symfony-console/src/command_loader.rs (renamed from crates/shirabe-external-packages/src/symfony/console/command_loader.rs)0
-rw-r--r--crates/shirabe-symfony-console/src/command_loader/command_loader_interface.rs (renamed from crates/shirabe-external-packages/src/symfony/console/command_loader/command_loader_interface.rs)2
-rw-r--r--crates/shirabe-symfony-console/src/completion.rs (renamed from crates/shirabe-external-packages/src/symfony/console/completion.rs)0
-rw-r--r--crates/shirabe-symfony-console/src/completion/completion_input.rs (renamed from crates/shirabe-external-packages/src/symfony/console/completion/completion_input.rs)75
-rw-r--r--crates/shirabe-symfony-console/src/completion/completion_suggestions.rs (renamed from crates/shirabe-external-packages/src/symfony/console/completion/completion_suggestions.rs)4
-rw-r--r--crates/shirabe-symfony-console/src/completion/output.rs (renamed from crates/shirabe-external-packages/src/symfony/console/completion/output.rs)0
-rw-r--r--crates/shirabe-symfony-console/src/completion/output/bash_completion_output.rs (renamed from crates/shirabe-external-packages/src/symfony/console/completion/output/bash_completion_output.rs)6
-rw-r--r--crates/shirabe-symfony-console/src/completion/output/completion_output_interface.rs (renamed from crates/shirabe-external-packages/src/symfony/console/completion/output/completion_output_interface.rs)4
-rw-r--r--crates/shirabe-symfony-console/src/completion/suggestion.rs (renamed from crates/shirabe-external-packages/src/symfony/console/completion/suggestion.rs)0
-rw-r--r--crates/shirabe-symfony-console/src/cursor.rs (renamed from crates/shirabe-external-packages/src/symfony/console/cursor.rs)4
-rw-r--r--crates/shirabe-symfony-console/src/descriptor.rs (renamed from crates/shirabe-external-packages/src/symfony/console/descriptor.rs)0
-rw-r--r--crates/shirabe-symfony-console/src/descriptor/application_description.rs (renamed from crates/shirabe-external-packages/src/symfony/console/descriptor/application_description.rs)6
-rw-r--r--crates/shirabe-symfony-console/src/descriptor/descriptor.rs (renamed from crates/shirabe-external-packages/src/symfony/console/descriptor/descriptor.rs)20
-rw-r--r--crates/shirabe-symfony-console/src/descriptor/descriptor_interface.rs (renamed from crates/shirabe-external-packages/src/symfony/console/descriptor/descriptor_interface.rs)12
-rw-r--r--crates/shirabe-symfony-console/src/descriptor/json_descriptor.rs (renamed from crates/shirabe-external-packages/src/symfony/console/descriptor/json_descriptor.rs)20
-rw-r--r--crates/shirabe-symfony-console/src/descriptor/markdown_descriptor.rs (renamed from crates/shirabe-external-packages/src/symfony/console/descriptor/markdown_descriptor.rs)26
-rw-r--r--crates/shirabe-symfony-console/src/descriptor/text_descriptor.rs (renamed from crates/shirabe-external-packages/src/symfony/console/descriptor/text_descriptor.rs)24
-rw-r--r--crates/shirabe-symfony-console/src/descriptor/xml_descriptor.rs (renamed from crates/shirabe-external-packages/src/symfony/console/descriptor/xml_descriptor.rs)20
-rw-r--r--crates/shirabe-symfony-console/src/exception.rs (renamed from crates/shirabe-external-packages/src/symfony/console/exception.rs)0
-rw-r--r--crates/shirabe-symfony-console/src/exception/command_not_found_exception.rs (renamed from crates/shirabe-external-packages/src/symfony/console/exception/command_not_found_exception.rs)0
-rw-r--r--crates/shirabe-symfony-console/src/exception/exception_interface.rs (renamed from crates/shirabe-external-packages/src/symfony/console/exception/exception_interface.rs)0
-rw-r--r--crates/shirabe-symfony-console/src/exception/invalid_argument_exception.rs (renamed from crates/shirabe-external-packages/src/symfony/console/exception/invalid_argument_exception.rs)0
-rw-r--r--crates/shirabe-symfony-console/src/exception/invalid_option_exception.rs (renamed from crates/shirabe-external-packages/src/symfony/console/exception/invalid_option_exception.rs)0
-rw-r--r--crates/shirabe-symfony-console/src/exception/logic_exception.rs (renamed from crates/shirabe-external-packages/src/symfony/console/exception/logic_exception.rs)0
-rw-r--r--crates/shirabe-symfony-console/src/exception/missing_input_exception.rs (renamed from crates/shirabe-external-packages/src/symfony/console/exception/missing_input_exception.rs)0
-rw-r--r--crates/shirabe-symfony-console/src/exception/namespace_not_found_exception.rs (renamed from crates/shirabe-external-packages/src/symfony/console/exception/namespace_not_found_exception.rs)0
-rw-r--r--crates/shirabe-symfony-console/src/exception/runtime_exception.rs (renamed from crates/shirabe-external-packages/src/symfony/console/exception/runtime_exception.rs)0
-rw-r--r--crates/shirabe-symfony-console/src/formatter.rs (renamed from crates/shirabe-external-packages/src/symfony/console/formatter.rs)0
-rw-r--r--crates/shirabe-symfony-console/src/formatter/output_formatter.rs (renamed from crates/shirabe-external-packages/src/symfony/console/formatter/output_formatter.rs)12
-rw-r--r--crates/shirabe-symfony-console/src/formatter/output_formatter_interface.rs (renamed from crates/shirabe-external-packages/src/symfony/console/formatter/output_formatter_interface.rs)2
-rw-r--r--crates/shirabe-symfony-console/src/formatter/output_formatter_style.rs (renamed from crates/shirabe-external-packages/src/symfony/console/formatter/output_formatter_style.rs)4
-rw-r--r--crates/shirabe-symfony-console/src/formatter/output_formatter_style_interface.rs (renamed from crates/shirabe-external-packages/src/symfony/console/formatter/output_formatter_style_interface.rs)0
-rw-r--r--crates/shirabe-symfony-console/src/formatter/output_formatter_style_stack.rs (renamed from crates/shirabe-external-packages/src/symfony/console/formatter/output_formatter_style_stack.rs)6
-rw-r--r--crates/shirabe-symfony-console/src/formatter/wrappable_output_formatter_interface.rs (renamed from crates/shirabe-external-packages/src/symfony/console/formatter/wrappable_output_formatter_interface.rs)2
-rw-r--r--crates/shirabe-symfony-console/src/helper.rs (renamed from crates/shirabe-external-packages/src/symfony/console/helper.rs)0
-rw-r--r--crates/shirabe-symfony-console/src/helper/debug_formatter_helper.rs (renamed from crates/shirabe-external-packages/src/symfony/console/helper/debug_formatter_helper.rs)6
-rw-r--r--crates/shirabe-symfony-console/src/helper/descriptor_helper.rs (renamed from crates/shirabe-external-packages/src/symfony/console/helper/descriptor_helper.rs)22
-rw-r--r--crates/shirabe-symfony-console/src/helper/formatter_helper.rs (renamed from crates/shirabe-external-packages/src/symfony/console/helper/formatter_helper.rs)8
-rw-r--r--crates/shirabe-symfony-console/src/helper/helper.rs (renamed from crates/shirabe-external-packages/src/symfony/console/helper/helper.rs)4
-rw-r--r--crates/shirabe-symfony-console/src/helper/helper_interface.rs (renamed from crates/shirabe-external-packages/src/symfony/console/helper/helper_interface.rs)2
-rw-r--r--crates/shirabe-symfony-console/src/helper/helper_set.rs (renamed from crates/shirabe-external-packages/src/symfony/console/helper/helper_set.rs)10
-rw-r--r--crates/shirabe-symfony-console/src/helper/process_helper.rs (renamed from crates/shirabe-external-packages/src/symfony/console/helper/process_helper.rs)16
-rw-r--r--crates/shirabe-symfony-console/src/helper/progress_bar.rs (renamed from crates/shirabe-external-packages/src/symfony/console/helper/progress_bar.rs)18
-rw-r--r--crates/shirabe-symfony-console/src/helper/question_helper.rs (renamed from crates/shirabe-external-packages/src/symfony/console/helper/question_helper.rs)36
-rw-r--r--crates/shirabe-symfony-console/src/helper/symfony_question_helper.rs (renamed from crates/shirabe-external-packages/src/symfony/console/helper/symfony_question_helper.rs)14
-rw-r--r--crates/shirabe-symfony-console/src/helper/table.rs (renamed from crates/shirabe-external-packages/src/symfony/console/helper/table.rs)28
-rw-r--r--crates/shirabe-symfony-console/src/helper/table_cell.rs (renamed from crates/shirabe-external-packages/src/symfony/console/helper/table_cell.rs)4
-rw-r--r--crates/shirabe-symfony-console/src/helper/table_cell_style.rs (renamed from crates/shirabe-external-packages/src/symfony/console/helper/table_cell_style.rs)2
-rw-r--r--crates/shirabe-symfony-console/src/helper/table_rows.rs (renamed from crates/shirabe-external-packages/src/symfony/console/helper/table_rows.rs)2
-rw-r--r--crates/shirabe-symfony-console/src/helper/table_separator.rs (renamed from crates/shirabe-external-packages/src/symfony/console/helper/table_separator.rs)7
-rw-r--r--crates/shirabe-symfony-console/src/helper/table_style.rs (renamed from crates/shirabe-external-packages/src/symfony/console/helper/table_style.rs)4
-rw-r--r--crates/shirabe-symfony-console/src/input.rs (renamed from crates/shirabe-external-packages/src/symfony/console/input.rs)0
-rw-r--r--crates/shirabe-symfony-console/src/input/argv_input.rs (renamed from crates/shirabe-external-packages/src/symfony/console/input/argv_input.rs)10
-rw-r--r--crates/shirabe-symfony-console/src/input/array_input.rs (renamed from crates/shirabe-external-packages/src/symfony/console/input/array_input.rs)12
-rw-r--r--crates/shirabe-symfony-console/src/input/input.rs (renamed from crates/shirabe-external-packages/src/symfony/console/input/input.rs)6
-rw-r--r--crates/shirabe-symfony-console/src/input/input_argument.rs (renamed from crates/shirabe-external-packages/src/symfony/console/input/input_argument.rs)4
-rw-r--r--crates/shirabe-symfony-console/src/input/input_aware_interface.rs (renamed from crates/shirabe-external-packages/src/symfony/console/input/input_aware_interface.rs)2
-rw-r--r--crates/shirabe-symfony-console/src/input/input_definition.rs (renamed from crates/shirabe-external-packages/src/symfony/console/input/input_definition.rs)8
-rw-r--r--crates/shirabe-symfony-console/src/input/input_interface.rs (renamed from crates/shirabe-external-packages/src/symfony/console/input/input_interface.rs)4
-rw-r--r--crates/shirabe-symfony-console/src/input/input_option.rs (renamed from crates/shirabe-external-packages/src/symfony/console/input/input_option.rs)4
-rw-r--r--crates/shirabe-symfony-console/src/input/streamable_input_interface.rs (renamed from crates/shirabe-external-packages/src/symfony/console/input/streamable_input_interface.rs)2
-rw-r--r--crates/shirabe-symfony-console/src/input/string_input.rs (renamed from crates/shirabe-external-packages/src/symfony/console/input/string_input.rs)10
-rw-r--r--crates/shirabe-symfony-console/src/lib.rs (renamed from crates/shirabe-external-packages/src/symfony/console.rs)0
-rw-r--r--crates/shirabe-symfony-console/src/output.rs (renamed from crates/shirabe-external-packages/src/symfony/console/output.rs)0
-rw-r--r--crates/shirabe-symfony-console/src/output/buffered_output.rs (renamed from crates/shirabe-external-packages/src/symfony/console/output/buffered_output.rs)6
-rw-r--r--crates/shirabe-symfony-console/src/output/console_output.rs (renamed from crates/shirabe-external-packages/src/symfony/console/output/console_output.rs)12
-rw-r--r--crates/shirabe-symfony-console/src/output/console_output_interface.rs (renamed from crates/shirabe-external-packages/src/symfony/console/output/console_output_interface.rs)4
-rw-r--r--crates/shirabe-symfony-console/src/output/console_section_output.rs (renamed from crates/shirabe-external-packages/src/symfony/console/output/console_section_output.rs)17
-rw-r--r--crates/shirabe-symfony-console/src/output/output.rs (renamed from crates/shirabe-external-packages/src/symfony/console/output/output.rs)6
-rw-r--r--crates/shirabe-symfony-console/src/output/output_interface.rs (renamed from crates/shirabe-external-packages/src/symfony/console/output/output_interface.rs)6
-rw-r--r--crates/shirabe-symfony-console/src/output/stream_output.rs (renamed from crates/shirabe-external-packages/src/symfony/console/output/stream_output.rs)10
-rw-r--r--crates/shirabe-symfony-console/src/output/trimmed_buffer_output.rs (renamed from crates/shirabe-external-packages/src/symfony/console/output/trimmed_buffer_output.rs)8
-rw-r--r--crates/shirabe-symfony-console/src/question.rs (renamed from crates/shirabe-external-packages/src/symfony/console/question.rs)0
-rw-r--r--crates/shirabe-symfony-console/src/question/choice_question.rs (renamed from crates/shirabe-external-packages/src/symfony/console/question/choice_question.rs)8
-rw-r--r--crates/shirabe-symfony-console/src/question/confirmation_question.rs (renamed from crates/shirabe-external-packages/src/symfony/console/question/confirmation_question.rs)6
-rw-r--r--crates/shirabe-symfony-console/src/question/question.rs (renamed from crates/shirabe-external-packages/src/symfony/console/question/question.rs)8
-rw-r--r--crates/shirabe-symfony-console/src/signal_registry.rs (renamed from crates/shirabe-external-packages/src/symfony/console/signal_registry.rs)0
-rw-r--r--crates/shirabe-symfony-console/src/signal_registry/signal_registry.rs (renamed from crates/shirabe-external-packages/src/symfony/console/signal_registry/signal_registry.rs)0
-rw-r--r--crates/shirabe-symfony-console/src/style.rs (renamed from crates/shirabe-external-packages/src/symfony/console/style.rs)0
-rw-r--r--crates/shirabe-symfony-console/src/style/output_style.rs (renamed from crates/shirabe-external-packages/src/symfony/console/style/output_style.rs)17
-rw-r--r--crates/shirabe-symfony-console/src/style/style_interface.rs (renamed from crates/shirabe-external-packages/src/symfony/console/style/style_interface.rs)0
-rw-r--r--crates/shirabe-symfony-console/src/style/symfony_style.rs (renamed from crates/shirabe-external-packages/src/symfony/console/style/symfony_style.rs)56
-rw-r--r--crates/shirabe-symfony-console/src/terminal.rs (renamed from crates/shirabe-external-packages/src/symfony/console/terminal.rs)0
-rw-r--r--crates/shirabe-symfony-console/src/tester.rs (renamed from crates/shirabe-external-packages/src/symfony/console/tester.rs)0
-rw-r--r--crates/shirabe-symfony-console/src/tester/command_completion_tester.rs (renamed from crates/shirabe-external-packages/src/symfony/console/tester/command_completion_tester.rs)6
-rw-r--r--crates/shirabe/Cargo.toml1
-rw-r--r--crates/shirabe/src/advisory/auditor.rs2
-rw-r--r--crates/shirabe/src/autoload/autoload_generator.rs2
-rw-r--r--crates/shirabe/src/command/about_command.rs12
-rw-r--r--crates/shirabe/src/command/archive_command.rs12
-rw-r--r--crates/shirabe/src/command/audit_command.rs12
-rw-r--r--crates/shirabe/src/command/base_command.rs72
-rw-r--r--crates/shirabe/src/command/base_config_command.rs4
-rw-r--r--crates/shirabe/src/command/base_dependency_command.rs10
-rw-r--r--crates/shirabe/src/command/bump_command.rs12
-rw-r--r--crates/shirabe/src/command/check_platform_reqs_command.rs12
-rw-r--r--crates/shirabe/src/command/clear_cache_command.rs12
-rw-r--r--crates/shirabe/src/command/config_command.rs16
-rw-r--r--crates/shirabe/src/command/create_project_command.rs12
-rw-r--r--crates/shirabe/src/command/depends_command.rs12
-rw-r--r--crates/shirabe/src/command/diagnose_command.rs21
-rw-r--r--crates/shirabe/src/command/dump_autoload_command.rs12
-rw-r--r--crates/shirabe/src/command/exec_command.rs15
-rw-r--r--crates/shirabe/src/command/fund_command.rs14
-rw-r--r--crates/shirabe/src/command/global_command.rs22
-rw-r--r--crates/shirabe/src/command/home_command.rs12
-rw-r--r--crates/shirabe/src/command/init_command.rs16
-rw-r--r--crates/shirabe/src/command/install_command.rs12
-rw-r--r--crates/shirabe/src/command/licenses_command.rs20
-rw-r--r--crates/shirabe/src/command/outdated_command.rs14
-rw-r--r--crates/shirabe/src/command/package_discovery_trait.rs4
-rw-r--r--crates/shirabe/src/command/prohibits_command.rs12
-rw-r--r--crates/shirabe/src/command/reinstall_command.rs12
-rw-r--r--crates/shirabe/src/command/remove_command.rs14
-rw-r--r--crates/shirabe/src/command/repository_command.rs16
-rw-r--r--crates/shirabe/src/command/require_command.rs12
-rw-r--r--crates/shirabe/src/command/run_script_command.rs16
-rw-r--r--crates/shirabe/src/command/script_alias_command.rs12
-rw-r--r--crates/shirabe/src/command/search_command.rs14
-rw-r--r--crates/shirabe/src/command/self_update_command.rs12
-rw-r--r--crates/shirabe/src/command/show_command.rs16
-rw-r--r--crates/shirabe/src/command/status_command.rs12
-rw-r--r--crates/shirabe/src/command/suggests_command.rs12
-rw-r--r--crates/shirabe/src/command/update_command.rs14
-rw-r--r--crates/shirabe/src/command/validate_command.rs12
-rw-r--r--crates/shirabe/src/console/application.rs86
-rw-r--r--crates/shirabe/src/console/html_output_formatter.rs6
-rw-r--r--crates/shirabe/src/console/input.rs8
-rw-r--r--crates/shirabe/src/console/input/input_argument.rs6
-rw-r--r--crates/shirabe/src/console/input/input_option.rs6
-rw-r--r--crates/shirabe/src/dependency_resolver/problem.rs2
-rw-r--r--crates/shirabe/src/event_dispatcher/event_dispatcher.rs2
-rw-r--r--crates/shirabe/src/factory.rs10
-rw-r--r--crates/shirabe/src/installer/suggested_packages_reporter.rs2
-rw-r--r--crates/shirabe/src/io/buffer_io.rs12
-rw-r--r--crates/shirabe/src/io/console_io.rs30
-rw-r--r--crates/shirabe/src/lib.rs2
-rw-r--r--crates/shirabe/src/plugin/command_event.rs4
-rw-r--r--crates/shirabe/src/plugin/php_plugin_proxy.rs18
-rw-r--r--crates/shirabe/src/plugin/pre_command_run_event.rs2
-rw-r--r--crates/shirabe/src/question/strict_confirmation_question.rs6
-rw-r--r--crates/shirabe/src/util/loop.rs2
-rw-r--r--crates/shirabe/src/util/process_executor.rs2
-rw-r--r--crates/shirabe/tests/advisory/auditor_test.rs2
-rw-r--r--crates/shirabe/tests/application_test.rs10
-rw-r--r--crates/shirabe/tests/autoload/autoload_generator_test.rs2
-rw-r--r--crates/shirabe/tests/command/archive_command_test.rs10
-rw-r--r--crates/shirabe/tests/common/io_mock.rs2
-rw-r--r--crates/shirabe/tests/common/test_case.rs18
-rw-r--r--crates/shirabe/tests/completion_functional_test.rs5
-rw-r--r--crates/shirabe/tests/console/html_output_formatter_test.rs4
-rw-r--r--crates/shirabe/tests/documentation_test.rs4
-rw-r--r--crates/shirabe/tests/event_dispatcher/event_dispatcher_test.rs2
-rw-r--r--crates/shirabe/tests/installer_test.rs18
-rw-r--r--crates/shirabe/tests/io/buffer_io_test.rs2
-rw-r--r--crates/shirabe/tests/io/console_io_test.rs16
-rw-r--r--crates/shirabe/tests/package/version/version_selector_test.rs2
-rw-r--r--crates/shirabe/tests/plugin/plugin_installer_test.rs2
-rw-r--r--crates/shirabe/tests/question/strict_confirmation_question_test.rs12
-rw-r--r--crates/shirabe/tests/util/http_downloader_test.rs2
-rw-r--r--crates/shirabe/tests/util/process_executor_test.rs12
178 files changed, 833 insertions, 900 deletions
diff --git a/Cargo.lock b/Cargo.lock
index e05da218..6fab5780 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2104,6 +2104,7 @@ dependencies = [
"shirabe-php-shim",
"shirabe-semver",
"shirabe-spdx-licenses",
+ "shirabe-symfony-console",
"shirabe-symfony-filesystem",
"shirabe-symfony-finder",
"shirabe-symfony-process",
@@ -2221,6 +2222,19 @@ dependencies = [
]
[[package]]
+name = "shirabe-symfony-console"
+version = "0.0.1"
+dependencies = [
+ "anyhow",
+ "indexmap",
+ "regex",
+ "shirabe-pcre",
+ "shirabe-php-shim",
+ "shirabe-symfony-process",
+ "shirabe-symfony-string",
+]
+
+[[package]]
name = "shirabe-symfony-filesystem"
version = "0.0.1"
dependencies = [
diff --git a/Cargo.toml b/Cargo.toml
index dfc07f50..afe64563 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -17,6 +17,7 @@ shirabe-php-shim = { path = "crates/shirabe-php-shim" }
shirabe-php-src = { path = "crates/shirabe-php-src" }
shirabe-semver = { path = "crates/shirabe-semver" }
shirabe-spdx-licenses = { path = "crates/shirabe-spdx-licenses" }
+shirabe-symfony-console = { path = "crates/shirabe-symfony-console" }
shirabe-symfony-filesystem = { path = "crates/shirabe-symfony-filesystem" }
shirabe-symfony-finder = { path = "crates/shirabe-symfony-finder" }
shirabe-symfony-process = { path = "crates/shirabe-symfony-process" }
diff --git a/crates/shirabe-external-packages/src/lib.rs b/crates/shirabe-external-packages/src/lib.rs
index fffadfe6..2e52496a 100644
--- a/crates/shirabe-external-packages/src/lib.rs
+++ b/crates/shirabe-external-packages/src/lib.rs
@@ -1,3 +1,2 @@
pub mod composer;
pub mod seld;
-pub mod symfony;
diff --git a/crates/shirabe-external-packages/src/symfony.rs b/crates/shirabe-external-packages/src/symfony.rs
deleted file mode 100644
index 5b9849fd..00000000
--- a/crates/shirabe-external-packages/src/symfony.rs
+++ /dev/null
@@ -1 +0,0 @@
-pub mod console;
diff --git a/crates/shirabe-symfony-console/Cargo.toml b/crates/shirabe-symfony-console/Cargo.toml
new file mode 100644
index 00000000..93b18903
--- /dev/null
+++ b/crates/shirabe-symfony-console/Cargo.toml
@@ -0,0 +1,16 @@
+[package]
+name = "shirabe-symfony-console"
+version.workspace = true
+edition.workspace = true
+
+[dependencies]
+shirabe-pcre.workspace = true
+shirabe-php-shim.workspace = true
+shirabe-symfony-process.workspace = true
+shirabe-symfony-string.workspace = true
+anyhow.workspace = true
+indexmap.workspace = true
+regex.workspace = true
+
+[lints]
+workspace = true
diff --git a/crates/shirabe-external-packages/src/symfony/console/Resources/completion.bash b/crates/shirabe-symfony-console/src/Resources/completion.bash
index bb44037b..bb44037b 100644
--- a/crates/shirabe-external-packages/src/symfony/console/Resources/completion.bash
+++ b/crates/shirabe-symfony-console/src/Resources/completion.bash
diff --git a/crates/shirabe-external-packages/src/symfony/console/application.rs b/crates/shirabe-symfony-console/src/application.rs
index 03fb0ced..192649ef 100644
--- a/crates/shirabe-external-packages/src/symfony/console/application.rs
+++ b/crates/shirabe-symfony-console/src/application.rs
@@ -1,10 +1,10 @@
//! ref: composer/vendor/symfony/console/Application.php
-use crate::symfony::console::command::command::Command;
-use crate::symfony::console::completion::completion_input::CompletionInput;
-use crate::symfony::console::completion::completion_suggestions::CompletionSuggestions;
-use crate::symfony::console::helper::helper_set::HelperSet;
-use crate::symfony::console::input::input_definition::InputDefinition;
+use crate::command::command::Command;
+use crate::completion::completion_input::CompletionInput;
+use crate::completion::completion_suggestions::CompletionSuggestions;
+use crate::helper::helper_set::HelperSet;
+use crate::input::input_definition::InputDefinition;
use indexmap::IndexMap;
/// `Symfony\Component\Console\Application` is a concrete class in PHP, but it is ported here as a
diff --git a/crates/shirabe-external-packages/src/symfony/console/attribute.rs b/crates/shirabe-symfony-console/src/attribute.rs
index 241eb674..241eb674 100644
--- a/crates/shirabe-external-packages/src/symfony/console/attribute.rs
+++ b/crates/shirabe-symfony-console/src/attribute.rs
diff --git a/crates/shirabe-external-packages/src/symfony/console/attribute/as_command.rs b/crates/shirabe-symfony-console/src/attribute/as_command.rs
index 233e0b75..233e0b75 100644
--- a/crates/shirabe-external-packages/src/symfony/console/attribute/as_command.rs
+++ b/crates/shirabe-symfony-console/src/attribute/as_command.rs
diff --git a/crates/shirabe-external-packages/src/symfony/console/color.rs b/crates/shirabe-symfony-console/src/color.rs
index f1aa4332..13632b40 100644
--- a/crates/shirabe-external-packages/src/symfony/console/color.rs
+++ b/crates/shirabe-symfony-console/src/color.rs
@@ -1,6 +1,6 @@
//! ref: composer/vendor/symfony/console/Color.php
-use crate::symfony::console::exception::invalid_argument_exception::InvalidArgumentException;
+use crate::exception::invalid_argument_exception::InvalidArgumentException;
use indexmap::IndexMap;
const COLORS: [(&str, i64); 9] = [
diff --git a/crates/shirabe-external-packages/src/symfony/console/command.rs b/crates/shirabe-symfony-console/src/command.rs
index b17d7f5b..b17d7f5b 100644
--- a/crates/shirabe-external-packages/src/symfony/console/command.rs
+++ b/crates/shirabe-symfony-console/src/command.rs
diff --git a/crates/shirabe-external-packages/src/symfony/console/command/command.rs b/crates/shirabe-symfony-console/src/command/command.rs
index a1636848..f0d9dfe0 100644
--- a/crates/shirabe-external-packages/src/symfony/console/command/command.rs
+++ b/crates/shirabe-symfony-console/src/command/command.rs
@@ -1,15 +1,15 @@
//! ref: composer/vendor/symfony/console/Command/Command.php
-use crate::symfony::console::application::Application;
-use crate::symfony::console::completion::completion_input::CompletionInput;
-use crate::symfony::console::completion::completion_suggestions::CompletionSuggestions;
-use crate::symfony::console::exception::invalid_argument_exception::InvalidArgumentException;
-use crate::symfony::console::helper::helper_set::HelperSet;
-use crate::symfony::console::input::input_argument::InputArgument;
-use crate::symfony::console::input::input_definition::InputDefinition;
-use crate::symfony::console::input::input_interface::InputInterface;
-use crate::symfony::console::input::input_option::InputOption;
-use crate::symfony::console::output::output_interface::{self, OutputInterface};
+use crate::application::Application;
+use crate::completion::completion_input::CompletionInput;
+use crate::completion::completion_suggestions::CompletionSuggestions;
+use crate::exception::invalid_argument_exception::InvalidArgumentException;
+use crate::helper::helper_set::HelperSet;
+use crate::input::input_argument::InputArgument;
+use crate::input::input_definition::InputDefinition;
+use crate::input::input_interface::InputInterface;
+use crate::input::input_option::InputOption;
+use crate::output::output_interface::{self, OutputInterface};
use indexmap::IndexMap;
use shirabe_php_shim::{PhpMixed, php_regex};
use std::cell::{Cell, Ref};
@@ -241,7 +241,7 @@ impl CommandData {
/// argument/option instances or an InputDefinition.
#[derive(Debug)]
pub enum SetDefinitionArg {
- Array(Vec<crate::symfony::console::input::input_definition::DefinitionItem>),
+ Array(Vec<crate::input::input_definition::DefinitionItem>),
Definition(InputDefinition),
}
@@ -294,13 +294,13 @@ macro_rules! delegate_to_inner {
macro_rules! delegate_command_trait_impls_to_inner {
($field:ident) => {
$crate::delegate_to_inner!($field, fn is_enabled(&self) -> bool);
- $crate::delegate_to_inner!($field, fn set_application(&self, application: Option<std::rc::Rc<std::cell::RefCell<dyn $crate::symfony::console::application::Application>>>));
- $crate::delegate_to_inner!($field, fn get_application(&self) -> Option<std::rc::Rc<std::cell::RefCell<dyn $crate::symfony::console::application::Application>>>);
- $crate::delegate_to_inner!($field, fn set_helper_set(&self, helper_set: std::rc::Rc<std::cell::RefCell<$crate::symfony::console::helper::helper_set::HelperSet>>));
- $crate::delegate_to_inner!($field, fn get_helper_set(&self) -> Option<std::rc::Rc<std::cell::RefCell<$crate::symfony::console::helper::helper_set::HelperSet>>>);
+ $crate::delegate_to_inner!($field, fn set_application(&self, application: Option<std::rc::Rc<std::cell::RefCell<dyn $crate::application::Application>>>));
+ $crate::delegate_to_inner!($field, fn get_application(&self) -> Option<std::rc::Rc<std::cell::RefCell<dyn $crate::application::Application>>>);
+ $crate::delegate_to_inner!($field, fn set_helper_set(&self, helper_set: std::rc::Rc<std::cell::RefCell<$crate::helper::helper_set::HelperSet>>));
+ $crate::delegate_to_inner!($field, fn get_helper_set(&self) -> Option<std::rc::Rc<std::cell::RefCell<$crate::helper::helper_set::HelperSet>>>);
$crate::delegate_to_inner!($field, fn merge_application_definition(&self, merge_args: bool));
- $crate::delegate_to_inner!($field, fn get_definition(&self) -> std::cell::Ref<'_, $crate::symfony::console::input::input_definition::InputDefinition>);
- $crate::delegate_to_inner!($field, fn get_native_definition(&self) -> std::cell::Ref<'_, $crate::symfony::console::input::input_definition::InputDefinition>);
+ $crate::delegate_to_inner!($field, fn get_definition(&self) -> std::cell::Ref<'_, $crate::input::input_definition::InputDefinition>);
+ $crate::delegate_to_inner!($field, fn get_native_definition(&self) -> std::cell::Ref<'_, $crate::input::input_definition::InputDefinition>);
$crate::delegate_to_inner!($field, fn set_name(&self, name: &str) -> anyhow::Result<()>);
$crate::delegate_to_inner!($field, fn get_name(&self) -> Option<String>);
$crate::delegate_to_inner!($field, fn set_process_title(&self, title: &str));
@@ -317,9 +317,9 @@ macro_rules! delegate_command_trait_impls_to_inner {
$crate::delegate_to_inner!($field, fn get_synopsis(&self, short: bool) -> String);
$crate::delegate_to_inner!($field, fn add_usage(&self, usage: &str));
$crate::delegate_to_inner!($field, fn get_usages(&self) -> Vec<String>);
- $crate::delegate_to_inner!($field, fn get_helper(&self, name: &str) -> anyhow::Result<Result<shirabe_php_shim::PhpMixed, $crate::symfony::console::exception::logic_exception::LogicException>>);
- $crate::delegate_to_inner!($field, fn set_code(&self, code: Box<dyn Fn(&mut dyn $crate::symfony::console::input::InputInterface, &mut dyn $crate::symfony::console::output::OutputInterface) -> shirabe_php_shim::PhpMixed>));
- $crate::delegate_to_inner!($field, fn get_code(&self) -> std::cell::Ref<'_, Option<Box<dyn Fn(&mut dyn $crate::symfony::console::input::InputInterface, &mut dyn $crate::symfony::console::output::OutputInterface) -> shirabe_php_shim::PhpMixed>>>);
+ $crate::delegate_to_inner!($field, fn get_helper(&self, name: &str) -> anyhow::Result<Result<shirabe_php_shim::PhpMixed, $crate::exception::logic_exception::LogicException>>);
+ $crate::delegate_to_inner!($field, fn set_code(&self, code: Box<dyn Fn(&mut dyn $crate::input::InputInterface, &mut dyn $crate::output::OutputInterface) -> shirabe_php_shim::PhpMixed>));
+ $crate::delegate_to_inner!($field, fn get_code(&self) -> std::cell::Ref<'_, Option<Box<dyn Fn(&mut dyn $crate::input::InputInterface, &mut dyn $crate::output::OutputInterface) -> shirabe_php_shim::PhpMixed>>>);
$crate::delegate_to_inner!($field, fn ignore_validation_errors(&self));
$crate::delegate_to_inner!($field, fn get_ignore_validation_errors(&self) -> bool);
};
@@ -538,9 +538,7 @@ pub trait Command: std::fmt::Debug + shirabe_php_shim::AsAny + shirabe_php_shim:
fn get_helper(
&self,
name: &str,
- ) -> anyhow::Result<
- Result<PhpMixed, crate::symfony::console::exception::logic_exception::LogicException>,
- >;
+ ) -> anyhow::Result<Result<PhpMixed, crate::exception::logic_exception::LogicException>>;
fn set_code(
&self,
@@ -838,20 +836,16 @@ impl Command for CommandData {
fn get_helper(
&self,
name: &str,
- ) -> anyhow::Result<
- Result<PhpMixed, crate::symfony::console::exception::logic_exception::LogicException>,
- > {
+ ) -> anyhow::Result<Result<PhpMixed, crate::exception::logic_exception::LogicException>> {
let helper_set_ref = self.helper_set.borrow();
let helper_set = match &*helper_set_ref {
None => {
- return Ok(Err(
- crate::symfony::console::exception::logic_exception::LogicException::new(
- format!(
- "Cannot retrieve helper \"{}\" because there is no HelperSet defined. Did you forget to add your command to the application or to set the application on the command using the setApplication() method? You can also set the HelperSet directly using the setHelperSet() method.",
- name
- ),
+ return Ok(Err(crate::exception::logic_exception::LogicException::new(
+ format!(
+ "Cannot retrieve helper \"{}\" because there is no HelperSet defined. Did you forget to add your command to the application or to set the application on the command using the setApplication() method? You can also set the HelperSet directly using the setHelperSet() method.",
+ name
),
- ));
+ )));
}
Some(helper_set) => helper_set,
};
diff --git a/crates/shirabe-external-packages/src/symfony/console/command/complete_command.rs b/crates/shirabe-symfony-console/src/command/complete_command.rs
index 5854e248..3dad2609 100644
--- a/crates/shirabe-external-packages/src/symfony/console/command/complete_command.rs
+++ b/crates/shirabe-symfony-console/src/command/complete_command.rs
@@ -1,15 +1,13 @@
//! ref: composer/vendor/symfony/console/Command/CompleteCommand.php
-use crate::symfony::console::command::command::{Command, CommandData};
-use crate::symfony::console::completion::completion_input::CompletionInput;
-use crate::symfony::console::completion::completion_suggestions::{
- CompletionSuggestions, StringOrSuggestion,
-};
-use crate::symfony::console::completion::output::bash_completion_output::BashCompletionOutput;
-use crate::symfony::console::completion::output::completion_output_interface::CompletionOutputInterface;
-use crate::symfony::console::input::input_interface::InputInterface;
-use crate::symfony::console::input::input_option::InputOption;
-use crate::symfony::console::output::output_interface::OutputInterface;
+use crate::command::command::{Command, CommandData};
+use crate::completion::completion_input::CompletionInput;
+use crate::completion::completion_suggestions::{CompletionSuggestions, StringOrSuggestion};
+use crate::completion::output::bash_completion_output::BashCompletionOutput;
+use crate::completion::output::completion_output_interface::CompletionOutputInterface;
+use crate::input::input_interface::InputInterface;
+use crate::input::input_option::InputOption;
+use crate::output::output_interface::OutputInterface;
use indexmap::IndexMap;
use shirabe_php_shim::{PhpMixed, impl_php_class};
use std::ops::{Deref, DerefMut};
diff --git a/crates/shirabe-external-packages/src/symfony/console/command/dump_completion_command.rs b/crates/shirabe-symfony-console/src/command/dump_completion_command.rs
index cc46366c..efe116a9 100644
--- a/crates/shirabe-external-packages/src/symfony/console/command/dump_completion_command.rs
+++ b/crates/shirabe-symfony-console/src/command/dump_completion_command.rs
@@ -1,14 +1,12 @@
//! ref: composer/vendor/symfony/console/Command/DumpCompletionCommand.php
-use crate::symfony::console::command::command::{Command, CommandData};
-use crate::symfony::console::completion::completion_input::CompletionInput;
-use crate::symfony::console::completion::completion_suggestions::{
- CompletionSuggestions, StringOrSuggestion,
-};
-use crate::symfony::console::input::input_argument::InputArgument;
-use crate::symfony::console::input::input_interface::InputInterface;
-use crate::symfony::console::input::input_option::InputOption;
-use crate::symfony::console::output::output_interface::{self, OutputInterface};
+use crate::command::command::{Command, CommandData};
+use crate::completion::completion_input::CompletionInput;
+use crate::completion::completion_suggestions::{CompletionSuggestions, StringOrSuggestion};
+use crate::input::input_argument::InputArgument;
+use crate::input::input_interface::InputInterface;
+use crate::input::input_option::InputOption;
+use crate::output::output_interface::{self, OutputInterface};
use shirabe_php_shim::{PhpMixed, impl_php_class};
use shirabe_symfony_process::process::Process;
use std::ops::{Deref, DerefMut};
diff --git a/crates/shirabe-external-packages/src/symfony/console/command/help_command.rs b/crates/shirabe-symfony-console/src/command/help_command.rs
index d7a88422..9472d144 100644
--- a/crates/shirabe-external-packages/src/symfony/console/command/help_command.rs
+++ b/crates/shirabe-symfony-console/src/command/help_command.rs
@@ -1,18 +1,16 @@
//! ref: composer/vendor/symfony/console/Command/HelpCommand.php
-use crate::symfony::console::command::command::{Command, CommandData, SetDefinitionArg};
-use crate::symfony::console::completion::completion_input::CompletionInput;
-use crate::symfony::console::completion::completion_suggestions::{
- CompletionSuggestions, StringOrSuggestion,
-};
-use crate::symfony::console::descriptor::application_description::ApplicationDescription;
-use crate::symfony::console::descriptor::descriptor_interface::DescribableObject;
-use crate::symfony::console::helper::descriptor_helper::DescriptorHelper;
-use crate::symfony::console::input::input_argument::InputArgument;
-use crate::symfony::console::input::input_definition::DefinitionItem;
-use crate::symfony::console::input::input_interface::InputInterface;
-use crate::symfony::console::input::input_option::InputOption;
-use crate::symfony::console::output::output_interface::OutputInterface;
+use crate::command::command::{Command, CommandData, SetDefinitionArg};
+use crate::completion::completion_input::CompletionInput;
+use crate::completion::completion_suggestions::{CompletionSuggestions, StringOrSuggestion};
+use crate::descriptor::application_description::ApplicationDescription;
+use crate::descriptor::descriptor_interface::DescribableObject;
+use crate::helper::descriptor_helper::DescriptorHelper;
+use crate::input::input_argument::InputArgument;
+use crate::input::input_definition::DefinitionItem;
+use crate::input::input_interface::InputInterface;
+use crate::input::input_option::InputOption;
+use crate::output::output_interface::OutputInterface;
use shirabe_php_shim::{PhpMixed, impl_php_class};
use std::ops::{Deref, DerefMut};
diff --git a/crates/shirabe-external-packages/src/symfony/console/command/list_command.rs b/crates/shirabe-symfony-console/src/command/list_command.rs
index 1c1a2aab..fb0bb770 100644
--- a/crates/shirabe-external-packages/src/symfony/console/command/list_command.rs
+++ b/crates/shirabe-symfony-console/src/command/list_command.rs
@@ -1,18 +1,16 @@
//! ref: composer/vendor/symfony/console/Command/ListCommand.php
-use crate::symfony::console::command::command::{Command, CommandData, SetDefinitionArg};
-use crate::symfony::console::completion::completion_input::CompletionInput;
-use crate::symfony::console::completion::completion_suggestions::{
- CompletionSuggestions, StringOrSuggestion,
-};
-use crate::symfony::console::descriptor::application_description::ApplicationDescription;
-use crate::symfony::console::descriptor::descriptor_interface::DescribableObject;
-use crate::symfony::console::helper::descriptor_helper::DescriptorHelper;
-use crate::symfony::console::input::input_argument::InputArgument;
-use crate::symfony::console::input::input_definition::DefinitionItem;
-use crate::symfony::console::input::input_interface::InputInterface;
-use crate::symfony::console::input::input_option::InputOption;
-use crate::symfony::console::output::output_interface::OutputInterface;
+use crate::command::command::{Command, CommandData, SetDefinitionArg};
+use crate::completion::completion_input::CompletionInput;
+use crate::completion::completion_suggestions::{CompletionSuggestions, StringOrSuggestion};
+use crate::descriptor::application_description::ApplicationDescription;
+use crate::descriptor::descriptor_interface::DescribableObject;
+use crate::helper::descriptor_helper::DescriptorHelper;
+use crate::input::input_argument::InputArgument;
+use crate::input::input_definition::DefinitionItem;
+use crate::input::input_interface::InputInterface;
+use crate::input::input_option::InputOption;
+use crate::output::output_interface::OutputInterface;
use shirabe_php_shim::{PhpMixed, impl_php_class};
use std::ops::{Deref, DerefMut};
diff --git a/crates/shirabe-external-packages/src/symfony/console/command/signalable_command_interface.rs b/crates/shirabe-symfony-console/src/command/signalable_command_interface.rs
index 8777eb5e..8777eb5e 100644
--- a/crates/shirabe-external-packages/src/symfony/console/command/signalable_command_interface.rs
+++ b/crates/shirabe-symfony-console/src/command/signalable_command_interface.rs
diff --git a/crates/shirabe-external-packages/src/symfony/console/command_loader.rs b/crates/shirabe-symfony-console/src/command_loader.rs
index 97b3f541..97b3f541 100644
--- a/crates/shirabe-external-packages/src/symfony/console/command_loader.rs
+++ b/crates/shirabe-symfony-console/src/command_loader.rs
diff --git a/crates/shirabe-external-packages/src/symfony/console/command_loader/command_loader_interface.rs b/crates/shirabe-symfony-console/src/command_loader/command_loader_interface.rs
index 8cade1f3..22ed308d 100644
--- a/crates/shirabe-external-packages/src/symfony/console/command_loader/command_loader_interface.rs
+++ b/crates/shirabe-symfony-console/src/command_loader/command_loader_interface.rs
@@ -1,6 +1,6 @@
//! ref: composer/vendor/symfony/console/CommandLoader/CommandLoaderInterface.php
-use crate::symfony::console::command::command::Command;
+use crate::command::command::Command;
pub trait CommandLoaderInterface: std::fmt::Debug {
/// Loads a command.
diff --git a/crates/shirabe-external-packages/src/symfony/console/completion.rs b/crates/shirabe-symfony-console/src/completion.rs
index cb7f1d12..cb7f1d12 100644
--- a/crates/shirabe-external-packages/src/symfony/console/completion.rs
+++ b/crates/shirabe-symfony-console/src/completion.rs
diff --git a/crates/shirabe-external-packages/src/symfony/console/completion/completion_input.rs b/crates/shirabe-symfony-console/src/completion/completion_input.rs
index f8bddcee..b9785013 100644
--- a/crates/shirabe-external-packages/src/symfony/console/completion/completion_input.rs
+++ b/crates/shirabe-symfony-console/src/completion/completion_input.rs
@@ -1,8 +1,8 @@
//! ref: composer/vendor/symfony/console/Completion/CompletionInput.php
-use crate::symfony::console::input::argv_input::ArgvInput;
-use crate::symfony::console::input::input_definition::InputDefinition;
-use crate::symfony::console::input::input_option::InputOption;
+use crate::input::argv_input::ArgvInput;
+use crate::input::input_definition::InputDefinition;
+use crate::input::input_option::InputOption;
use shirabe_php_shim::{PhpMixed, php_regex};
/// An input specialized for shell completion.
@@ -281,12 +281,10 @@ impl CompletionInput {
/// PHP: `CompletionInput extends ArgvInput` — the inherited `InputInterface` surface,
/// forwarded to the embedded `ArgvInput`. `bind` dispatches to the specialized
/// `CompletionInput::bind` above, matching PHP's virtual dispatch.
-impl crate::symfony::console::input::input_interface::InputInterface for CompletionInput {
+impl crate::input::input_interface::InputInterface for CompletionInput {
fn dup(
&self,
- ) -> std::rc::Rc<
- std::cell::RefCell<dyn crate::symfony::console::input::input_interface::InputInterface>,
- > {
+ ) -> std::rc::Rc<std::cell::RefCell<dyn crate::input::input_interface::InputInterface>> {
std::rc::Rc::new(std::cell::RefCell::new(self.clone()))
}
@@ -299,7 +297,7 @@ impl crate::symfony::console::input::input_interface::InputInterface for Complet
}
fn has_parameter_option(&self, values: PhpMixed, only_params: bool) -> bool {
- crate::symfony::console::input::input_interface::InputInterface::has_parameter_option(
+ crate::input::input_interface::InputInterface::has_parameter_option(
&self.inner,
values,
only_params,
@@ -312,7 +310,7 @@ impl crate::symfony::console::input::input_interface::InputInterface for Complet
default: PhpMixed,
only_params: bool,
) -> PhpMixed {
- crate::symfony::console::input::input_interface::InputInterface::get_parameter_option(
+ crate::input::input_interface::InputInterface::get_parameter_option(
&self.inner,
values,
default,
@@ -325,88 +323,59 @@ impl crate::symfony::console::input::input_interface::InputInterface for Complet
}
fn validate(&mut self) -> anyhow::Result<()> {
- crate::symfony::console::input::input_interface::InputInterface::validate(&mut self.inner)
+ crate::input::input_interface::InputInterface::validate(&mut self.inner)
}
fn get_arguments(&self) -> indexmap::IndexMap<String, PhpMixed> {
- crate::symfony::console::input::input_interface::InputInterface::get_arguments(&self.inner)
+ crate::input::input_interface::InputInterface::get_arguments(&self.inner)
}
fn get_argument(&self, name: &str) -> anyhow::Result<PhpMixed> {
- crate::symfony::console::input::input_interface::InputInterface::get_argument(
- &self.inner,
- name,
- )
+ crate::input::input_interface::InputInterface::get_argument(&self.inner, name)
}
fn set_argument(&mut self, name: &str, value: PhpMixed) -> anyhow::Result<()> {
- crate::symfony::console::input::input_interface::InputInterface::set_argument(
- &mut self.inner,
- name,
- value,
- )
+ crate::input::input_interface::InputInterface::set_argument(&mut self.inner, name, value)
}
fn has_argument(&self, name: &str) -> bool {
- crate::symfony::console::input::input_interface::InputInterface::has_argument(
- &self.inner,
- name,
- )
+ crate::input::input_interface::InputInterface::has_argument(&self.inner, name)
}
fn get_options(&self) -> indexmap::IndexMap<String, PhpMixed> {
- crate::symfony::console::input::input_interface::InputInterface::get_options(&self.inner)
+ crate::input::input_interface::InputInterface::get_options(&self.inner)
}
fn get_option(&self, name: &str) -> anyhow::Result<PhpMixed> {
- crate::symfony::console::input::input_interface::InputInterface::get_option(
- &self.inner,
- name,
- )
+ crate::input::input_interface::InputInterface::get_option(&self.inner, name)
}
fn set_option(&mut self, name: &str, value: PhpMixed) -> anyhow::Result<()> {
- crate::symfony::console::input::input_interface::InputInterface::set_option(
- &mut self.inner,
- name,
- value,
- )
+ crate::input::input_interface::InputInterface::set_option(&mut self.inner, name, value)
}
fn has_option(&self, name: &str) -> bool {
- crate::symfony::console::input::input_interface::InputInterface::has_option(
- &self.inner,
- name,
- )
+ crate::input::input_interface::InputInterface::has_option(&self.inner, name)
}
fn is_interactive(&self) -> bool {
- crate::symfony::console::input::input_interface::InputInterface::is_interactive(&self.inner)
+ crate::input::input_interface::InputInterface::is_interactive(&self.inner)
}
fn set_interactive(&mut self, interactive: bool) {
- crate::symfony::console::input::input_interface::InputInterface::set_interactive(
- &mut self.inner,
- interactive,
- )
+ crate::input::input_interface::InputInterface::set_interactive(&mut self.inner, interactive)
}
fn as_streamable(
&self,
- ) -> Option<
- &dyn crate::symfony::console::input::streamable_input_interface::StreamableInputInterface,
- > {
- crate::symfony::console::input::input_interface::InputInterface::as_streamable(&self.inner)
+ ) -> Option<&dyn crate::input::streamable_input_interface::StreamableInputInterface> {
+ crate::input::input_interface::InputInterface::as_streamable(&self.inner)
}
fn as_streamable_mut(
&mut self,
- ) -> Option<
- &mut dyn crate::symfony::console::input::streamable_input_interface::StreamableInputInterface,
- >{
- crate::symfony::console::input::input_interface::InputInterface::as_streamable_mut(
- &mut self.inner,
- )
+ ) -> Option<&mut dyn crate::input::streamable_input_interface::StreamableInputInterface> {
+ crate::input::input_interface::InputInterface::as_streamable_mut(&mut self.inner)
}
}
diff --git a/crates/shirabe-external-packages/src/symfony/console/completion/completion_suggestions.rs b/crates/shirabe-symfony-console/src/completion/completion_suggestions.rs
index 02938552..dd9235ae 100644
--- a/crates/shirabe-external-packages/src/symfony/console/completion/completion_suggestions.rs
+++ b/crates/shirabe-symfony-console/src/completion/completion_suggestions.rs
@@ -1,7 +1,7 @@
//! ref: composer/vendor/symfony/console/Completion/CompletionSuggestions.php
-use crate::symfony::console::completion::suggestion::Suggestion;
-use crate::symfony::console::input::input_option::InputOption;
+use crate::completion::suggestion::Suggestion;
+use crate::input::input_option::InputOption;
/// PHP union type `string|Suggestion` used by `suggestValue`/`suggestValues`.
#[derive(Debug)]
diff --git a/crates/shirabe-external-packages/src/symfony/console/completion/output.rs b/crates/shirabe-symfony-console/src/completion/output.rs
index 6bb0a2e8..6bb0a2e8 100644
--- a/crates/shirabe-external-packages/src/symfony/console/completion/output.rs
+++ b/crates/shirabe-symfony-console/src/completion/output.rs
diff --git a/crates/shirabe-external-packages/src/symfony/console/completion/output/bash_completion_output.rs b/crates/shirabe-symfony-console/src/completion/output/bash_completion_output.rs
index a5c70bd5..3af69e7f 100644
--- a/crates/shirabe-external-packages/src/symfony/console/completion/output/bash_completion_output.rs
+++ b/crates/shirabe-symfony-console/src/completion/output/bash_completion_output.rs
@@ -1,8 +1,8 @@
//! ref: composer/vendor/symfony/console/Completion/Output/BashCompletionOutput.php
-use crate::symfony::console::completion::completion_suggestions::CompletionSuggestions;
-use crate::symfony::console::completion::output::completion_output_interface::CompletionOutputInterface;
-use crate::symfony::console::output::output_interface::OutputInterface;
+use crate::completion::completion_suggestions::CompletionSuggestions;
+use crate::completion::output::completion_output_interface::CompletionOutputInterface;
+use crate::output::output_interface::OutputInterface;
#[derive(Debug)]
pub struct BashCompletionOutput;
diff --git a/crates/shirabe-external-packages/src/symfony/console/completion/output/completion_output_interface.rs b/crates/shirabe-symfony-console/src/completion/output/completion_output_interface.rs
index b1a77e56..1965aa14 100644
--- a/crates/shirabe-external-packages/src/symfony/console/completion/output/completion_output_interface.rs
+++ b/crates/shirabe-symfony-console/src/completion/output/completion_output_interface.rs
@@ -1,7 +1,7 @@
//! ref: composer/vendor/symfony/console/Completion/Output/CompletionOutputInterface.php
-use crate::symfony::console::completion::completion_suggestions::CompletionSuggestions;
-use crate::symfony::console::output::output_interface::OutputInterface;
+use crate::completion::completion_suggestions::CompletionSuggestions;
+use crate::output::output_interface::OutputInterface;
/// Transforms the `CompletionSuggestions` object into output readable by the shell completion.
pub trait CompletionOutputInterface: std::fmt::Debug {
diff --git a/crates/shirabe-external-packages/src/symfony/console/completion/suggestion.rs b/crates/shirabe-symfony-console/src/completion/suggestion.rs
index a7db5c39..a7db5c39 100644
--- a/crates/shirabe-external-packages/src/symfony/console/completion/suggestion.rs
+++ b/crates/shirabe-symfony-console/src/completion/suggestion.rs
diff --git a/crates/shirabe-external-packages/src/symfony/console/cursor.rs b/crates/shirabe-symfony-console/src/cursor.rs
index 7b93f281..8eadbf27 100644
--- a/crates/shirabe-external-packages/src/symfony/console/cursor.rs
+++ b/crates/shirabe-symfony-console/src/cursor.rs
@@ -1,7 +1,7 @@
//! ref: composer/vendor/symfony/console/Cursor.php
-use crate::symfony::console::output::OutputInterface;
-use crate::symfony::console::output::output_interface;
+use crate::output::OutputInterface;
+use crate::output::output_interface;
#[derive(Debug)]
pub struct Cursor {
diff --git a/crates/shirabe-external-packages/src/symfony/console/descriptor.rs b/crates/shirabe-symfony-console/src/descriptor.rs
index 9f85f925..9f85f925 100644
--- a/crates/shirabe-external-packages/src/symfony/console/descriptor.rs
+++ b/crates/shirabe-symfony-console/src/descriptor.rs
diff --git a/crates/shirabe-external-packages/src/symfony/console/descriptor/application_description.rs b/crates/shirabe-symfony-console/src/descriptor/application_description.rs
index 62fc9933..d63f0be2 100644
--- a/crates/shirabe-external-packages/src/symfony/console/descriptor/application_description.rs
+++ b/crates/shirabe-symfony-console/src/descriptor/application_description.rs
@@ -1,8 +1,8 @@
//! ref: composer/vendor/symfony/console/Descriptor/ApplicationDescription.php
-use crate::symfony::console::application::Application;
-use crate::symfony::console::command::command::Command;
-use crate::symfony::console::exception::command_not_found_exception::CommandNotFoundException;
+use crate::application::Application;
+use crate::command::command::Command;
+use crate::exception::command_not_found_exception::CommandNotFoundException;
use indexmap::IndexMap;
use shirabe_php_shim::PhpMixed;
diff --git a/crates/shirabe-external-packages/src/symfony/console/descriptor/descriptor.rs b/crates/shirabe-symfony-console/src/descriptor/descriptor.rs
index 5055b49b..f3647d7c 100644
--- a/crates/shirabe-external-packages/src/symfony/console/descriptor/descriptor.rs
+++ b/crates/shirabe-symfony-console/src/descriptor/descriptor.rs
@@ -1,14 +1,12 @@
//! ref: composer/vendor/symfony/console/Descriptor/Descriptor.php
-use crate::symfony::console::application::Application;
-use crate::symfony::console::command::command::Command;
-use crate::symfony::console::descriptor::descriptor_interface::{
- DescribableObject, DescriptorInterface,
-};
-use crate::symfony::console::input::input_argument::InputArgument;
-use crate::symfony::console::input::input_definition::InputDefinition;
-use crate::symfony::console::input::input_option::InputOption;
-use crate::symfony::console::output::output_interface::OutputInterface;
+use crate::application::Application;
+use crate::command::command::Command;
+use crate::descriptor::descriptor_interface::{DescribableObject, DescriptorInterface};
+use crate::input::input_argument::InputArgument;
+use crate::input::input_definition::InputDefinition;
+use crate::input::input_option::InputOption;
+use crate::output::output_interface::OutputInterface;
use indexmap::IndexMap;
use shirabe_php_shim::PhpMixed;
@@ -55,9 +53,9 @@ pub trait Descriptor: DescriptorInterface {
&[content.to_string()],
false,
if decorated {
- crate::symfony::console::output::output_interface::OUTPUT_NORMAL
+ crate::output::output_interface::OUTPUT_NORMAL
} else {
- crate::symfony::console::output::output_interface::OUTPUT_RAW
+ crate::output::output_interface::OUTPUT_RAW
},
);
}
diff --git a/crates/shirabe-external-packages/src/symfony/console/descriptor/descriptor_interface.rs b/crates/shirabe-symfony-console/src/descriptor/descriptor_interface.rs
index be0e9ff7..c50c6a99 100644
--- a/crates/shirabe-external-packages/src/symfony/console/descriptor/descriptor_interface.rs
+++ b/crates/shirabe-symfony-console/src/descriptor/descriptor_interface.rs
@@ -1,11 +1,11 @@
//! ref: composer/vendor/symfony/console/Descriptor/DescriptorInterface.php
-use crate::symfony::console::application::Application;
-use crate::symfony::console::command::command::Command;
-use crate::symfony::console::input::input_argument::InputArgument;
-use crate::symfony::console::input::input_definition::InputDefinition;
-use crate::symfony::console::input::input_option::InputOption;
-use crate::symfony::console::output::output_interface::OutputInterface;
+use crate::application::Application;
+use crate::command::command::Command;
+use crate::input::input_argument::InputArgument;
+use crate::input::input_definition::InputDefinition;
+use crate::input::input_option::InputOption;
+use crate::output::output_interface::OutputInterface;
use indexmap::IndexMap;
use shirabe_php_shim::PhpMixed;
diff --git a/crates/shirabe-external-packages/src/symfony/console/descriptor/json_descriptor.rs b/crates/shirabe-symfony-console/src/descriptor/json_descriptor.rs
index 3232e6fa..983d5f08 100644
--- a/crates/shirabe-external-packages/src/symfony/console/descriptor/json_descriptor.rs
+++ b/crates/shirabe-symfony-console/src/descriptor/json_descriptor.rs
@@ -1,16 +1,14 @@
//! ref: composer/vendor/symfony/console/Descriptor/JsonDescriptor.php
-use crate::symfony::console::application::Application;
-use crate::symfony::console::command::command::Command;
-use crate::symfony::console::descriptor::application_description::ApplicationDescription;
-use crate::symfony::console::descriptor::descriptor::Descriptor;
-use crate::symfony::console::descriptor::descriptor_interface::{
- DescribableObject, DescriptorInterface,
-};
-use crate::symfony::console::input::input_argument::InputArgument;
-use crate::symfony::console::input::input_definition::InputDefinition;
-use crate::symfony::console::input::input_option::InputOption;
-use crate::symfony::console::output::output_interface::OutputInterface;
+use crate::application::Application;
+use crate::command::command::Command;
+use crate::descriptor::application_description::ApplicationDescription;
+use crate::descriptor::descriptor::Descriptor;
+use crate::descriptor::descriptor_interface::{DescribableObject, DescriptorInterface};
+use crate::input::input_argument::InputArgument;
+use crate::input::input_definition::InputDefinition;
+use crate::input::input_option::InputOption;
+use crate::output::output_interface::OutputInterface;
use indexmap::IndexMap;
use shirabe_pcre::preg::Preg;
use shirabe_php_shim::{PhpMixed, php_regex};
diff --git a/crates/shirabe-external-packages/src/symfony/console/descriptor/markdown_descriptor.rs b/crates/shirabe-symfony-console/src/descriptor/markdown_descriptor.rs
index 48514cfe..b64c2be0 100644
--- a/crates/shirabe-external-packages/src/symfony/console/descriptor/markdown_descriptor.rs
+++ b/crates/shirabe-symfony-console/src/descriptor/markdown_descriptor.rs
@@ -1,17 +1,15 @@
//! ref: composer/vendor/symfony/console/Descriptor/MarkdownDescriptor.php
-use crate::symfony::console::application::Application;
-use crate::symfony::console::command::command::Command;
-use crate::symfony::console::descriptor::application_description::ApplicationDescription;
-use crate::symfony::console::descriptor::descriptor::Descriptor;
-use crate::symfony::console::descriptor::descriptor_interface::{
- DescribableObject, DescriptorInterface,
-};
-use crate::symfony::console::helper::helper::Helper;
-use crate::symfony::console::input::input_argument::InputArgument;
-use crate::symfony::console::input::input_definition::InputDefinition;
-use crate::symfony::console::input::input_option::InputOption;
-use crate::symfony::console::output::output_interface::OutputInterface;
+use crate::application::Application;
+use crate::command::command::Command;
+use crate::descriptor::application_description::ApplicationDescription;
+use crate::descriptor::descriptor::Descriptor;
+use crate::descriptor::descriptor_interface::{DescribableObject, DescriptorInterface};
+use crate::helper::helper::Helper;
+use crate::input::input_argument::InputArgument;
+use crate::input::input_definition::InputDefinition;
+use crate::input::input_option::InputOption;
+use crate::output::output_interface::OutputInterface;
use indexmap::IndexMap;
use shirabe_pcre::preg::Preg;
use shirabe_php_shim::PhpMixed;
@@ -331,9 +329,9 @@ impl Descriptor for MarkdownDescriptor {
&[content.to_string()],
false,
if decorated {
- crate::symfony::console::output::output_interface::OUTPUT_NORMAL
+ crate::output::output_interface::OUTPUT_NORMAL
} else {
- crate::symfony::console::output::output_interface::OUTPUT_RAW
+ crate::output::output_interface::OUTPUT_RAW
},
);
}
diff --git a/crates/shirabe-external-packages/src/symfony/console/descriptor/text_descriptor.rs b/crates/shirabe-symfony-console/src/descriptor/text_descriptor.rs
index 147fe73f..3ea09355 100644
--- a/crates/shirabe-external-packages/src/symfony/console/descriptor/text_descriptor.rs
+++ b/crates/shirabe-symfony-console/src/descriptor/text_descriptor.rs
@@ -1,18 +1,16 @@
//! ref: composer/vendor/symfony/console/Descriptor/TextDescriptor.php
-use crate::symfony::console::application::Application;
-use crate::symfony::console::command::command::Command;
-use crate::symfony::console::descriptor::application_description::ApplicationDescription;
-use crate::symfony::console::descriptor::descriptor::Descriptor;
-use crate::symfony::console::descriptor::descriptor_interface::{
- DescribableObject, DescriptorInterface,
-};
-use crate::symfony::console::formatter::output_formatter::OutputFormatter;
-use crate::symfony::console::helper::helper::Helper;
-use crate::symfony::console::input::input_argument::InputArgument;
-use crate::symfony::console::input::input_definition::InputDefinition;
-use crate::symfony::console::input::input_option::InputOption;
-use crate::symfony::console::output::output_interface::OutputInterface;
+use crate::application::Application;
+use crate::command::command::Command;
+use crate::descriptor::application_description::ApplicationDescription;
+use crate::descriptor::descriptor::Descriptor;
+use crate::descriptor::descriptor_interface::{DescribableObject, DescriptorInterface};
+use crate::formatter::output_formatter::OutputFormatter;
+use crate::helper::helper::Helper;
+use crate::input::input_argument::InputArgument;
+use crate::input::input_definition::InputDefinition;
+use crate::input::input_option::InputOption;
+use crate::output::output_interface::OutputInterface;
use indexmap::IndexMap;
use shirabe_pcre::preg::Preg;
use shirabe_php_shim::PhpMixed;
diff --git a/crates/shirabe-external-packages/src/symfony/console/descriptor/xml_descriptor.rs b/crates/shirabe-symfony-console/src/descriptor/xml_descriptor.rs
index c2770a43..11c26b46 100644
--- a/crates/shirabe-external-packages/src/symfony/console/descriptor/xml_descriptor.rs
+++ b/crates/shirabe-symfony-console/src/descriptor/xml_descriptor.rs
@@ -1,16 +1,14 @@
//! ref: composer/vendor/symfony/console/Descriptor/XmlDescriptor.php
-use crate::symfony::console::application::Application;
-use crate::symfony::console::command::command::Command;
-use crate::symfony::console::descriptor::application_description::ApplicationDescription;
-use crate::symfony::console::descriptor::descriptor::Descriptor;
-use crate::symfony::console::descriptor::descriptor_interface::{
- DescribableObject, DescriptorInterface,
-};
-use crate::symfony::console::input::input_argument::InputArgument;
-use crate::symfony::console::input::input_definition::InputDefinition;
-use crate::symfony::console::input::input_option::InputOption;
-use crate::symfony::console::output::output_interface::OutputInterface;
+use crate::application::Application;
+use crate::command::command::Command;
+use crate::descriptor::application_description::ApplicationDescription;
+use crate::descriptor::descriptor::Descriptor;
+use crate::descriptor::descriptor_interface::{DescribableObject, DescriptorInterface};
+use crate::input::input_argument::InputArgument;
+use crate::input::input_definition::InputDefinition;
+use crate::input::input_option::InputOption;
+use crate::output::output_interface::OutputInterface;
use indexmap::IndexMap;
use shirabe_php_shim::{DOMDocument, DOMNode, PhpMixed};
diff --git a/crates/shirabe-external-packages/src/symfony/console/exception.rs b/crates/shirabe-symfony-console/src/exception.rs
index 356b5955..356b5955 100644
--- a/crates/shirabe-external-packages/src/symfony/console/exception.rs
+++ b/crates/shirabe-symfony-console/src/exception.rs
diff --git a/crates/shirabe-external-packages/src/symfony/console/exception/command_not_found_exception.rs b/crates/shirabe-symfony-console/src/exception/command_not_found_exception.rs
index 4b27c5e6..4b27c5e6 100644
--- a/crates/shirabe-external-packages/src/symfony/console/exception/command_not_found_exception.rs
+++ b/crates/shirabe-symfony-console/src/exception/command_not_found_exception.rs
diff --git a/crates/shirabe-external-packages/src/symfony/console/exception/exception_interface.rs b/crates/shirabe-symfony-console/src/exception/exception_interface.rs
index bb2200f6..bb2200f6 100644
--- a/crates/shirabe-external-packages/src/symfony/console/exception/exception_interface.rs
+++ b/crates/shirabe-symfony-console/src/exception/exception_interface.rs
diff --git a/crates/shirabe-external-packages/src/symfony/console/exception/invalid_argument_exception.rs b/crates/shirabe-symfony-console/src/exception/invalid_argument_exception.rs
index ced79b44..ced79b44 100644
--- a/crates/shirabe-external-packages/src/symfony/console/exception/invalid_argument_exception.rs
+++ b/crates/shirabe-symfony-console/src/exception/invalid_argument_exception.rs
diff --git a/crates/shirabe-external-packages/src/symfony/console/exception/invalid_option_exception.rs b/crates/shirabe-symfony-console/src/exception/invalid_option_exception.rs
index 04de3d42..04de3d42 100644
--- a/crates/shirabe-external-packages/src/symfony/console/exception/invalid_option_exception.rs
+++ b/crates/shirabe-symfony-console/src/exception/invalid_option_exception.rs
diff --git a/crates/shirabe-external-packages/src/symfony/console/exception/logic_exception.rs b/crates/shirabe-symfony-console/src/exception/logic_exception.rs
index 03d9241f..03d9241f 100644
--- a/crates/shirabe-external-packages/src/symfony/console/exception/logic_exception.rs
+++ b/crates/shirabe-symfony-console/src/exception/logic_exception.rs
diff --git a/crates/shirabe-external-packages/src/symfony/console/exception/missing_input_exception.rs b/crates/shirabe-symfony-console/src/exception/missing_input_exception.rs
index f9ddc0e6..f9ddc0e6 100644
--- a/crates/shirabe-external-packages/src/symfony/console/exception/missing_input_exception.rs
+++ b/crates/shirabe-symfony-console/src/exception/missing_input_exception.rs
diff --git a/crates/shirabe-external-packages/src/symfony/console/exception/namespace_not_found_exception.rs b/crates/shirabe-symfony-console/src/exception/namespace_not_found_exception.rs
index 31da0305..31da0305 100644
--- a/crates/shirabe-external-packages/src/symfony/console/exception/namespace_not_found_exception.rs
+++ b/crates/shirabe-symfony-console/src/exception/namespace_not_found_exception.rs
diff --git a/crates/shirabe-external-packages/src/symfony/console/exception/runtime_exception.rs b/crates/shirabe-symfony-console/src/exception/runtime_exception.rs
index 12e5b79c..12e5b79c 100644
--- a/crates/shirabe-external-packages/src/symfony/console/exception/runtime_exception.rs
+++ b/crates/shirabe-symfony-console/src/exception/runtime_exception.rs
diff --git a/crates/shirabe-external-packages/src/symfony/console/formatter.rs b/crates/shirabe-symfony-console/src/formatter.rs
index 716d3fbe..716d3fbe 100644
--- a/crates/shirabe-external-packages/src/symfony/console/formatter.rs
+++ b/crates/shirabe-symfony-console/src/formatter.rs
diff --git a/crates/shirabe-external-packages/src/symfony/console/formatter/output_formatter.rs b/crates/shirabe-symfony-console/src/formatter/output_formatter.rs
index 08079a7c..bd7259a1 100644
--- a/crates/shirabe-external-packages/src/symfony/console/formatter/output_formatter.rs
+++ b/crates/shirabe-symfony-console/src/formatter/output_formatter.rs
@@ -1,11 +1,11 @@
//! ref: composer/vendor/symfony/console/Formatter/OutputFormatter.php
-use crate::symfony::console::exception::invalid_argument_exception::InvalidArgumentException;
-use crate::symfony::console::formatter::output_formatter_interface::OutputFormatterInterface;
-use crate::symfony::console::formatter::output_formatter_style::OutputFormatterStyle;
-use crate::symfony::console::formatter::output_formatter_style_interface::OutputFormatterStyleInterface;
-use crate::symfony::console::formatter::output_formatter_style_stack::OutputFormatterStyleStack;
-use crate::symfony::console::formatter::wrappable_output_formatter_interface::WrappableOutputFormatterInterface;
+use crate::exception::invalid_argument_exception::InvalidArgumentException;
+use crate::formatter::output_formatter_interface::OutputFormatterInterface;
+use crate::formatter::output_formatter_style::OutputFormatterStyle;
+use crate::formatter::output_formatter_style_interface::OutputFormatterStyleInterface;
+use crate::formatter::output_formatter_style_stack::OutputFormatterStyleStack;
+use crate::formatter::wrappable_output_formatter_interface::WrappableOutputFormatterInterface;
use shirabe_php_shim::php_regex;
use shirabe_symfony_string::b;
diff --git a/crates/shirabe-external-packages/src/symfony/console/formatter/output_formatter_interface.rs b/crates/shirabe-symfony-console/src/formatter/output_formatter_interface.rs
index ad2b6954..f2346ceb 100644
--- a/crates/shirabe-external-packages/src/symfony/console/formatter/output_formatter_interface.rs
+++ b/crates/shirabe-symfony-console/src/formatter/output_formatter_interface.rs
@@ -1,6 +1,6 @@
//! ref: composer/vendor/symfony/console/Formatter/OutputFormatterInterface.php
-use crate::symfony::console::formatter::output_formatter_style_interface::OutputFormatterStyleInterface;
+use crate::formatter::output_formatter_style_interface::OutputFormatterStyleInterface;
/// Formatter interface for console output.
pub trait OutputFormatterInterface: shirabe_php_shim::AsAny {
diff --git a/crates/shirabe-external-packages/src/symfony/console/formatter/output_formatter_style.rs b/crates/shirabe-symfony-console/src/formatter/output_formatter_style.rs
index dac390fe..2cf85e8e 100644
--- a/crates/shirabe-external-packages/src/symfony/console/formatter/output_formatter_style.rs
+++ b/crates/shirabe-symfony-console/src/formatter/output_formatter_style.rs
@@ -1,7 +1,7 @@
//! ref: composer/vendor/symfony/console/Formatter/OutputFormatterStyle.php
-use crate::symfony::console::color::Color;
-use crate::symfony::console::formatter::output_formatter_style_interface::OutputFormatterStyleInterface;
+use crate::color::Color;
+use crate::formatter::output_formatter_style_interface::OutputFormatterStyleInterface;
/// Formatter style class for defining styles.
#[derive(Debug, Clone)]
diff --git a/crates/shirabe-external-packages/src/symfony/console/formatter/output_formatter_style_interface.rs b/crates/shirabe-symfony-console/src/formatter/output_formatter_style_interface.rs
index dfbffa5d..dfbffa5d 100644
--- a/crates/shirabe-external-packages/src/symfony/console/formatter/output_formatter_style_interface.rs
+++ b/crates/shirabe-symfony-console/src/formatter/output_formatter_style_interface.rs
diff --git a/crates/shirabe-external-packages/src/symfony/console/formatter/output_formatter_style_stack.rs b/crates/shirabe-symfony-console/src/formatter/output_formatter_style_stack.rs
index acfd8878..f85b80f1 100644
--- a/crates/shirabe-external-packages/src/symfony/console/formatter/output_formatter_style_stack.rs
+++ b/crates/shirabe-symfony-console/src/formatter/output_formatter_style_stack.rs
@@ -1,8 +1,8 @@
//! ref: composer/vendor/symfony/console/Formatter/OutputFormatterStyleStack.php
-use crate::symfony::console::exception::invalid_argument_exception::InvalidArgumentException;
-use crate::symfony::console::formatter::output_formatter_style::OutputFormatterStyle;
-use crate::symfony::console::formatter::output_formatter_style_interface::OutputFormatterStyleInterface;
+use crate::exception::invalid_argument_exception::InvalidArgumentException;
+use crate::formatter::output_formatter_style::OutputFormatterStyle;
+use crate::formatter::output_formatter_style_interface::OutputFormatterStyleInterface;
#[derive(Debug)]
pub struct OutputFormatterStyleStack {
diff --git a/crates/shirabe-external-packages/src/symfony/console/formatter/wrappable_output_formatter_interface.rs b/crates/shirabe-symfony-console/src/formatter/wrappable_output_formatter_interface.rs
index 7c0d821e..39e6cea1 100644
--- a/crates/shirabe-external-packages/src/symfony/console/formatter/wrappable_output_formatter_interface.rs
+++ b/crates/shirabe-symfony-console/src/formatter/wrappable_output_formatter_interface.rs
@@ -1,6 +1,6 @@
//! ref: composer/vendor/symfony/console/Formatter/WrappableOutputFormatterInterface.php
-use crate::symfony::console::formatter::output_formatter_interface::OutputFormatterInterface;
+use crate::formatter::output_formatter_interface::OutputFormatterInterface;
/// Formatter interface for console output that supports word wrapping.
pub trait WrappableOutputFormatterInterface: OutputFormatterInterface {
diff --git a/crates/shirabe-external-packages/src/symfony/console/helper.rs b/crates/shirabe-symfony-console/src/helper.rs
index 8aed672f..8aed672f 100644
--- a/crates/shirabe-external-packages/src/symfony/console/helper.rs
+++ b/crates/shirabe-symfony-console/src/helper.rs
diff --git a/crates/shirabe-external-packages/src/symfony/console/helper/debug_formatter_helper.rs b/crates/shirabe-symfony-console/src/helper/debug_formatter_helper.rs
index 6fcbce8e..f7fd2157 100644
--- a/crates/shirabe-external-packages/src/symfony/console/helper/debug_formatter_helper.rs
+++ b/crates/shirabe-symfony-console/src/helper/debug_formatter_helper.rs
@@ -1,8 +1,8 @@
//! ref: composer/vendor/symfony/console/Helper/DebugFormatterHelper.php
-use crate::symfony::console::helper::helper::Helper;
-use crate::symfony::console::helper::helper_interface::HelperInterface;
-use crate::symfony::console::helper::helper_set::HelperSet;
+use crate::helper::helper::Helper;
+use crate::helper::helper_interface::HelperInterface;
+use crate::helper::helper_set::HelperSet;
use indexmap::IndexMap;
const COLORS: [&str; 9] = [
diff --git a/crates/shirabe-external-packages/src/symfony/console/helper/descriptor_helper.rs b/crates/shirabe-symfony-console/src/helper/descriptor_helper.rs
index 36603b06..23bb4f66 100644
--- a/crates/shirabe-external-packages/src/symfony/console/helper/descriptor_helper.rs
+++ b/crates/shirabe-symfony-console/src/helper/descriptor_helper.rs
@@ -1,17 +1,15 @@
//! ref: composer/vendor/symfony/console/Helper/DescriptorHelper.php
-use crate::symfony::console::descriptor::descriptor_interface::{
- DescribableObject, DescriptorInterface,
-};
-use crate::symfony::console::descriptor::json_descriptor::JsonDescriptor;
-use crate::symfony::console::descriptor::markdown_descriptor::MarkdownDescriptor;
-use crate::symfony::console::descriptor::text_descriptor::TextDescriptor;
-use crate::symfony::console::descriptor::xml_descriptor::XmlDescriptor;
-use crate::symfony::console::exception::invalid_argument_exception::InvalidArgumentException;
-use crate::symfony::console::helper::helper::Helper;
-use crate::symfony::console::helper::helper_interface::HelperInterface;
-use crate::symfony::console::helper::helper_set::HelperSet;
-use crate::symfony::console::output::output_interface::OutputInterface;
+use crate::descriptor::descriptor_interface::{DescribableObject, DescriptorInterface};
+use crate::descriptor::json_descriptor::JsonDescriptor;
+use crate::descriptor::markdown_descriptor::MarkdownDescriptor;
+use crate::descriptor::text_descriptor::TextDescriptor;
+use crate::descriptor::xml_descriptor::XmlDescriptor;
+use crate::exception::invalid_argument_exception::InvalidArgumentException;
+use crate::helper::helper::Helper;
+use crate::helper::helper_interface::HelperInterface;
+use crate::helper::helper_set::HelperSet;
+use crate::output::output_interface::OutputInterface;
use indexmap::IndexMap;
/// This class adds helper method to describe objects in various formats.
diff --git a/crates/shirabe-external-packages/src/symfony/console/helper/formatter_helper.rs b/crates/shirabe-symfony-console/src/helper/formatter_helper.rs
index 056a2ffe..f4e1b643 100644
--- a/crates/shirabe-external-packages/src/symfony/console/helper/formatter_helper.rs
+++ b/crates/shirabe-symfony-console/src/helper/formatter_helper.rs
@@ -1,9 +1,9 @@
//! ref: composer/vendor/symfony/console/Helper/FormatterHelper.php
-use crate::symfony::console::formatter::output_formatter::OutputFormatter;
-use crate::symfony::console::helper::helper::Helper;
-use crate::symfony::console::helper::helper_interface::HelperInterface;
-use crate::symfony::console::helper::helper_set::HelperSet;
+use crate::formatter::output_formatter::OutputFormatter;
+use crate::helper::helper::Helper;
+use crate::helper::helper_interface::HelperInterface;
+use crate::helper::helper_set::HelperSet;
/// The Formatter class provides helpers to format messages.
#[derive(Debug, Default)]
diff --git a/crates/shirabe-external-packages/src/symfony/console/helper/helper.rs b/crates/shirabe-symfony-console/src/helper/helper.rs
index 471a8d8a..0af2830f 100644
--- a/crates/shirabe-external-packages/src/symfony/console/helper/helper.rs
+++ b/crates/shirabe-symfony-console/src/helper/helper.rs
@@ -1,7 +1,7 @@
//! ref: composer/vendor/symfony/console/Helper/Helper.php
-use crate::symfony::console::formatter::output_formatter_interface::OutputFormatterInterface;
-use crate::symfony::console::helper::helper_set::HelperSet;
+use crate::formatter::output_formatter_interface::OutputFormatterInterface;
+use crate::helper::helper_set::HelperSet;
use shirabe_php_shim::php_regex;
use shirabe_symfony_string::unicode_string::UnicodeString;
diff --git a/crates/shirabe-external-packages/src/symfony/console/helper/helper_interface.rs b/crates/shirabe-symfony-console/src/helper/helper_interface.rs
index 8dae6c85..41c0b680 100644
--- a/crates/shirabe-external-packages/src/symfony/console/helper/helper_interface.rs
+++ b/crates/shirabe-symfony-console/src/helper/helper_interface.rs
@@ -1,6 +1,6 @@
//! ref: composer/vendor/symfony/console/Helper/HelperInterface.php
-use crate::symfony::console::helper::helper_set::HelperSet;
+use crate::helper::helper_set::HelperSet;
/// HelperInterface is the interface all helpers must implement.
pub trait HelperInterface: std::fmt::Debug + shirabe_php_shim::AsAny {
diff --git a/crates/shirabe-external-packages/src/symfony/console/helper/helper_set.rs b/crates/shirabe-symfony-console/src/helper/helper_set.rs
index b505fedf..bf64f8b2 100644
--- a/crates/shirabe-external-packages/src/symfony/console/helper/helper_set.rs
+++ b/crates/shirabe-symfony-console/src/helper/helper_set.rs
@@ -1,10 +1,10 @@
//! ref: composer/vendor/symfony/console/Helper/HelperSet.php
-use crate::symfony::console::helper::debug_formatter_helper::DebugFormatterHelper;
-use crate::symfony::console::helper::formatter_helper::FormatterHelper;
-use crate::symfony::console::helper::helper_interface::HelperInterface;
-use crate::symfony::console::helper::process_helper::ProcessHelper;
-use crate::symfony::console::helper::question_helper::QuestionHelper;
+use crate::helper::debug_formatter_helper::DebugFormatterHelper;
+use crate::helper::formatter_helper::FormatterHelper;
+use crate::helper::helper_interface::HelperInterface;
+use crate::helper::process_helper::ProcessHelper;
+use crate::helper::question_helper::QuestionHelper;
/// HelperSet represents a set of helpers to be used with a command.
///
diff --git a/crates/shirabe-external-packages/src/symfony/console/helper/process_helper.rs b/crates/shirabe-symfony-console/src/helper/process_helper.rs
index 303a4569..be1c1a84 100644
--- a/crates/shirabe-external-packages/src/symfony/console/helper/process_helper.rs
+++ b/crates/shirabe-symfony-console/src/helper/process_helper.rs
@@ -1,11 +1,11 @@
//! ref: composer/vendor/symfony/console/Helper/ProcessHelper.php
-use crate::symfony::console::helper::debug_formatter_helper::DebugFormatterHelper;
-use crate::symfony::console::helper::helper::Helper;
-use crate::symfony::console::helper::helper_interface::HelperInterface;
-use crate::symfony::console::helper::helper_set::HelperSet;
-use crate::symfony::console::output::ConsoleOutputInterface;
-use crate::symfony::console::output::output_interface::{self, OutputInterface};
+use crate::helper::debug_formatter_helper::DebugFormatterHelper;
+use crate::helper::helper::Helper;
+use crate::helper::helper_interface::HelperInterface;
+use crate::helper::helper_set::HelperSet;
+use crate::output::ConsoleOutputInterface;
+use crate::output::output_interface::{self, OutputInterface};
use shirabe_symfony_process::exception::process_failed_exception::ProcessFailedException;
use shirabe_symfony_process::process::Process;
@@ -54,7 +54,7 @@ impl ProcessHelper {
// reduces to a downcast to the concrete type.
let output: std::rc::Rc<std::cell::RefCell<dyn OutputInterface>> = {
let redirected = shirabe_php_shim::AsAny::as_any(&*output.borrow())
- .downcast_ref::<crate::symfony::console::output::console_output::ConsoleOutput>()
+ .downcast_ref::<crate::output::console_output::ConsoleOutput>()
.map(|console| console.get_error_output());
redirected.unwrap_or(output)
};
@@ -228,7 +228,7 @@ impl ProcessHelper {
// reduces to a downcast to the concrete type.
let output: std::rc::Rc<std::cell::RefCell<dyn OutputInterface>> = {
let redirected = shirabe_php_shim::AsAny::as_any(&*output.borrow())
- .downcast_ref::<crate::symfony::console::output::console_output::ConsoleOutput>()
+ .downcast_ref::<crate::output::console_output::ConsoleOutput>()
.map(|console| console.get_error_output());
redirected.unwrap_or(output)
};
diff --git a/crates/shirabe-external-packages/src/symfony/console/helper/progress_bar.rs b/crates/shirabe-symfony-console/src/helper/progress_bar.rs
index 7bfbfbcd..44e144cf 100644
--- a/crates/shirabe-external-packages/src/symfony/console/helper/progress_bar.rs
+++ b/crates/shirabe-symfony-console/src/helper/progress_bar.rs
@@ -1,13 +1,13 @@
//! ref: composer/vendor/symfony/console/Helper/ProgressBar.php
-use crate::symfony::console::cursor::Cursor;
-use crate::symfony::console::exception::logic_exception::LogicException;
-use crate::symfony::console::helper::helper::Helper;
-use crate::symfony::console::output::ConsoleOutputInterface;
-use crate::symfony::console::output::ConsoleSectionOutput;
-use crate::symfony::console::output::OutputInterface;
-use crate::symfony::console::output::output_interface;
-use crate::symfony::console::terminal::Terminal;
+use crate::cursor::Cursor;
+use crate::exception::logic_exception::LogicException;
+use crate::helper::helper::Helper;
+use crate::output::ConsoleOutputInterface;
+use crate::output::ConsoleSectionOutput;
+use crate::output::OutputInterface;
+use crate::output::output_interface;
+use crate::terminal::Terminal;
use indexmap::IndexMap;
pub const FORMAT_VERBOSE: &str = "verbose";
@@ -73,7 +73,7 @@ impl ProgressBar {
// reduces to a downcast to the concrete type.
let output: std::rc::Rc<std::cell::RefCell<dyn OutputInterface>> = {
let redirected = shirabe_php_shim::AsAny::as_any(&*output.borrow())
- .downcast_ref::<crate::symfony::console::output::console_output::ConsoleOutput>()
+ .downcast_ref::<crate::output::console_output::ConsoleOutput>()
.map(|console| console.get_error_output());
redirected.unwrap_or(output)
};
diff --git a/crates/shirabe-external-packages/src/symfony/console/helper/question_helper.rs b/crates/shirabe-symfony-console/src/helper/question_helper.rs
index 91fb5bf0..6ee83702 100644
--- a/crates/shirabe-external-packages/src/symfony/console/helper/question_helper.rs
+++ b/crates/shirabe-symfony-console/src/helper/question_helper.rs
@@ -1,23 +1,23 @@
//! ref: composer/vendor/symfony/console/Helper/QuestionHelper.php
-use crate::symfony::console::cursor::Cursor;
-use crate::symfony::console::exception::missing_input_exception::MissingInputException;
-use crate::symfony::console::exception::runtime_exception::RuntimeException;
-use crate::symfony::console::formatter::output_formatter::OutputFormatter;
-use crate::symfony::console::formatter::output_formatter_style::OutputFormatterStyle;
-use crate::symfony::console::helper::formatter_helper::FormatBlockMessages;
-use crate::symfony::console::helper::helper::Helper;
-use crate::symfony::console::helper::helper_interface::HelperInterface;
-use crate::symfony::console::helper::helper_set::HelperSet;
-use crate::symfony::console::input::input_interface::InputInterface;
-use crate::symfony::console::output::console_output::ConsoleOutput;
-use crate::symfony::console::output::console_output_interface::ConsoleOutputInterface;
-use crate::symfony::console::output::console_section_output::ConsoleSectionOutput;
-use crate::symfony::console::output::output_interface;
-use crate::symfony::console::output::output_interface::OutputInterface;
-use crate::symfony::console::question::ChoiceQuestion;
-use crate::symfony::console::question::QuestionInterface;
-use crate::symfony::console::terminal::Terminal;
+use crate::cursor::Cursor;
+use crate::exception::missing_input_exception::MissingInputException;
+use crate::exception::runtime_exception::RuntimeException;
+use crate::formatter::output_formatter::OutputFormatter;
+use crate::formatter::output_formatter_style::OutputFormatterStyle;
+use crate::helper::formatter_helper::FormatBlockMessages;
+use crate::helper::helper::Helper;
+use crate::helper::helper_interface::HelperInterface;
+use crate::helper::helper_set::HelperSet;
+use crate::input::input_interface::InputInterface;
+use crate::output::console_output::ConsoleOutput;
+use crate::output::console_output_interface::ConsoleOutputInterface;
+use crate::output::console_section_output::ConsoleSectionOutput;
+use crate::output::output_interface;
+use crate::output::output_interface::OutputInterface;
+use crate::question::ChoiceQuestion;
+use crate::question::QuestionInterface;
+use crate::terminal::Terminal;
use shirabe_php_shim::PhpMixed;
use shirabe_symfony_string::s;
diff --git a/crates/shirabe-external-packages/src/symfony/console/helper/symfony_question_helper.rs b/crates/shirabe-symfony-console/src/helper/symfony_question_helper.rs
index eda54243..9de40dd4 100644
--- a/crates/shirabe-external-packages/src/symfony/console/helper/symfony_question_helper.rs
+++ b/crates/shirabe-symfony-console/src/helper/symfony_question_helper.rs
@@ -1,12 +1,12 @@
//! ref: composer/vendor/symfony/console/Helper/SymfonyQuestionHelper.php
-use crate::symfony::console::formatter::output_formatter::OutputFormatter;
-use crate::symfony::console::helper::question_helper::{QuestionHelper, QuestionHelperInterface};
-use crate::symfony::console::output::output_interface;
-use crate::symfony::console::output::output_interface::OutputInterface;
-use crate::symfony::console::question::QuestionInterface;
-use crate::symfony::console::style::style_interface::StyleInterface;
-use crate::symfony::console::style::symfony_style::SymfonyStyle;
+use crate::formatter::output_formatter::OutputFormatter;
+use crate::helper::question_helper::{QuestionHelper, QuestionHelperInterface};
+use crate::output::output_interface;
+use crate::output::output_interface::OutputInterface;
+use crate::question::QuestionInterface;
+use crate::style::style_interface::StyleInterface;
+use crate::style::symfony_style::SymfonyStyle;
use shirabe_php_shim::PhpMixed;
use std::ops::{Deref, DerefMut};
diff --git a/crates/shirabe-external-packages/src/symfony/console/helper/table.rs b/crates/shirabe-symfony-console/src/helper/table.rs
index 650dfffa..e2dec0c1 100644
--- a/crates/shirabe-external-packages/src/symfony/console/helper/table.rs
+++ b/crates/shirabe-symfony-console/src/helper/table.rs
@@ -1,17 +1,17 @@
//! ref: composer/vendor/symfony/console/Helper/Table.php
-use crate::symfony::console::exception::invalid_argument_exception::InvalidArgumentException;
-use crate::symfony::console::exception::runtime_exception::RuntimeException;
-use crate::symfony::console::formatter::output_formatter::OutputFormatter;
-use crate::symfony::console::formatter::wrappable_output_formatter_interface::WrappableOutputFormatterInterface;
-use crate::symfony::console::helper::helper::Helper;
-use crate::symfony::console::helper::table_cell::{TableCell, TableCellOption};
-use crate::symfony::console::helper::table_cell_style::TableCellStyle;
-use crate::symfony::console::helper::table_rows::TableRows;
-use crate::symfony::console::helper::table_separator::TableSeparator;
-use crate::symfony::console::helper::table_style::TableStyle;
-use crate::symfony::console::output::console_section_output::ConsoleSectionOutput;
-use crate::symfony::console::output::output_interface::OutputInterface;
+use crate::exception::invalid_argument_exception::InvalidArgumentException;
+use crate::exception::runtime_exception::RuntimeException;
+use crate::formatter::output_formatter::OutputFormatter;
+use crate::formatter::wrappable_output_formatter_interface::WrappableOutputFormatterInterface;
+use crate::helper::helper::Helper;
+use crate::helper::table_cell::{TableCell, TableCellOption};
+use crate::helper::table_cell_style::TableCellStyle;
+use crate::helper::table_rows::TableRows;
+use crate::helper::table_separator::TableSeparator;
+use crate::helper::table_style::TableStyle;
+use crate::output::console_section_output::ConsoleSectionOutput;
+use crate::output::output_interface::OutputInterface;
use indexmap::IndexMap;
use shirabe_pcre::preg::Preg;
use shirabe_php_shim::{PhpMixed, php_regex};
@@ -752,7 +752,7 @@ impl Table {
&self.style.get_border_format(),
&[PhpMixed::from(markup)],
)],
- crate::symfony::console::output::output_interface::OUTPUT_NORMAL,
+ crate::output::output_interface::OUTPUT_NORMAL,
);
}
@@ -794,7 +794,7 @@ impl Table {
}
self.output.borrow().writeln(
&[row_content],
- crate::symfony::console::output::output_interface::OUTPUT_NORMAL,
+ crate::output::output_interface::OUTPUT_NORMAL,
);
}
diff --git a/crates/shirabe-external-packages/src/symfony/console/helper/table_cell.rs b/crates/shirabe-symfony-console/src/helper/table_cell.rs
index c899e5f7..100872ca 100644
--- a/crates/shirabe-external-packages/src/symfony/console/helper/table_cell.rs
+++ b/crates/shirabe-symfony-console/src/helper/table_cell.rs
@@ -1,7 +1,7 @@
//! ref: composer/vendor/symfony/console/Helper/TableCell.php
-use crate::symfony::console::exception::invalid_argument_exception::InvalidArgumentException;
-use crate::symfony::console::helper::table_cell_style::TableCellStyle;
+use crate::exception::invalid_argument_exception::InvalidArgumentException;
+use crate::helper::table_cell_style::TableCellStyle;
use indexmap::IndexMap;
/// A `TableCell` option value: an integer span, a `TableCellStyle`, or null.
diff --git a/crates/shirabe-external-packages/src/symfony/console/helper/table_cell_style.rs b/crates/shirabe-symfony-console/src/helper/table_cell_style.rs
index df24b404..6f0d6b5c 100644
--- a/crates/shirabe-external-packages/src/symfony/console/helper/table_cell_style.rs
+++ b/crates/shirabe-symfony-console/src/helper/table_cell_style.rs
@@ -1,6 +1,6 @@
//! ref: composer/vendor/symfony/console/Helper/TableCellStyle.php
-use crate::symfony::console::exception::invalid_argument_exception::InvalidArgumentException;
+use crate::exception::invalid_argument_exception::InvalidArgumentException;
use indexmap::IndexMap;
pub const DEFAULT_ALIGN: &str = "left";
diff --git a/crates/shirabe-external-packages/src/symfony/console/helper/table_rows.rs b/crates/shirabe-symfony-console/src/helper/table_rows.rs
index 1fc14bbf..57db5ee8 100644
--- a/crates/shirabe-external-packages/src/symfony/console/helper/table_rows.rs
+++ b/crates/shirabe-symfony-console/src/helper/table_rows.rs
@@ -1,6 +1,6 @@
//! ref: composer/vendor/symfony/console/Helper/TableRows.php
-use crate::symfony::console::helper::table::Row;
+use crate::helper::table::Row;
/// @internal
///
diff --git a/crates/shirabe-external-packages/src/symfony/console/helper/table_separator.rs b/crates/shirabe-symfony-console/src/helper/table_separator.rs
index 34626cc6..99862848 100644
--- a/crates/shirabe-external-packages/src/symfony/console/helper/table_separator.rs
+++ b/crates/shirabe-symfony-console/src/helper/table_separator.rs
@@ -1,7 +1,7 @@
//! ref: composer/vendor/symfony/console/Helper/TableSeparator.php
-use crate::symfony::console::exception::invalid_argument_exception::InvalidArgumentException;
-use crate::symfony::console::helper::table_cell::{TableCell, TableCellOption};
+use crate::exception::invalid_argument_exception::InvalidArgumentException;
+use crate::helper::table_cell::{TableCell, TableCellOption};
use indexmap::IndexMap;
/// Marks a row as being a separator.
@@ -34,8 +34,7 @@ impl TableSeparator {
pub fn get_style(
&self,
- ) -> Option<std::rc::Rc<crate::symfony::console::helper::table_cell_style::TableCellStyle>>
- {
+ ) -> Option<std::rc::Rc<crate::helper::table_cell_style::TableCellStyle>> {
self.inner.get_style()
}
}
diff --git a/crates/shirabe-external-packages/src/symfony/console/helper/table_style.rs b/crates/shirabe-symfony-console/src/helper/table_style.rs
index bbe899af..9566482f 100644
--- a/crates/shirabe-external-packages/src/symfony/console/helper/table_style.rs
+++ b/crates/shirabe-symfony-console/src/helper/table_style.rs
@@ -1,7 +1,7 @@
//! ref: composer/vendor/symfony/console/Helper/TableStyle.php
-use crate::symfony::console::exception::invalid_argument_exception::InvalidArgumentException;
-use crate::symfony::console::exception::logic_exception::LogicException;
+use crate::exception::invalid_argument_exception::InvalidArgumentException;
+use crate::exception::logic_exception::LogicException;
/// Defines the styles for a Table.
#[derive(Debug, Clone)]
diff --git a/crates/shirabe-external-packages/src/symfony/console/input.rs b/crates/shirabe-symfony-console/src/input.rs
index d4813b44..d4813b44 100644
--- a/crates/shirabe-external-packages/src/symfony/console/input.rs
+++ b/crates/shirabe-symfony-console/src/input.rs
diff --git a/crates/shirabe-external-packages/src/symfony/console/input/argv_input.rs b/crates/shirabe-symfony-console/src/input/argv_input.rs
index 65ab9053..d8619df9 100644
--- a/crates/shirabe-external-packages/src/symfony/console/input/argv_input.rs
+++ b/crates/shirabe-symfony-console/src/input/argv_input.rs
@@ -1,10 +1,10 @@
//! ref: composer/vendor/symfony/console/Input/ArgvInput.php
-use crate::symfony::console::exception::runtime_exception::RuntimeException;
-use crate::symfony::console::input::input::Input;
-use crate::symfony::console::input::input_definition::InputDefinition;
-use crate::symfony::console::input::input_interface::InputInterface;
-use crate::symfony::console::input::streamable_input_interface::StreamableInputInterface;
+use crate::exception::runtime_exception::RuntimeException;
+use crate::input::input::Input;
+use crate::input::input_definition::InputDefinition;
+use crate::input::input_interface::InputInterface;
+use crate::input::streamable_input_interface::StreamableInputInterface;
use indexmap::IndexMap;
use shirabe_php_shim::{PhpMixed, php_regex};
diff --git a/crates/shirabe-external-packages/src/symfony/console/input/array_input.rs b/crates/shirabe-symfony-console/src/input/array_input.rs
index de89a340..fa1d4540 100644
--- a/crates/shirabe-external-packages/src/symfony/console/input/array_input.rs
+++ b/crates/shirabe-symfony-console/src/input/array_input.rs
@@ -1,11 +1,11 @@
//! ref: composer/vendor/symfony/console/Input/ArrayInput.php
-use crate::symfony::console::exception::invalid_argument_exception::InvalidArgumentException;
-use crate::symfony::console::exception::invalid_option_exception::InvalidOptionException;
-use crate::symfony::console::input::input::Input;
-use crate::symfony::console::input::input_definition::InputDefinition;
-use crate::symfony::console::input::input_interface::InputInterface;
-use crate::symfony::console::input::streamable_input_interface::StreamableInputInterface;
+use crate::exception::invalid_argument_exception::InvalidArgumentException;
+use crate::exception::invalid_option_exception::InvalidOptionException;
+use crate::input::input::Input;
+use crate::input::input_definition::InputDefinition;
+use crate::input::input_interface::InputInterface;
+use crate::input::streamable_input_interface::StreamableInputInterface;
use indexmap::IndexMap;
use shirabe_php_shim::PhpMixed;
diff --git a/crates/shirabe-external-packages/src/symfony/console/input/input.rs b/crates/shirabe-symfony-console/src/input/input.rs
index ceff85f6..15190665 100644
--- a/crates/shirabe-external-packages/src/symfony/console/input/input.rs
+++ b/crates/shirabe-symfony-console/src/input/input.rs
@@ -1,8 +1,8 @@
//! ref: composer/vendor/symfony/console/Input/Input.php
-use crate::symfony::console::exception::invalid_argument_exception::InvalidArgumentException;
-use crate::symfony::console::exception::runtime_exception::RuntimeException;
-use crate::symfony::console::input::input_definition::InputDefinition;
+use crate::exception::invalid_argument_exception::InvalidArgumentException;
+use crate::exception::runtime_exception::RuntimeException;
+use crate::input::input_definition::InputDefinition;
use indexmap::IndexMap;
use shirabe_php_shim::{PhpMixed, PhpResource, php_regex};
diff --git a/crates/shirabe-external-packages/src/symfony/console/input/input_argument.rs b/crates/shirabe-symfony-console/src/input/input_argument.rs
index 35f62389..ebc8e223 100644
--- a/crates/shirabe-external-packages/src/symfony/console/input/input_argument.rs
+++ b/crates/shirabe-symfony-console/src/input/input_argument.rs
@@ -1,7 +1,7 @@
//! ref: composer/vendor/symfony/console/Input/InputArgument.php
-use crate::symfony::console::exception::invalid_argument_exception::InvalidArgumentException;
-use crate::symfony::console::exception::logic_exception::LogicException;
+use crate::exception::invalid_argument_exception::InvalidArgumentException;
+use crate::exception::logic_exception::LogicException;
use shirabe_php_shim::PhpMixed;
#[derive(Debug, Clone)]
diff --git a/crates/shirabe-external-packages/src/symfony/console/input/input_aware_interface.rs b/crates/shirabe-symfony-console/src/input/input_aware_interface.rs
index 0d042808..1638b6c7 100644
--- a/crates/shirabe-external-packages/src/symfony/console/input/input_aware_interface.rs
+++ b/crates/shirabe-symfony-console/src/input/input_aware_interface.rs
@@ -1,6 +1,6 @@
//! ref: composer/vendor/symfony/console/Input/InputAwareInterface.php
-use crate::symfony::console::input::input_interface::InputInterface;
+use crate::input::input_interface::InputInterface;
pub trait InputAwareInterface {
fn set_input(&mut self, input: Box<dyn InputInterface>);
diff --git a/crates/shirabe-external-packages/src/symfony/console/input/input_definition.rs b/crates/shirabe-symfony-console/src/input/input_definition.rs
index bd32a8f9..96f9ce9a 100644
--- a/crates/shirabe-external-packages/src/symfony/console/input/input_definition.rs
+++ b/crates/shirabe-symfony-console/src/input/input_definition.rs
@@ -1,9 +1,9 @@
//! ref: composer/vendor/symfony/console/Input/InputDefinition.php
-use crate::symfony::console::exception::invalid_argument_exception::InvalidArgumentException;
-use crate::symfony::console::exception::logic_exception::LogicException;
-use crate::symfony::console::input::input_argument::InputArgument;
-use crate::symfony::console::input::input_option::InputOption;
+use crate::exception::invalid_argument_exception::InvalidArgumentException;
+use crate::exception::logic_exception::LogicException;
+use crate::input::input_argument::InputArgument;
+use crate::input::input_option::InputOption;
use indexmap::IndexMap;
use shirabe_php_shim::PhpMixed;
diff --git a/crates/shirabe-external-packages/src/symfony/console/input/input_interface.rs b/crates/shirabe-symfony-console/src/input/input_interface.rs
index e4beca91..b3cd2eef 100644
--- a/crates/shirabe-external-packages/src/symfony/console/input/input_interface.rs
+++ b/crates/shirabe-symfony-console/src/input/input_interface.rs
@@ -1,7 +1,7 @@
//! ref: composer/vendor/symfony/console/Input/InputInterface.php
-use crate::symfony::console::input::input_definition::InputDefinition;
-use crate::symfony::console::input::streamable_input_interface::StreamableInputInterface;
+use crate::input::input_definition::InputDefinition;
+use crate::input::streamable_input_interface::StreamableInputInterface;
use shirabe_php_shim::PhpMixed;
pub trait InputInterface: std::fmt::Debug + shirabe_php_shim::AsAny {
diff --git a/crates/shirabe-external-packages/src/symfony/console/input/input_option.rs b/crates/shirabe-symfony-console/src/input/input_option.rs
index 79eff582..7312e552 100644
--- a/crates/shirabe-external-packages/src/symfony/console/input/input_option.rs
+++ b/crates/shirabe-symfony-console/src/input/input_option.rs
@@ -1,7 +1,7 @@
//! ref: composer/vendor/symfony/console/Input/InputOption.php
-use crate::symfony::console::exception::invalid_argument_exception::InvalidArgumentException;
-use crate::symfony::console::exception::logic_exception::LogicException;
+use crate::exception::invalid_argument_exception::InvalidArgumentException;
+use crate::exception::logic_exception::LogicException;
use shirabe_php_shim::{PhpMixed, php_regex};
#[derive(Debug, Clone)]
diff --git a/crates/shirabe-external-packages/src/symfony/console/input/streamable_input_interface.rs b/crates/shirabe-symfony-console/src/input/streamable_input_interface.rs
index d4bdbfd3..559b34a0 100644
--- a/crates/shirabe-external-packages/src/symfony/console/input/streamable_input_interface.rs
+++ b/crates/shirabe-symfony-console/src/input/streamable_input_interface.rs
@@ -1,6 +1,6 @@
//! ref: composer/vendor/symfony/console/Input/StreamableInputInterface.php
-use crate::symfony::console::input::input_interface::InputInterface;
+use crate::input::input_interface::InputInterface;
use shirabe_php_shim::PhpResource;
pub trait StreamableInputInterface: InputInterface {
diff --git a/crates/shirabe-external-packages/src/symfony/console/input/string_input.rs b/crates/shirabe-symfony-console/src/input/string_input.rs
index 0ca8c975..720e2bef 100644
--- a/crates/shirabe-external-packages/src/symfony/console/input/string_input.rs
+++ b/crates/shirabe-symfony-console/src/input/string_input.rs
@@ -1,10 +1,10 @@
//! ref: composer/vendor/symfony/console/Input/StringInput.php
-use crate::symfony::console::exception::invalid_argument_exception::InvalidArgumentException;
-use crate::symfony::console::input::argv_input::ArgvInput;
-use crate::symfony::console::input::input_definition::InputDefinition;
-use crate::symfony::console::input::input_interface::InputInterface;
-use crate::symfony::console::input::streamable_input_interface::StreamableInputInterface;
+use crate::exception::invalid_argument_exception::InvalidArgumentException;
+use crate::input::argv_input::ArgvInput;
+use crate::input::input_definition::InputDefinition;
+use crate::input::input_interface::InputInterface;
+use crate::input::streamable_input_interface::StreamableInputInterface;
use indexmap::IndexMap;
use shirabe_php_shim::{CaptureKey, PhpMixed, php_regex};
diff --git a/crates/shirabe-external-packages/src/symfony/console.rs b/crates/shirabe-symfony-console/src/lib.rs
index 814e53a3..814e53a3 100644
--- a/crates/shirabe-external-packages/src/symfony/console.rs
+++ b/crates/shirabe-symfony-console/src/lib.rs
diff --git a/crates/shirabe-external-packages/src/symfony/console/output.rs b/crates/shirabe-symfony-console/src/output.rs
index 23a8e15a..23a8e15a 100644
--- a/crates/shirabe-external-packages/src/symfony/console/output.rs
+++ b/crates/shirabe-symfony-console/src/output.rs
diff --git a/crates/shirabe-external-packages/src/symfony/console/output/buffered_output.rs b/crates/shirabe-symfony-console/src/output/buffered_output.rs
index fa381fa6..147f837f 100644
--- a/crates/shirabe-external-packages/src/symfony/console/output/buffered_output.rs
+++ b/crates/shirabe-symfony-console/src/output/buffered_output.rs
@@ -1,8 +1,8 @@
//! ref: composer/vendor/symfony/console/Output/BufferedOutput.php
-use crate::symfony::console::formatter::OutputFormatterInterface;
-use crate::symfony::console::output::OutputInterface;
-use crate::symfony::console::output::output::{DoWrite, Output};
+use crate::formatter::OutputFormatterInterface;
+use crate::output::OutputInterface;
+use crate::output::output::{DoWrite, Output};
#[derive(Debug)]
pub struct BufferedOutput {
diff --git a/crates/shirabe-external-packages/src/symfony/console/output/console_output.rs b/crates/shirabe-symfony-console/src/output/console_output.rs
index 306f1e61..5028eaf7 100644
--- a/crates/shirabe-external-packages/src/symfony/console/output/console_output.rs
+++ b/crates/shirabe-symfony-console/src/output/console_output.rs
@@ -1,11 +1,11 @@
//! ref: composer/vendor/symfony/console/Output/ConsoleOutput.php
-use crate::symfony::console::formatter::OutputFormatterInterface;
-use crate::symfony::console::output::ConsoleOutputInterface;
-use crate::symfony::console::output::OutputInterface;
-use crate::symfony::console::output::console_section_output::ConsoleSectionOutput;
-use crate::symfony::console::output::output_interface::VERBOSITY_NORMAL;
-use crate::symfony::console::output::stream_output::StreamOutput;
+use crate::formatter::OutputFormatterInterface;
+use crate::output::ConsoleOutputInterface;
+use crate::output::OutputInterface;
+use crate::output::console_section_output::ConsoleSectionOutput;
+use crate::output::output_interface::VERBOSITY_NORMAL;
+use crate::output::stream_output::StreamOutput;
/// ConsoleOutput is the default class for all CLI output. It uses STDOUT and STDERR.
///
diff --git a/crates/shirabe-external-packages/src/symfony/console/output/console_output_interface.rs b/crates/shirabe-symfony-console/src/output/console_output_interface.rs
index 53db5d6a..2702d439 100644
--- a/crates/shirabe-external-packages/src/symfony/console/output/console_output_interface.rs
+++ b/crates/shirabe-symfony-console/src/output/console_output_interface.rs
@@ -1,7 +1,7 @@
//! ref: composer/vendor/symfony/console/Output/ConsoleOutputInterface.php
-use crate::symfony::console::output::ConsoleSectionOutput;
-use crate::symfony::console::output::OutputInterface;
+use crate::output::ConsoleSectionOutput;
+use crate::output::OutputInterface;
/// ConsoleOutputInterface is the interface implemented by ConsoleOutput class.
/// This adds information about stderr and section output stream.
diff --git a/crates/shirabe-external-packages/src/symfony/console/output/console_section_output.rs b/crates/shirabe-symfony-console/src/output/console_section_output.rs
index 3f469fca..2b42ad02 100644
--- a/crates/shirabe-external-packages/src/symfony/console/output/console_section_output.rs
+++ b/crates/shirabe-symfony-console/src/output/console_section_output.rs
@@ -1,11 +1,11 @@
//! ref: composer/vendor/symfony/console/Output/ConsoleSectionOutput.php
-use crate::symfony::console::formatter::OutputFormatterInterface;
-use crate::symfony::console::helper::Helper;
-use crate::symfony::console::output::OutputInterface;
-use crate::symfony::console::output::output::DoWrite;
-use crate::symfony::console::output::stream_output::StreamOutput;
-use crate::symfony::console::terminal::Terminal;
+use crate::formatter::OutputFormatterInterface;
+use crate::helper::Helper;
+use crate::output::OutputInterface;
+use crate::output::output::DoWrite;
+use crate::output::stream_output::StreamOutput;
+use crate::terminal::Terminal;
type Sections =
std::rc::Rc<std::cell::RefCell<Vec<std::rc::Rc<std::cell::RefCell<ConsoleSectionOutput>>>>>;
@@ -79,10 +79,7 @@ impl ConsoleSectionOutput {
/// Overwrites the previous output with a new message.
pub fn overwrite(&self, message: &[String]) {
self.clear(None);
- self.writeln(
- message,
- crate::symfony::console::output::output_interface::OUTPUT_NORMAL,
- );
+ self.writeln(message, crate::output::output_interface::OUTPUT_NORMAL);
}
pub fn get_content(&self) -> String {
diff --git a/crates/shirabe-external-packages/src/symfony/console/output/output.rs b/crates/shirabe-symfony-console/src/output/output.rs
index ec0c060e..98566a4e 100644
--- a/crates/shirabe-external-packages/src/symfony/console/output/output.rs
+++ b/crates/shirabe-symfony-console/src/output/output.rs
@@ -1,8 +1,8 @@
//! ref: composer/vendor/symfony/console/Output/Output.php
-use crate::symfony::console::formatter::OutputFormatter;
-use crate::symfony::console::formatter::OutputFormatterInterface;
-use crate::symfony::console::output::output_interface::{
+use crate::formatter::OutputFormatter;
+use crate::formatter::OutputFormatterInterface;
+use crate::output::output_interface::{
OUTPUT_NORMAL, OUTPUT_PLAIN, OUTPUT_RAW, VERBOSITY_DEBUG, VERBOSITY_NORMAL, VERBOSITY_QUIET,
VERBOSITY_VERBOSE, VERBOSITY_VERY_VERBOSE,
};
diff --git a/crates/shirabe-external-packages/src/symfony/console/output/output_interface.rs b/crates/shirabe-symfony-console/src/output/output_interface.rs
index 28ebd85c..cdc78144 100644
--- a/crates/shirabe-external-packages/src/symfony/console/output/output_interface.rs
+++ b/crates/shirabe-symfony-console/src/output/output_interface.rs
@@ -1,6 +1,6 @@
//! ref: composer/vendor/symfony/console/Output/OutputInterface.php
-use crate::symfony::console::formatter::OutputFormatterInterface;
+use crate::formatter::OutputFormatterInterface;
pub const VERBOSITY_QUIET: i64 = 16;
pub const VERBOSITY_NORMAL: i64 = 32;
@@ -58,9 +58,7 @@ pub trait OutputInterface: std::fmt::Debug + shirabe_php_shim::AsAny {
/// (cf. `InputInterface::as_streamable`). Only `ConsoleOutput` returns `Some`.
fn as_console_output(
&self,
- ) -> Option<
- &dyn crate::symfony::console::output::console_output_interface::ConsoleOutputInterface,
- > {
+ ) -> Option<&dyn crate::output::console_output_interface::ConsoleOutputInterface> {
None
}
}
diff --git a/crates/shirabe-external-packages/src/symfony/console/output/stream_output.rs b/crates/shirabe-symfony-console/src/output/stream_output.rs
index 8be98a57..1ed90cac 100644
--- a/crates/shirabe-external-packages/src/symfony/console/output/stream_output.rs
+++ b/crates/shirabe-symfony-console/src/output/stream_output.rs
@@ -1,10 +1,10 @@
//! ref: composer/vendor/symfony/console/Output/StreamOutput.php
-use crate::symfony::console::exception::InvalidArgumentException;
-use crate::symfony::console::formatter::OutputFormatterInterface;
-use crate::symfony::console::output::OutputInterface;
-use crate::symfony::console::output::output::{DoWrite, Output};
-use crate::symfony::console::output::output_interface::VERBOSITY_NORMAL;
+use crate::exception::InvalidArgumentException;
+use crate::formatter::OutputFormatterInterface;
+use crate::output::OutputInterface;
+use crate::output::output::{DoWrite, Output};
+use crate::output::output_interface::VERBOSITY_NORMAL;
use shirabe_php_shim::php_regex;
/// StreamOutput writes the output to a given stream.
diff --git a/crates/shirabe-external-packages/src/symfony/console/output/trimmed_buffer_output.rs b/crates/shirabe-symfony-console/src/output/trimmed_buffer_output.rs
index 4eb91b41..9f8be71a 100644
--- a/crates/shirabe-external-packages/src/symfony/console/output/trimmed_buffer_output.rs
+++ b/crates/shirabe-symfony-console/src/output/trimmed_buffer_output.rs
@@ -1,9 +1,9 @@
//! ref: composer/vendor/symfony/console/Output/TrimmedBufferOutput.php
-use crate::symfony::console::exception::InvalidArgumentException;
-use crate::symfony::console::formatter::OutputFormatterInterface;
-use crate::symfony::console::output::OutputInterface;
-use crate::symfony::console::output::output::{DoWrite, Output};
+use crate::exception::InvalidArgumentException;
+use crate::formatter::OutputFormatterInterface;
+use crate::output::OutputInterface;
+use crate::output::output::{DoWrite, Output};
/// A BufferedOutput that keeps only the last N chars.
#[derive(Debug)]
diff --git a/crates/shirabe-external-packages/src/symfony/console/question.rs b/crates/shirabe-symfony-console/src/question.rs
index 06d03b40..06d03b40 100644
--- a/crates/shirabe-external-packages/src/symfony/console/question.rs
+++ b/crates/shirabe-symfony-console/src/question.rs
diff --git a/crates/shirabe-external-packages/src/symfony/console/question/choice_question.rs b/crates/shirabe-symfony-console/src/question/choice_question.rs
index 52316cf4..95717f1a 100644
--- a/crates/shirabe-external-packages/src/symfony/console/question/choice_question.rs
+++ b/crates/shirabe-symfony-console/src/question/choice_question.rs
@@ -1,9 +1,9 @@
//! ref: composer/vendor/symfony/console/Question/ChoiceQuestion.php
-use crate::symfony::console::exception::invalid_argument_exception::InvalidArgumentException;
-use crate::symfony::console::exception::logic_exception::LogicException;
-use crate::symfony::console::question::Question;
-use crate::symfony::console::question::QuestionInterface;
+use crate::exception::invalid_argument_exception::InvalidArgumentException;
+use crate::exception::logic_exception::LogicException;
+use crate::question::Question;
+use crate::question::QuestionInterface;
use indexmap::IndexMap;
use shirabe_php_shim::{PhpMixed, php_regex};
diff --git a/crates/shirabe-external-packages/src/symfony/console/question/confirmation_question.rs b/crates/shirabe-symfony-console/src/question/confirmation_question.rs
index 4a050461..34db281b 100644
--- a/crates/shirabe-external-packages/src/symfony/console/question/confirmation_question.rs
+++ b/crates/shirabe-symfony-console/src/question/confirmation_question.rs
@@ -1,8 +1,8 @@
//! ref: composer/vendor/symfony/console/Question/ConfirmationQuestion.php
-use crate::symfony::console::exception::invalid_argument_exception::InvalidArgumentException;
-use crate::symfony::console::question::Question;
-use crate::symfony::console::question::QuestionInterface;
+use crate::exception::invalid_argument_exception::InvalidArgumentException;
+use crate::question::Question;
+use crate::question::QuestionInterface;
use shirabe_php_shim::PhpMixed;
/// Represents a yes/no question.
diff --git a/crates/shirabe-external-packages/src/symfony/console/question/question.rs b/crates/shirabe-symfony-console/src/question/question.rs
index 165f287e..7f96111b 100644
--- a/crates/shirabe-external-packages/src/symfony/console/question/question.rs
+++ b/crates/shirabe-symfony-console/src/question/question.rs
@@ -1,9 +1,9 @@
//! ref: composer/vendor/symfony/console/Question/Question.php
-use crate::symfony::console::exception::invalid_argument_exception::InvalidArgumentException;
-use crate::symfony::console::exception::logic_exception::LogicException;
-use crate::symfony::console::question::choice_question::ChoiceQuestion;
-use crate::symfony::console::question::confirmation_question::ConfirmationQuestion;
+use crate::exception::invalid_argument_exception::InvalidArgumentException;
+use crate::exception::logic_exception::LogicException;
+use crate::question::choice_question::ChoiceQuestion;
+use crate::question::confirmation_question::ConfirmationQuestion;
use shirabe_php_shim::PhpMixed;
/// Polymorphic boundary for the Symfony Console Question hierarchy.
diff --git a/crates/shirabe-external-packages/src/symfony/console/signal_registry.rs b/crates/shirabe-symfony-console/src/signal_registry.rs
index a07ca01f..a07ca01f 100644
--- a/crates/shirabe-external-packages/src/symfony/console/signal_registry.rs
+++ b/crates/shirabe-symfony-console/src/signal_registry.rs
diff --git a/crates/shirabe-external-packages/src/symfony/console/signal_registry/signal_registry.rs b/crates/shirabe-symfony-console/src/signal_registry/signal_registry.rs
index f1f67d09..f1f67d09 100644
--- a/crates/shirabe-external-packages/src/symfony/console/signal_registry/signal_registry.rs
+++ b/crates/shirabe-symfony-console/src/signal_registry/signal_registry.rs
diff --git a/crates/shirabe-external-packages/src/symfony/console/style.rs b/crates/shirabe-symfony-console/src/style.rs
index efc54e1c..efc54e1c 100644
--- a/crates/shirabe-external-packages/src/symfony/console/style.rs
+++ b/crates/shirabe-symfony-console/src/style.rs
diff --git a/crates/shirabe-external-packages/src/symfony/console/style/output_style.rs b/crates/shirabe-symfony-console/src/style/output_style.rs
index 8d28e76d..17c9489e 100644
--- a/crates/shirabe-external-packages/src/symfony/console/style/output_style.rs
+++ b/crates/shirabe-symfony-console/src/style/output_style.rs
@@ -1,10 +1,10 @@
//! ref: composer/vendor/symfony/console/Style/OutputStyle.php
-use crate::symfony::console::formatter::OutputFormatterInterface;
-use crate::symfony::console::helper::ProgressBar;
-use crate::symfony::console::output::ConsoleOutputInterface;
-use crate::symfony::console::output::OutputInterface;
-use crate::symfony::console::output::output_interface::OUTPUT_NORMAL;
+use crate::formatter::OutputFormatterInterface;
+use crate::helper::ProgressBar;
+use crate::output::ConsoleOutputInterface;
+use crate::output::OutputInterface;
+use crate::output::output_interface::OUTPUT_NORMAL;
/// Decorates output to add console style guide helpers.
#[derive(Debug)]
@@ -50,7 +50,7 @@ impl OutputStyle {
// ConsoleOutput is the only OutputInterface implementor that also implements
// ConsoleOutputInterface, so `instanceof ConsoleOutputInterface` reduces to this downcast.
shirabe_php_shim::AsAny::as_any(&*output.borrow())
- .downcast_ref::<crate::symfony::console::output::console_output::ConsoleOutput>()
+ .downcast_ref::<crate::output::console_output::ConsoleOutput>()
.is_some()
}
@@ -58,12 +58,11 @@ impl OutputStyle {
/// borrow of the concrete type serves as the cast result.
fn as_console_output_interface(
output: &std::rc::Rc<std::cell::RefCell<dyn OutputInterface>>,
- ) -> Option<std::cell::Ref<'_, crate::symfony::console::output::console_output::ConsoleOutput>>
- {
+ ) -> Option<std::cell::Ref<'_, crate::output::console_output::ConsoleOutput>> {
std::cell::Ref::filter_map(output.borrow(), |output| {
output
.as_any()
- .downcast_ref::<crate::symfony::console::output::console_output::ConsoleOutput>()
+ .downcast_ref::<crate::output::console_output::ConsoleOutput>()
})
.ok()
}
diff --git a/crates/shirabe-external-packages/src/symfony/console/style/style_interface.rs b/crates/shirabe-symfony-console/src/style/style_interface.rs
index 96745de1..96745de1 100644
--- a/crates/shirabe-external-packages/src/symfony/console/style/style_interface.rs
+++ b/crates/shirabe-symfony-console/src/style/style_interface.rs
diff --git a/crates/shirabe-external-packages/src/symfony/console/style/symfony_style.rs b/crates/shirabe-symfony-console/src/style/symfony_style.rs
index 8ae4d885..486acf2e 100644
--- a/crates/shirabe-external-packages/src/symfony/console/style/symfony_style.rs
+++ b/crates/shirabe-symfony-console/src/style/symfony_style.rs
@@ -1,29 +1,29 @@
//! ref: composer/vendor/symfony/console/Style/SymfonyStyle.php
-use crate::symfony::console::exception::invalid_argument_exception::InvalidArgumentException;
-use crate::symfony::console::formatter::OutputFormatter;
-use crate::symfony::console::formatter::OutputFormatterInterface;
-use crate::symfony::console::helper::Helper;
-use crate::symfony::console::helper::ProgressBar;
-use crate::symfony::console::helper::SymfonyQuestionHelper;
-use crate::symfony::console::helper::Table;
-use crate::symfony::console::helper::TableCell;
-use crate::symfony::console::helper::TableSeparator;
-use crate::symfony::console::helper::question_helper::QuestionHelperInterface;
-use crate::symfony::console::helper::table::{Cell, Row};
-use crate::symfony::console::input::InputInterface;
-use crate::symfony::console::output::ConsoleOutputInterface;
-use crate::symfony::console::output::OutputInterface;
-use crate::symfony::console::output::TrimmedBufferOutput;
-use crate::symfony::console::output::console_output::ConsoleOutput;
-use crate::symfony::console::output::output_interface::OUTPUT_NORMAL;
-use crate::symfony::console::question::ChoiceQuestion;
-use crate::symfony::console::question::ConfirmationQuestion;
-use crate::symfony::console::question::Question;
-use crate::symfony::console::question::QuestionInterface;
-use crate::symfony::console::style::output_style::OutputStyle;
-use crate::symfony::console::style::style_interface::StyleInterface;
-use crate::symfony::console::terminal::Terminal;
+use crate::exception::invalid_argument_exception::InvalidArgumentException;
+use crate::formatter::OutputFormatter;
+use crate::formatter::OutputFormatterInterface;
+use crate::helper::Helper;
+use crate::helper::ProgressBar;
+use crate::helper::SymfonyQuestionHelper;
+use crate::helper::Table;
+use crate::helper::TableCell;
+use crate::helper::TableSeparator;
+use crate::helper::question_helper::QuestionHelperInterface;
+use crate::helper::table::{Cell, Row};
+use crate::input::InputInterface;
+use crate::output::ConsoleOutputInterface;
+use crate::output::OutputInterface;
+use crate::output::TrimmedBufferOutput;
+use crate::output::console_output::ConsoleOutput;
+use crate::output::output_interface::OUTPUT_NORMAL;
+use crate::question::ChoiceQuestion;
+use crate::question::ConfirmationQuestion;
+use crate::question::Question;
+use crate::question::QuestionInterface;
+use crate::style::output_style::OutputStyle;
+use crate::style::style_interface::StyleInterface;
+use crate::terminal::Terminal;
use shirabe_php_shim::PhpMixed;
/// Output decorator helpers for the Symfony Style Guide.
@@ -161,9 +161,7 @@ impl SymfonyStyle {
let mut options = indexmap::IndexMap::new();
options.insert(
"colspan".to_string(),
- crate::symfony::console::helper::table_cell::TableCellOption::Int(
- 2,
- ),
+ crate::helper::table_cell::TableCellOption::Int(2),
);
options
})
@@ -263,9 +261,7 @@ impl SymfonyStyle {
style.set_cell_header_format("<info>%s</info>".to_string());
let mut table = Table::new(output);
- let _ = table.set_style(crate::symfony::console::helper::table::StyleName::Style(
- style,
- ));
+ let _ = table.set_style(crate::helper::table::StyleName::Style(style));
table
}
diff --git a/crates/shirabe-external-packages/src/symfony/console/terminal.rs b/crates/shirabe-symfony-console/src/terminal.rs
index 9af712ad..9af712ad 100644
--- a/crates/shirabe-external-packages/src/symfony/console/terminal.rs
+++ b/crates/shirabe-symfony-console/src/terminal.rs
diff --git a/crates/shirabe-external-packages/src/symfony/console/tester.rs b/crates/shirabe-symfony-console/src/tester.rs
index 1a7f6d0c..1a7f6d0c 100644
--- a/crates/shirabe-external-packages/src/symfony/console/tester.rs
+++ b/crates/shirabe-symfony-console/src/tester.rs
diff --git a/crates/shirabe-external-packages/src/symfony/console/tester/command_completion_tester.rs b/crates/shirabe-symfony-console/src/tester/command_completion_tester.rs
index 35da1b9d..81cbdab3 100644
--- a/crates/shirabe-external-packages/src/symfony/console/tester/command_completion_tester.rs
+++ b/crates/shirabe-symfony-console/src/tester/command_completion_tester.rs
@@ -1,8 +1,8 @@
//! ref: composer/vendor/symfony/console/Tester/CommandCompletionTester.php
-use crate::symfony::console::command::command::Command;
-use crate::symfony::console::completion::completion_input::CompletionInput;
-use crate::symfony::console::completion::completion_suggestions::CompletionSuggestions;
+use crate::command::command::Command;
+use crate::completion::completion_input::CompletionInput;
+use crate::completion::completion_suggestions::CompletionSuggestions;
/// Eases the testing of command completion.
#[derive(Debug)]
diff --git a/crates/shirabe/Cargo.toml b/crates/shirabe/Cargo.toml
index b5b84f73..6623ba80 100644
--- a/crates/shirabe/Cargo.toml
+++ b/crates/shirabe/Cargo.toml
@@ -12,6 +12,7 @@ shirabe-php-rpc.workspace = true
shirabe-php-shim.workspace = true
shirabe-semver.workspace = true
shirabe-spdx-licenses.workspace = true
+shirabe-symfony-console.workspace = true
shirabe-symfony-filesystem.workspace = true
shirabe-symfony-finder.workspace = true
shirabe-symfony-process.workspace = true
diff --git a/crates/shirabe/src/advisory/auditor.rs b/crates/shirabe/src/advisory/auditor.rs
index 3c010bd2..3c00d09e 100644
--- a/crates/shirabe/src/advisory/auditor.rs
+++ b/crates/shirabe/src/advisory/auditor.rs
@@ -12,12 +12,12 @@ use crate::package::base_package;
use crate::repository::RepositorySet;
use crate::util::PackageInfo;
use indexmap::IndexMap;
-use shirabe_external_packages::symfony::console::formatter::OutputFormatter;
use shirabe_pcre::Preg;
use shirabe_php_shim::{
DATE_ATOM, InvalidArgumentException, PhpMixed, array_all, array_any, array_key_exists,
array_keys, array_reduce, get_class, str_starts_with,
};
+use shirabe_symfony_console::formatter::OutputFormatter;
/// Shape of the `--format=json` audit output.
#[derive(serde::Serialize)]
diff --git a/crates/shirabe/src/autoload/autoload_generator.rs b/crates/shirabe/src/autoload/autoload_generator.rs
index 1aad6412..b21bfabe 100644
--- a/crates/shirabe/src/autoload/autoload_generator.rs
+++ b/crates/shirabe/src/autoload/autoload_generator.rs
@@ -21,7 +21,6 @@ use crate::util::Platform;
use indexmap::IndexMap;
use shirabe_class_map_generator::class_map::ClassMap;
use shirabe_class_map_generator::class_map_generator::ClassMapGenerator;
-use shirabe_external_packages::symfony::console::formatter::OutputFormatter;
use shirabe_pcre::{CaptureKey, Preg};
use shirabe_php_shim::{
InvalidArgumentException, PhpMixed, array_keys, array_map, array_merge_map,
@@ -31,6 +30,7 @@ use shirabe_php_shim::{
substr, substr_count, trim, unlink, var_export,
};
use shirabe_semver::constraint::Bound;
+use shirabe_symfony_console::formatter::OutputFormatter;
#[derive(Debug)]
pub struct AutoloadGenerator {
diff --git a/crates/shirabe/src/command/about_command.rs b/crates/shirabe/src/command/about_command.rs
index 764ecf5f..0d680727 100644
--- a/crates/shirabe/src/command/about_command.rs
+++ b/crates/shirabe/src/command/about_command.rs
@@ -4,10 +4,10 @@ use crate::command::BaseCommand;
use crate::command::BaseCommandData;
use crate::command::base_command::base_command_initialize;
use crate::composer;
-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_shim::impl_php_class;
+use shirabe_symfony_console::command::command::Command;
+use shirabe_symfony_console::input::InputInterface;
+use shirabe_symfony_console::output::OutputInterface;
#[derive(Debug)]
pub struct AboutCommand {
@@ -69,13 +69,13 @@ impl Command for AboutCommand {
fn complete(
&self,
- input: &shirabe_external_packages::symfony::console::completion::completion_input::CompletionInput,
- suggestions: &mut shirabe_external_packages::symfony::console::completion::completion_suggestions::CompletionSuggestions,
+ input: &shirabe_symfony_console::completion::completion_input::CompletionInput,
+ suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions,
) -> anyhow::Result<()> {
crate::command::base_command::base_command_complete(self, input, suggestions)
}
- 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 AboutCommand {
diff --git a/crates/shirabe/src/command/archive_command.rs b/crates/shirabe/src/command/archive_command.rs
index 659ab9c2..d863b8b3 100644
--- a/crates/shirabe/src/command/archive_command.rs
+++ b/crates/shirabe/src/command/archive_command.rs
@@ -26,11 +26,11 @@ use crate::util::Platform;
use crate::util::ProcessExecutor;
use crate::util::r#loop::Loop;
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_pcre::{CaptureKey, Preg};
use shirabe_php_shim::{LogicException, get_debug_type, impl_php_class, php_regex};
+use shirabe_symfony_console::command::command::Command;
+use shirabe_symfony_console::input::InputInterface;
+use shirabe_symfony_console::output::OutputInterface;
#[derive(Debug)]
pub struct ArchiveCommand {
@@ -451,13 +451,13 @@ impl Command for ArchiveCommand {
fn complete(
&self,
- input: &shirabe_external_packages::symfony::console::completion::completion_input::CompletionInput,
- suggestions: &mut shirabe_external_packages::symfony::console::completion::completion_suggestions::CompletionSuggestions,
+ input: &shirabe_symfony_console::completion::completion_input::CompletionInput,
+ suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions,
) -> anyhow::Result<()> {
crate::command::base_command::base_command_complete(self, input, suggestions)
}
- 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 ArchiveCommand {
diff --git a/crates/shirabe/src/command/audit_command.rs b/crates/shirabe/src/command/audit_command.rs
index 268984d6..c631a870 100644
--- a/crates/shirabe/src/command/audit_command.rs
+++ b/crates/shirabe/src/command/audit_command.rs
@@ -13,13 +13,13 @@ use crate::repository::InstalledRepository;
use crate::repository::RepositoryInterface;
use crate::repository::RepositorySet;
use crate::repository::RepositoryUtils;
-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_shim::{
InvalidArgumentException, PhpMixed, UnexpectedValueException, impl_php_class, implode,
in_array_strict,
};
+use shirabe_symfony_console::command::command::Command;
+use shirabe_symfony_console::input::InputInterface;
+use shirabe_symfony_console::output::OutputInterface;
#[derive(Debug)]
pub struct AuditCommand {
@@ -287,13 +287,13 @@ impl Command for AuditCommand {
fn complete(
&self,
- input: &shirabe_external_packages::symfony::console::completion::completion_input::CompletionInput,
- suggestions: &mut shirabe_external_packages::symfony::console::completion::completion_suggestions::CompletionSuggestions,
+ input: &shirabe_symfony_console::completion::completion_input::CompletionInput,
+ suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions,
) -> anyhow::Result<()> {
crate::command::base_command::base_command_complete(self, input, suggestions)
}
- 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 AuditCommand {
diff --git a/crates/shirabe/src/command/base_command.rs b/crates/shirabe/src/command/base_command.rs
index a1de9783..ceb71bf1 100644
--- a/crates/shirabe/src/command/base_command.rs
+++ b/crates/shirabe/src/command/base_command.rs
@@ -18,18 +18,16 @@ use crate::plugin::PluginEvents;
use crate::plugin::PreCommandRunEvent;
use crate::util::Platform;
use indexmap::IndexMap;
-use shirabe_external_packages::symfony::console::Terminal;
-use shirabe_external_packages::symfony::console::command::command::{
- Command, CommandData, SetDefinitionArg,
-};
-use shirabe_external_packages::symfony::console::helper::Table;
-use shirabe_external_packages::symfony::console::helper::TableSeparator;
-use shirabe_external_packages::symfony::console::input::InputInterface;
-use shirabe_external_packages::symfony::console::output::OutputInterface;
use shirabe_php_shim::{
InvalidArgumentException, LogicException, PhpClass, PhpMixed, RuntimeException,
UnexpectedValueException, count, explode, in_array_strict, is_string,
};
+use shirabe_symfony_console::Terminal;
+use shirabe_symfony_console::command::command::{Command, CommandData, SetDefinitionArg};
+use shirabe_symfony_console::helper::Table;
+use shirabe_symfony_console::helper::TableSeparator;
+use shirabe_symfony_console::input::InputInterface;
+use shirabe_symfony_console::output::OutputInterface;
pub const SUCCESS: i64 = 0;
pub const FAILURE: i64 = 1;
@@ -251,26 +249,26 @@ pub trait BaseCommand: Command {
#[macro_export]
macro_rules! delegate_base_command_trait_impls_to_inner {
($field:ident) => {
- shirabe_external_packages::delegate_to_inner!($field, fn require_composer(&self, disable_plugins: Option<bool>, disable_scripts: Option<bool>) -> anyhow::Result<$crate::composer::PartialComposerHandle>);
- shirabe_external_packages::delegate_to_inner!($field, fn try_composer(&self, disable_plugins: Option<bool>, disable_scripts: Option<bool>) -> Option<$crate::composer::PartialComposerHandle>);
- shirabe_external_packages::delegate_to_inner!($field, fn set_composer(&self, composer: $crate::composer::PartialComposerHandle));
- shirabe_external_packages::delegate_to_inner!($field, fn reset_composer(&self) -> anyhow::Result<()>);
- shirabe_external_packages::delegate_to_inner!($field, fn get_io(&self) -> std::rc::Rc<std::cell::RefCell<dyn $crate::io::IOInterface>>);
- shirabe_external_packages::delegate_to_inner!($field, fn set_io(&self, io: std::rc::Rc<std::cell::RefCell<dyn $crate::io::IOInterface>>));
- shirabe_external_packages::delegate_to_inner!($field, fn create_composer_instance(&self, input: std::rc::Rc<std::cell::RefCell<dyn shirabe_external_packages::symfony::console::input::InputInterface>>, io: std::rc::Rc<std::cell::RefCell<dyn $crate::io::IOInterface>>, config: Option<indexmap::IndexMap<String, shirabe_php_shim::PhpMixed>>, disable_plugins: bool, disable_scripts: Option<bool>) -> anyhow::Result<$crate::composer::PartialComposerHandle>);
- shirabe_external_packages::delegate_to_inner!($field, fn get_preferred_install_options(&self, config: &$crate::config::Config, input: std::rc::Rc<std::cell::RefCell<dyn shirabe_external_packages::symfony::console::input::InputInterface>>, keep_vcs_requires_prefer_source: bool) -> anyhow::Result<(bool, bool)>);
- shirabe_external_packages::delegate_to_inner!($field, fn get_platform_requirement_filter(&self, input: std::rc::Rc<std::cell::RefCell<dyn shirabe_external_packages::symfony::console::input::InputInterface>>) -> anyhow::Result<std::rc::Rc<dyn $crate::filter::platform_requirement_filter::PlatformRequirementFilterInterface>>);
- shirabe_external_packages::delegate_to_inner!($field, fn format_requirements(&self, requirements: Vec<String>) -> anyhow::Result<indexmap::IndexMap<String, String>>);
- shirabe_external_packages::delegate_to_inner!($field, fn normalize_requirements(&self, requirements: Vec<String>) -> anyhow::Result<Vec<indexmap::IndexMap<String, String>>>);
- shirabe_external_packages::delegate_to_inner!($field, fn render_table(&self, table: Vec<shirabe_php_shim::PhpMixed>, output: std::rc::Rc<std::cell::RefCell<dyn shirabe_external_packages::symfony::console::output::OutputInterface>>));
- shirabe_external_packages::delegate_to_inner!($field, fn get_terminal_width(&self) -> i64);
- shirabe_external_packages::delegate_to_inner!($field, fn get_audit_format(&self, input: std::rc::Rc<std::cell::RefCell<dyn shirabe_external_packages::symfony::console::input::InputInterface>>, opt_name: &str) -> anyhow::Result<String>);
- shirabe_external_packages::delegate_to_inner!($field, fn create_audit_config(&self, config: &mut $crate::config::Config, input: std::rc::Rc<std::cell::RefCell<dyn shirabe_external_packages::symfony::console::input::InputInterface>>) -> anyhow::Result<$crate::advisory::AuditConfig>);
+ shirabe_symfony_console::delegate_to_inner!($field, fn require_composer(&self, disable_plugins: Option<bool>, disable_scripts: Option<bool>) -> anyhow::Result<$crate::composer::PartialComposerHandle>);
+ shirabe_symfony_console::delegate_to_inner!($field, fn try_composer(&self, disable_plugins: Option<bool>, disable_scripts: Option<bool>) -> Option<$crate::composer::PartialComposerHandle>);
+ shirabe_symfony_console::delegate_to_inner!($field, fn set_composer(&self, composer: $crate::composer::PartialComposerHandle));
+ shirabe_symfony_console::delegate_to_inner!($field, fn reset_composer(&self) -> anyhow::Result<()>);
+ shirabe_symfony_console::delegate_to_inner!($field, fn get_io(&self) -> std::rc::Rc<std::cell::RefCell<dyn $crate::io::IOInterface>>);
+ shirabe_symfony_console::delegate_to_inner!($field, fn set_io(&self, io: std::rc::Rc<std::cell::RefCell<dyn $crate::io::IOInterface>>));
+ shirabe_symfony_console::delegate_to_inner!($field, fn create_composer_instance(&self, input: std::rc::Rc<std::cell::RefCell<dyn shirabe_symfony_console::input::InputInterface>>, io: std::rc::Rc<std::cell::RefCell<dyn $crate::io::IOInterface>>, config: Option<indexmap::IndexMap<String, shirabe_php_shim::PhpMixed>>, disable_plugins: bool, disable_scripts: Option<bool>) -> anyhow::Result<$crate::composer::PartialComposerHandle>);
+ shirabe_symfony_console::delegate_to_inner!($field, fn get_preferred_install_options(&self, config: &$crate::config::Config, input: std::rc::Rc<std::cell::RefCell<dyn shirabe_symfony_console::input::InputInterface>>, keep_vcs_requires_prefer_source: bool) -> anyhow::Result<(bool, bool)>);
+ shirabe_symfony_console::delegate_to_inner!($field, fn get_platform_requirement_filter(&self, input: std::rc::Rc<std::cell::RefCell<dyn shirabe_symfony_console::input::InputInterface>>) -> anyhow::Result<std::rc::Rc<dyn $crate::filter::platform_requirement_filter::PlatformRequirementFilterInterface>>);
+ shirabe_symfony_console::delegate_to_inner!($field, fn format_requirements(&self, requirements: Vec<String>) -> anyhow::Result<indexmap::IndexMap<String, String>>);
+ shirabe_symfony_console::delegate_to_inner!($field, fn normalize_requirements(&self, requirements: Vec<String>) -> anyhow::Result<Vec<indexmap::IndexMap<String, String>>>);
+ shirabe_symfony_console::delegate_to_inner!($field, fn render_table(&self, table: Vec<shirabe_php_shim::PhpMixed>, output: std::rc::Rc<std::cell::RefCell<dyn shirabe_symfony_console::output::OutputInterface>>));
+ shirabe_symfony_console::delegate_to_inner!($field, fn get_terminal_width(&self) -> i64);
+ shirabe_symfony_console::delegate_to_inner!($field, fn get_audit_format(&self, input: std::rc::Rc<std::cell::RefCell<dyn shirabe_symfony_console::input::InputInterface>>, opt_name: &str) -> anyhow::Result<String>);
+ shirabe_symfony_console::delegate_to_inner!($field, fn create_audit_config(&self, config: &mut $crate::config::Config, input: std::rc::Rc<std::cell::RefCell<dyn shirabe_symfony_console::input::InputInterface>>) -> anyhow::Result<$crate::advisory::AuditConfig>);
};
}
impl Command for BaseCommandData {
- shirabe_external_packages::delegate_command_trait_impls_to_inner!(inner);
+ shirabe_symfony_console::delegate_command_trait_impls_to_inner!(inner);
}
impl PhpClass for BaseCommandData {
@@ -299,7 +297,8 @@ impl BaseCommand for BaseCommandData {
};
let composer = {
let mut app_ref = application.borrow_mut();
- let app_dyn: &mut dyn shirabe_external_packages::symfony::console::application::Application = &mut *app_ref;
+ let app_dyn: &mut dyn shirabe_symfony_console::application::Application =
+ &mut *app_ref;
let app = app_dyn
.as_any_mut()
.downcast_mut::<Application>()
@@ -326,7 +325,8 @@ impl BaseCommand for BaseCommandData {
{
let result = {
let mut app_ref = application.borrow_mut();
- let app_dyn: &mut dyn shirabe_external_packages::symfony::console::application::Application = &mut *app_ref;
+ let app_dyn: &mut dyn shirabe_symfony_console::application::Application =
+ &mut *app_ref;
let app = app_dyn
.as_any_mut()
.downcast_mut::<Application>()
@@ -349,7 +349,7 @@ impl BaseCommand for BaseCommandData {
*self.composer.borrow_mut() = None;
if let Some(application) = self.get_application() {
let mut app_ref = application.borrow_mut();
- let app_dyn: &mut dyn shirabe_external_packages::symfony::console::application::Application = &mut *app_ref;
+ let app_dyn: &mut dyn shirabe_symfony_console::application::Application = &mut *app_ref;
let app = app_dyn
.as_any_mut()
.downcast_mut::<Application>()
@@ -365,7 +365,8 @@ impl BaseCommand for BaseCommandData {
Some(application) => {
let io = {
let app_ref = application.borrow();
- let app_dyn: &dyn shirabe_external_packages::symfony::console::application::Application = &*app_ref;
+ let app_dyn: &dyn shirabe_symfony_console::application::Application =
+ &*app_ref;
let app = app_dyn
.as_any()
.downcast_ref::<Application>()
@@ -717,19 +718,14 @@ impl BaseCommand for BaseCommandData {
/// (same for `getDisableScriptsByDefault()`), ORed into the caller's flags.
fn apply_application_defaults(
application: Option<
- std::rc::Rc<
- std::cell::RefCell<
- dyn shirabe_external_packages::symfony::console::application::Application,
- >,
- >,
+ std::rc::Rc<std::cell::RefCell<dyn shirabe_symfony_console::application::Application>>,
>,
mut disable_plugins: bool,
mut disable_scripts: bool,
) -> (bool, bool) {
if let Some(application) = application {
let app_ref = application.borrow();
- let app_dyn: &dyn shirabe_external_packages::symfony::console::application::Application =
- &*app_ref;
+ let app_dyn: &dyn shirabe_symfony_console::application::Application = &*app_ref;
let app = app_dyn
.as_any()
.downcast_ref::<Application>()
@@ -745,10 +741,10 @@ fn apply_application_defaults(
/// each command's `Command::complete` forwards here.
pub fn base_command_complete(
cmd: &dyn BaseCommand,
- input: &shirabe_external_packages::symfony::console::completion::completion_input::CompletionInput,
- suggestions: &mut shirabe_external_packages::symfony::console::completion::completion_suggestions::CompletionSuggestions,
+ input: &shirabe_symfony_console::completion::completion_input::CompletionInput,
+ suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions,
) -> anyhow::Result<()> {
- use shirabe_external_packages::symfony::console::completion::completion_input::CompletionInput;
+ use shirabe_symfony_console::completion::completion_input::CompletionInput;
// PHP: (string) $input->getCompletionName()
let name = input.get_completion_name().unwrap_or_default();
diff --git a/crates/shirabe/src/command/base_config_command.rs b/crates/shirabe/src/command/base_config_command.rs
index a2a51d4b..3be49394 100644
--- a/crates/shirabe/src/command/base_config_command.rs
+++ b/crates/shirabe/src/command/base_config_command.rs
@@ -9,9 +9,9 @@ use crate::json::JsonFile;
use crate::util::Platform;
use crate::util::Silencer;
use indexmap::IndexMap;
-use shirabe_external_packages::symfony::console::input::InputInterface;
-use shirabe_external_packages::symfony::console::output::OutputInterface;
use shirabe_php_shim::{PhpMixed, chmod, touch};
+use shirabe_symfony_console::input::InputInterface;
+use shirabe_symfony_console::output::OutputInterface;
pub trait BaseConfigCommand: BaseCommand {
fn config(&self) -> Option<std::rc::Rc<std::cell::RefCell<Config>>>;
diff --git a/crates/shirabe/src/command/base_dependency_command.rs b/crates/shirabe/src/command/base_dependency_command.rs
index e46cac8c..6dc049ff 100644
--- a/crates/shirabe/src/command/base_dependency_command.rs
+++ b/crates/shirabe/src/command/base_dependency_command.rs
@@ -14,13 +14,13 @@ use crate::repository::{DependentsEntry, InstalledRepository, NeedleInput};
use crate::repository::{FindPackageConstraint, RepositoryInterface};
use crate::util::PackageInfo;
use indexmap::IndexMap;
-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;
+use shirabe_symfony_console::formatter::OutputFormatter;
+use shirabe_symfony_console::formatter::OutputFormatterStyle;
+use shirabe_symfony_console::input::InputInterface;
+use shirabe_symfony_console::output::OutputInterface;
pub const ARGUMENT_PACKAGE: &str = "package";
pub const ARGUMENT_CONSTRAINT: &str = "version";
@@ -90,7 +90,7 @@ pub trait BaseDependencyCommand: BaseCommand {
{
output.borrow().writeln(
&["<warning>No dependencies installed. Try running composer install or update, or use --locked.</warning>".to_string()],
- shirabe_external_packages::symfony::console::output::OUTPUT_NORMAL,
+ shirabe_symfony_console::output::OUTPUT_NORMAL,
);
return Ok(1);
diff --git a/crates/shirabe/src/command/bump_command.rs b/crates/shirabe/src/command/bump_command.rs
index 63793c8a..99761b18 100644
--- a/crates/shirabe/src/command/bump_command.rs
+++ b/crates/shirabe/src/command/bump_command.rs
@@ -16,14 +16,14 @@ use crate::package::version::VersionBumper;
use crate::repository::PlatformRepository;
use crate::util::Filesystem;
use crate::util::Silencer;
-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_pcre::Preg;
use shirabe_php_shim::{
PhpMixed, file_get_contents, file_put_contents, impl_php_class, is_writable, php_regex,
strtolower,
};
+use shirabe_symfony_console::command::command::Command;
+use shirabe_symfony_console::input::InputInterface;
+use shirabe_symfony_console::output::OutputInterface;
#[derive(Debug)]
pub struct BumpCommand {
@@ -442,13 +442,13 @@ impl Command for BumpCommand {
fn complete(
&self,
- input: &shirabe_external_packages::symfony::console::completion::completion_input::CompletionInput,
- suggestions: &mut shirabe_external_packages::symfony::console::completion::completion_suggestions::CompletionSuggestions,
+ input: &shirabe_symfony_console::completion::completion_input::CompletionInput,
+ suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions,
) -> anyhow::Result<()> {
crate::command::base_command::base_command_complete(self, input, suggestions)
}
- 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 BumpCommand {
diff --git a/crates/shirabe/src/command/check_platform_reqs_command.rs b/crates/shirabe/src/command/check_platform_reqs_command.rs
index 4e105e69..b69f4190 100644
--- a/crates/shirabe/src/command/check_platform_reqs_command.rs
+++ b/crates/shirabe/src/command/check_platform_reqs_command.rs
@@ -12,12 +12,12 @@ use crate::repository::PlatformRepository;
use crate::repository::RepositoryInterface;
use crate::repository::RootPackageRepository;
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_shim::{PhpMixed, array_merge_map, impl_php_class, strip_tags};
use shirabe_semver::constraint::AnyConstraint;
use shirabe_semver::constraint::SimpleConstraint;
+use shirabe_symfony_console::command::command::Command;
+use shirabe_symfony_console::input::InputInterface;
+use shirabe_symfony_console::output::OutputInterface;
struct CheckResult {
platform_package: String,
@@ -413,13 +413,13 @@ impl Command for CheckPlatformReqsCommand {
fn complete(
&self,
- input: &shirabe_external_packages::symfony::console::completion::completion_input::CompletionInput,
- suggestions: &mut shirabe_external_packages::symfony::console::completion::completion_suggestions::CompletionSuggestions,
+ input: &shirabe_symfony_console::completion::completion_input::CompletionInput,
+ suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions,
) -> anyhow::Result<()> {
crate::command::base_command::base_command_complete(self, input, suggestions)
}
- 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 CheckPlatformReqsCommand {
diff --git a/crates/shirabe/src/command/clear_cache_command.rs b/crates/shirabe/src/command/clear_cache_command.rs
index 430352b9..fcc237af 100644
--- a/crates/shirabe/src/command/clear_cache_command.rs
+++ b/crates/shirabe/src/command/clear_cache_command.rs
@@ -8,10 +8,10 @@ use crate::config::Config;
use crate::console::input::InputOption;
use crate::factory::Factory;
use crate::io::IOInterfaceImmutable;
-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_shim::{impl_php_class, realpath};
+use shirabe_symfony_console::command::command::Command;
+use shirabe_symfony_console::input::InputInterface;
+use shirabe_symfony_console::output::OutputInterface;
#[derive(Debug)]
pub struct ClearCacheCommand {
@@ -188,13 +188,13 @@ impl Command for ClearCacheCommand {
fn complete(
&self,
- input: &shirabe_external_packages::symfony::console::completion::completion_input::CompletionInput,
- suggestions: &mut shirabe_external_packages::symfony::console::completion::completion_suggestions::CompletionSuggestions,
+ input: &shirabe_symfony_console::completion::completion_input::CompletionInput,
+ suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions,
) -> anyhow::Result<()> {
crate::command::base_command::base_command_complete(self, input, suggestions)
}
- 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 ClearCacheCommand {
diff --git a/crates/shirabe/src/command/config_command.rs b/crates/shirabe/src/command/config_command.rs
index a1e332be..a0660aca 100644
--- a/crates/shirabe/src/command/config_command.rs
+++ b/crates/shirabe/src/command/config_command.rs
@@ -18,9 +18,6 @@ use crate::util::Filesystem;
use crate::util::Platform;
use crate::util::Silencer;
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_pcre::{CaptureKey, Preg};
use shirabe_php_shim::{
InvalidArgumentException, PhpMixed, RuntimeException, array_is_list, array_merge,
@@ -29,6 +26,9 @@ use shirabe_php_shim::{
php_regex, str_replace, strpos, strtolower, system, touch, var_export,
};
use shirabe_semver::VersionParser;
+use shirabe_symfony_console::command::command::Command;
+use shirabe_symfony_console::input::InputInterface;
+use shirabe_symfony_console::output::OutputInterface;
#[derive(Debug)]
pub struct ConfigCommand {
@@ -333,9 +333,7 @@ impl ConfigCommand {
// PHP passes the CompletionInput itself; the accessors only read from it, so a
// clone behind a fresh handle is equivalent.
let input_handle: std::rc::Rc<
- std::cell::RefCell<
- dyn shirabe_external_packages::symfony::console::input::InputInterface,
- >,
+ std::cell::RefCell<dyn shirabe_symfony_console::input::InputInterface>,
> = std::rc::Rc::new(std::cell::RefCell::new(input.clone()));
// initialize configuration
@@ -1580,13 +1578,13 @@ impl Command for ConfigCommand {
fn complete(
&self,
- input: &shirabe_external_packages::symfony::console::completion::completion_input::CompletionInput,
- suggestions: &mut shirabe_external_packages::symfony::console::completion::completion_suggestions::CompletionSuggestions,
+ input: &shirabe_symfony_console::completion::completion_input::CompletionInput,
+ suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions,
) -> anyhow::Result<()> {
crate::command::base_command::base_command_complete(self, input, suggestions)
}
- 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 ConfigCommand {
diff --git a/crates/shirabe/src/command/create_project_command.rs b/crates/shirabe/src/command/create_project_command.rs
index 7a11e44e..a0a4aa2e 100644
--- a/crates/shirabe/src/command/create_project_command.rs
+++ b/crates/shirabe/src/command/create_project_command.rs
@@ -37,9 +37,6 @@ use crate::util::Platform;
use crate::util::ProcessExecutor;
use indexmap::IndexMap;
use shirabe_external_packages::seld::signal::SignalHandler;
-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_pcre::{CaptureKey, Preg};
use shirabe_php_shim::Catch as _;
use shirabe_php_shim::{
@@ -47,6 +44,9 @@ use shirabe_php_shim::{
chdir, explode_with_limit, file_exists, getcwd, impl_php_class, implode, is_dir, is_file,
mkdir, realpath, rtrim, strtolower, unlink,
};
+use shirabe_symfony_console::command::command::Command;
+use shirabe_symfony_console::input::InputInterface;
+use shirabe_symfony_console::output::OutputInterface;
use shirabe_symfony_finder::Finder;
use std::path::PathBuf;
@@ -1021,13 +1021,13 @@ impl Command for CreateProjectCommand {
fn complete(
&self,
- input: &shirabe_external_packages::symfony::console::completion::completion_input::CompletionInput,
- suggestions: &mut shirabe_external_packages::symfony::console::completion::completion_suggestions::CompletionSuggestions,
+ input: &shirabe_symfony_console::completion::completion_input::CompletionInput,
+ suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions,
) -> anyhow::Result<()> {
crate::command::base_command::base_command_complete(self, input, suggestions)
}
- 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 CreateProjectCommand {
diff --git a/crates/shirabe/src/command/depends_command.rs b/crates/shirabe/src/command/depends_command.rs
index 974e55b1..7ffa9281 100644
--- a/crates/shirabe/src/command/depends_command.rs
+++ b/crates/shirabe/src/command/depends_command.rs
@@ -7,10 +7,10 @@ use crate::command::CompletionTrait;
use crate::command::base_command::base_command_initialize;
use crate::console::input::InputArgument;
use crate::console::input::InputOption;
-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_shim::impl_php_class;
+use shirabe_symfony_console::command::command::Command;
+use shirabe_symfony_console::input::InputInterface;
+use shirabe_symfony_console::output::OutputInterface;
#[derive(Debug)]
pub struct DependsCommand {
@@ -119,13 +119,13 @@ impl Command for DependsCommand {
fn complete(
&self,
- input: &shirabe_external_packages::symfony::console::completion::completion_input::CompletionInput,
- suggestions: &mut shirabe_external_packages::symfony::console::completion::completion_suggestions::CompletionSuggestions,
+ input: &shirabe_symfony_console::completion::completion_input::CompletionInput,
+ suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions,
) -> anyhow::Result<()> {
crate::command::base_command::base_command_complete(self, input, suggestions)
}
- 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 DependsCommand {
diff --git a/crates/shirabe/src/command/diagnose_command.rs b/crates/shirabe/src/command/diagnose_command.rs
index b6b1ffad..eade37fc 100644
--- a/crates/shirabe/src/command/diagnose_command.rs
+++ b/crates/shirabe/src/command/diagnose_command.rs
@@ -33,9 +33,6 @@ use crate::util::ProcessExecutor;
use crate::util::http::ProxyManager;
use crate::util::http::RequestProxy;
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_pcre::{CaptureKey, Preg};
use shirabe_php_shim::Catch as _;
use shirabe_php_shim::{
@@ -44,6 +41,9 @@ use shirabe_php_shim::{
is_string, php_regex, rtrim, str_contains, str_replace, str_starts_with, strpos, strstr,
strstr3, strtolower, trim, version_compare,
};
+use shirabe_symfony_console::command::command::Command;
+use shirabe_symfony_console::input::InputInterface;
+use shirabe_symfony_console::output::OutputInterface;
use shirabe_symfony_process::ExecutableFinder;
#[derive(Debug)]
@@ -634,13 +634,12 @@ impl DiagnoseCommand {
)?);
repo_set.add_repository(composer_repo_as_repo)?;
- let io: std::rc::Rc<std::cell::RefCell<dyn IOInterface>> = std::rc::Rc::new(
- std::cell::RefCell::new(BufferIO::new(
+ let io: std::rc::Rc<std::cell::RefCell<dyn IOInterface>> =
+ std::rc::Rc::new(std::cell::RefCell::new(BufferIO::new(
String::new(),
- shirabe_external_packages::symfony::console::output::output_interface::VERBOSITY_NORMAL,
+ shirabe_symfony_console::output::output_interface::VERBOSITY_NORMAL,
None,
- )?),
- );
+ )?));
let result = match auditor.audit(
&io,
&repo_set,
@@ -1503,13 +1502,13 @@ impl Command for DiagnoseCommand {
fn complete(
&self,
- input: &shirabe_external_packages::symfony::console::completion::completion_input::CompletionInput,
- suggestions: &mut shirabe_external_packages::symfony::console::completion::completion_suggestions::CompletionSuggestions,
+ input: &shirabe_symfony_console::completion::completion_input::CompletionInput,
+ suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions,
) -> anyhow::Result<()> {
crate::command::base_command::base_command_complete(self, input, suggestions)
}
- 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 DiagnoseCommand {
diff --git a/crates/shirabe/src/command/dump_autoload_command.rs b/crates/shirabe/src/command/dump_autoload_command.rs
index f9be4cff..8bf491cb 100644
--- a/crates/shirabe/src/command/dump_autoload_command.rs
+++ b/crates/shirabe/src/command/dump_autoload_command.rs
@@ -7,10 +7,10 @@ use crate::console::input::InputOption;
use crate::io::IOInterfaceImmutable;
use crate::plugin::CommandEvent;
use crate::plugin::PluginEvents;
-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_shim::{InvalidArgumentException, PhpMixed, file_exists, impl_php_class};
+use shirabe_symfony_console::command::command::Command;
+use shirabe_symfony_console::input::InputInterface;
+use shirabe_symfony_console::output::OutputInterface;
#[derive(Debug)]
pub struct DumpAutoloadCommand {
@@ -303,13 +303,13 @@ impl Command for DumpAutoloadCommand {
fn complete(
&self,
- input: &shirabe_external_packages::symfony::console::completion::completion_input::CompletionInput,
- suggestions: &mut shirabe_external_packages::symfony::console::completion::completion_suggestions::CompletionSuggestions,
+ input: &shirabe_symfony_console::completion::completion_input::CompletionInput,
+ suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions,
) -> anyhow::Result<()> {
crate::command::base_command::base_command_complete(self, input, suggestions)
}
- 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 DumpAutoloadCommand {
diff --git a/crates/shirabe/src/command/exec_command.rs b/crates/shirabe/src/command/exec_command.rs
index 61391117..e5825e3b 100644
--- a/crates/shirabe/src/command/exec_command.rs
+++ b/crates/shirabe/src/command/exec_command.rs
@@ -7,10 +7,10 @@ use crate::console::Application;
use crate::console::input::InputArgument;
use crate::console::input::InputOption;
use crate::io::IOInterfaceImmutable;
-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_shim::{PhpMixed, RuntimeException, basename, chdir, getcwd, glob, impl_php_class};
+use shirabe_symfony_console::command::command::Command;
+use shirabe_symfony_console::input::InputInterface;
+use shirabe_symfony_console::output::OutputInterface;
#[derive(Debug)]
pub struct ExecCommand {
@@ -208,8 +208,7 @@ impl Command for ExecCommand {
let initial_working_directory = self.get_application().and_then(|application| {
let application = application.borrow();
- let app_dyn: &dyn shirabe_external_packages::symfony::console::application::Application =
- &*application;
+ let app_dyn: &dyn shirabe_symfony_console::application::Application = &*application;
app_dyn
.as_any()
.downcast_ref::<Application>()
@@ -257,13 +256,13 @@ impl Command for ExecCommand {
fn complete(
&self,
- input: &shirabe_external_packages::symfony::console::completion::completion_input::CompletionInput,
- suggestions: &mut shirabe_external_packages::symfony::console::completion::completion_suggestions::CompletionSuggestions,
+ input: &shirabe_symfony_console::completion::completion_input::CompletionInput,
+ suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions,
) -> anyhow::Result<()> {
crate::command::base_command::base_command_complete(self, input, suggestions)
}
- 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 ExecCommand {
diff --git a/crates/shirabe/src/command/fund_command.rs b/crates/shirabe/src/command/fund_command.rs
index fe4914cc..1151c365 100644
--- a/crates/shirabe/src/command/fund_command.rs
+++ b/crates/shirabe/src/command/fund_command.rs
@@ -10,14 +10,14 @@ use crate::package::base_package::{self};
use crate::repository::CompositeRepository;
use crate::repository::RepositoryInterface;
use indexmap::IndexMap;
-use shirabe_external_packages::symfony::console::command::command::Command;
-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_pcre::Preg;
use shirabe_php_shim::{PhpMixed, impl_php_class, php_regex};
use shirabe_semver::constraint::AnyConstraint;
use shirabe_semver::constraint::MatchAllConstraint;
+use shirabe_symfony_console::command::command::Command;
+use shirabe_symfony_console::formatter::OutputFormatter;
+use shirabe_symfony_console::input::InputInterface;
+use shirabe_symfony_console::output::OutputInterface;
#[derive(Debug)]
pub struct FundCommand {
@@ -229,13 +229,13 @@ impl Command for FundCommand {
fn complete(
&self,
- input: &shirabe_external_packages::symfony::console::completion::completion_input::CompletionInput,
- suggestions: &mut shirabe_external_packages::symfony::console::completion::completion_suggestions::CompletionSuggestions,
+ input: &shirabe_symfony_console::completion::completion_input::CompletionInput,
+ suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions,
) -> anyhow::Result<()> {
crate::command::base_command::base_command_complete(self, input, suggestions)
}
- 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 FundCommand {
diff --git a/crates/shirabe/src/command/global_command.rs b/crates/shirabe/src/command/global_command.rs
index e122dd06..f60cc4a0 100644
--- a/crates/shirabe/src/command/global_command.rs
+++ b/crates/shirabe/src/command/global_command.rs
@@ -8,18 +8,18 @@ use crate::console::input::InputArgument;
use crate::factory::Factory;
use crate::util::Filesystem;
use crate::util::Platform;
-use shirabe_external_packages::symfony::console::command::command::Command;
-use shirabe_external_packages::symfony::console::completion::completion_input::CompletionInput;
-use shirabe_external_packages::symfony::console::completion::completion_suggestions::{
- CompletionSuggestions, StringOrSuggestion,
-};
-use shirabe_external_packages::symfony::console::input::ArgvInput;
-use shirabe_external_packages::symfony::console::input::ArrayInput;
-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_pcre::Preg;
use shirabe_php_shim::{LogicException, RuntimeException, chdir, impl_php_class, php_regex};
+use shirabe_symfony_console::command::command::Command;
+use shirabe_symfony_console::completion::completion_input::CompletionInput;
+use shirabe_symfony_console::completion::completion_suggestions::{
+ CompletionSuggestions, StringOrSuggestion,
+};
+use shirabe_symfony_console::input::ArgvInput;
+use shirabe_symfony_console::input::ArrayInput;
+use shirabe_symfony_console::input::InputInterface;
+use shirabe_symfony_console::input::StringInput;
+use shirabe_symfony_console::output::OutputInterface;
use std::path::Path;
#[derive(Debug)]
@@ -270,7 +270,7 @@ impl Command for GlobalCommand {
base_command_initialize(self, input, output)
}
- 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 GlobalCommand {
diff --git a/crates/shirabe/src/command/home_command.rs b/crates/shirabe/src/command/home_command.rs
index 9a7902ae..226872d5 100644
--- a/crates/shirabe/src/command/home_command.rs
+++ b/crates/shirabe/src/command/home_command.rs
@@ -12,11 +12,11 @@ use crate::repository::RepositoryFactory;
use crate::repository::RootPackageRepository;
use crate::util::Platform;
use crate::util::ProcessExecutor;
-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_shim::filter_var_url;
use shirabe_php_shim::{PhpMixed, impl_php_class};
+use shirabe_symfony_console::command::command::Command;
+use shirabe_symfony_console::input::InputInterface;
+use shirabe_symfony_console::output::OutputInterface;
#[derive(Debug)]
pub struct HomeCommand {
@@ -265,13 +265,13 @@ impl Command for HomeCommand {
fn complete(
&self,
- input: &shirabe_external_packages::symfony::console::completion::completion_input::CompletionInput,
- suggestions: &mut shirabe_external_packages::symfony::console::completion::completion_suggestions::CompletionSuggestions,
+ input: &shirabe_symfony_console::completion::completion_input::CompletionInput,
+ suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions,
) -> anyhow::Result<()> {
crate::command::base_command::base_command_complete(self, input, suggestions)
}
- 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 HomeCommand {
diff --git a/crates/shirabe/src/command/init_command.rs b/crates/shirabe/src/command/init_command.rs
index 8af9a37d..3a095416 100644
--- a/crates/shirabe/src/command/init_command.rs
+++ b/crates/shirabe/src/command/init_command.rs
@@ -19,11 +19,6 @@ use crate::util::Filesystem;
use crate::util::ProcessExecutor;
use crate::util::Silencer;
use indexmap::IndexMap;
-use shirabe_external_packages::symfony::console::command::command::Command;
-use shirabe_external_packages::symfony::console::helper::FormatBlockMessages;
-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_pcre::{CaptureKey, Preg};
use shirabe_php_shim::Catch as _;
use shirabe_php_shim::{
@@ -34,6 +29,11 @@ use shirabe_php_shim::{
ucwords,
};
use shirabe_spdx_licenses::SpdxLicenses;
+use shirabe_symfony_console::command::command::Command;
+use shirabe_symfony_console::helper::FormatBlockMessages;
+use shirabe_symfony_console::input::ArrayInput;
+use shirabe_symfony_console::input::InputInterface;
+use shirabe_symfony_console::output::OutputInterface;
#[derive(Debug)]
pub struct InitCommand {
@@ -1250,13 +1250,13 @@ impl Command for InitCommand {
fn complete(
&self,
- input: &shirabe_external_packages::symfony::console::completion::completion_input::CompletionInput,
- suggestions: &mut shirabe_external_packages::symfony::console::completion::completion_suggestions::CompletionSuggestions,
+ input: &shirabe_symfony_console::completion::completion_input::CompletionInput,
+ suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions,
) -> anyhow::Result<()> {
crate::command::base_command::base_command_complete(self, input, suggestions)
}
- 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 InitCommand {
diff --git a/crates/shirabe/src/command/install_command.rs b/crates/shirabe/src/command/install_command.rs
index 944df2dd..264cbbeb 100644
--- a/crates/shirabe/src/command/install_command.rs
+++ b/crates/shirabe/src/command/install_command.rs
@@ -13,10 +13,10 @@ use crate::io::IOInterfaceImmutable;
use crate::plugin::CommandEvent;
use crate::plugin::PluginEvents;
use crate::util::HttpDownloader;
-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_shim::{PhpMixed, impl_php_class};
+use shirabe_symfony_console::command::command::Command;
+use shirabe_symfony_console::input::InputInterface;
+use shirabe_symfony_console::output::OutputInterface;
#[derive(Debug)]
pub struct InstallCommand {
@@ -274,13 +274,13 @@ impl Command for InstallCommand {
fn complete(
&self,
- input: &shirabe_external_packages::symfony::console::completion::completion_input::CompletionInput,
- suggestions: &mut shirabe_external_packages::symfony::console::completion::completion_suggestions::CompletionSuggestions,
+ input: &shirabe_symfony_console::completion::completion_input::CompletionInput,
+ suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions,
) -> anyhow::Result<()> {
crate::command::base_command::base_command_complete(self, input, suggestions)
}
- 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 InstallCommand {
diff --git a/crates/shirabe/src/command/licenses_command.rs b/crates/shirabe/src/command/licenses_command.rs
index 1b2ec6b6..ed64061a 100644
--- a/crates/shirabe/src/command/licenses_command.rs
+++ b/crates/shirabe/src/command/licenses_command.rs
@@ -13,14 +13,14 @@ use crate::repository::RepositoryUtils;
use crate::util::PackageInfo;
use crate::util::PackageSorter;
use indexmap::IndexMap;
-use shirabe_external_packages::symfony::console::command::command::Command;
-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::StyleInterface;
-use shirabe_external_packages::symfony::console::style::SymfonyStyle;
use shirabe_php_shim::{PhpMixed, RuntimeException, UnexpectedValueException, impl_php_class};
+use shirabe_symfony_console::command::command::Command;
+use shirabe_symfony_console::formatter::OutputFormatter;
+use shirabe_symfony_console::helper::Table;
+use shirabe_symfony_console::input::InputInterface;
+use shirabe_symfony_console::output::OutputInterface;
+use shirabe_symfony_console::style::StyleInterface;
+use shirabe_symfony_console::style::SymfonyStyle;
#[derive(Debug)]
pub struct LicensesCommand {
@@ -332,13 +332,13 @@ impl Command for LicensesCommand {
fn complete(
&self,
- input: &shirabe_external_packages::symfony::console::completion::completion_input::CompletionInput,
- suggestions: &mut shirabe_external_packages::symfony::console::completion::completion_suggestions::CompletionSuggestions,
+ input: &shirabe_symfony_console::completion::completion_input::CompletionInput,
+ suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions,
) -> anyhow::Result<()> {
crate::command::base_command::base_command_complete(self, input, suggestions)
}
- 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 LicensesCommand {
diff --git a/crates/shirabe/src/command/outdated_command.rs b/crates/shirabe/src/command/outdated_command.rs
index fe865dac..6d062d97 100644
--- a/crates/shirabe/src/command/outdated_command.rs
+++ b/crates/shirabe/src/command/outdated_command.rs
@@ -8,11 +8,11 @@ use crate::console::input::InputArgument;
use crate::console::input::InputOption;
use crate::console::input::SuggestedValues;
use indexmap::IndexMap;
-use shirabe_external_packages::symfony::console::command::command::Command;
-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, impl_php_class};
+use shirabe_symfony_console::command::command::Command;
+use shirabe_symfony_console::input::ArrayInput;
+use shirabe_symfony_console::input::InputInterface;
+use shirabe_symfony_console::output::OutputInterface;
#[derive(Debug)]
pub struct OutdatedCommand {
@@ -235,13 +235,13 @@ impl Command for OutdatedCommand {
fn complete(
&self,
- input: &shirabe_external_packages::symfony::console::completion::completion_input::CompletionInput,
- suggestions: &mut shirabe_external_packages::symfony::console::completion::completion_suggestions::CompletionSuggestions,
+ input: &shirabe_symfony_console::completion::completion_input::CompletionInput,
+ suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions,
) -> anyhow::Result<()> {
crate::command::base_command::base_command_complete(self, input, suggestions)
}
- 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 OutdatedCommand {
diff --git a/crates/shirabe/src/command/package_discovery_trait.rs b/crates/shirabe/src/command/package_discovery_trait.rs
index 5d3072d6..b68be252 100644
--- a/crates/shirabe/src/command/package_discovery_trait.rs
+++ b/crates/shirabe/src/command/package_discovery_trait.rs
@@ -19,8 +19,6 @@ use crate::repository::RepositorySet;
use crate::repository::{RepositoryInterface, SearchResult};
use crate::util::Filesystem;
use indexmap::IndexMap;
-use shirabe_external_packages::symfony::console::input::InputInterface;
-use shirabe_external_packages::symfony::console::output::OutputInterface;
use shirabe_pcre::{CaptureKey, Preg};
use shirabe_php_shim::Catch as _;
use shirabe_php_shim::{
@@ -28,6 +26,8 @@ use shirabe_php_shim::{
array_slice, asort, explode, file_get_contents, implode, in_array_strict, is_array, is_file,
is_numeric, json_decode, levenshtein, php_regex, strlen, strpos, trim,
};
+use shirabe_symfony_console::input::InputInterface;
+use shirabe_symfony_console::output::OutputInterface;
/// @internal
pub trait PackageDiscoveryTrait: BaseCommand {
diff --git a/crates/shirabe/src/command/prohibits_command.rs b/crates/shirabe/src/command/prohibits_command.rs
index da853f49..893c4f4a 100644
--- a/crates/shirabe/src/command/prohibits_command.rs
+++ b/crates/shirabe/src/command/prohibits_command.rs
@@ -6,10 +6,10 @@ use crate::command::base_command::base_command_initialize;
use crate::command::{BaseCommand, BaseCommandData};
use crate::console::input::InputArgument;
use crate::console::input::InputOption;
-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_shim::impl_php_class;
+use shirabe_symfony_console::command::command::Command;
+use shirabe_symfony_console::input::InputInterface;
+use shirabe_symfony_console::output::OutputInterface;
#[derive(Debug)]
pub struct ProhibitsCommand {
@@ -126,13 +126,13 @@ impl Command for ProhibitsCommand {
fn complete(
&self,
- input: &shirabe_external_packages::symfony::console::completion::completion_input::CompletionInput,
- suggestions: &mut shirabe_external_packages::symfony::console::completion::completion_suggestions::CompletionSuggestions,
+ input: &shirabe_symfony_console::completion::completion_input::CompletionInput,
+ suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions,
) -> anyhow::Result<()> {
crate::command::base_command::base_command_complete(self, input, suggestions)
}
- 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 ProhibitsCommand {
diff --git a/crates/shirabe/src/command/reinstall_command.rs b/crates/shirabe/src/command/reinstall_command.rs
index e79e72ff..c9a1d2ea 100644
--- a/crates/shirabe/src/command/reinstall_command.rs
+++ b/crates/shirabe/src/command/reinstall_command.rs
@@ -15,11 +15,11 @@ use crate::plugin::CommandEvent;
use crate::plugin::PluginEvents;
use crate::script::ScriptEvents;
use crate::util::Platform;
-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_pcre::Preg;
use shirabe_php_shim::{InvalidArgumentException, impl_php_class};
+use shirabe_symfony_console::command::command::Command;
+use shirabe_symfony_console::input::InputInterface;
+use shirabe_symfony_console::output::OutputInterface;
#[derive(Debug)]
pub struct ReinstallCommand {
@@ -344,13 +344,13 @@ impl Command for ReinstallCommand {
fn complete(
&self,
- input: &shirabe_external_packages::symfony::console::completion::completion_input::CompletionInput,
- suggestions: &mut shirabe_external_packages::symfony::console::completion::completion_suggestions::CompletionSuggestions,
+ input: &shirabe_symfony_console::completion::completion_input::CompletionInput,
+ suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions,
) -> anyhow::Result<()> {
crate::command::base_command::base_command_complete(self, input, suggestions)
}
- 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 ReinstallCommand {
diff --git a/crates/shirabe/src/command/remove_command.rs b/crates/shirabe/src/command/remove_command.rs
index 3015ed95..50e68045 100644
--- a/crates/shirabe/src/command/remove_command.rs
+++ b/crates/shirabe/src/command/remove_command.rs
@@ -17,12 +17,12 @@ use crate::json::JsonFile;
use crate::package::base_package;
use crate::repository::RepositoryInterface;
use indexmap::IndexMap;
-use shirabe_external_packages::symfony::console::command::command::Command;
-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_pcre::Preg;
use shirabe_php_shim::{PhpMixed, UnexpectedValueException, impl_php_class, strtolower};
+use shirabe_symfony_console::command::command::Command;
+use shirabe_symfony_console::exception::InvalidArgumentException;
+use shirabe_symfony_console::input::InputInterface;
+use shirabe_symfony_console::output::OutputInterface;
#[derive(Debug)]
pub struct RemoveCommand {
@@ -715,13 +715,13 @@ impl Command for RemoveCommand {
fn complete(
&self,
- input: &shirabe_external_packages::symfony::console::completion::completion_input::CompletionInput,
- suggestions: &mut shirabe_external_packages::symfony::console::completion::completion_suggestions::CompletionSuggestions,
+ input: &shirabe_symfony_console::completion::completion_input::CompletionInput,
+ suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions,
) -> anyhow::Result<()> {
crate::command::base_command::base_command_complete(self, input, suggestions)
}
- 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 RemoveCommand {
diff --git a/crates/shirabe/src/command/repository_command.rs b/crates/shirabe/src/command/repository_command.rs
index 38484bc4..b03c0133 100644
--- a/crates/shirabe/src/command/repository_command.rs
+++ b/crates/shirabe/src/command/repository_command.rs
@@ -10,14 +10,14 @@ use crate::console::input::InputOption;
use crate::io::IOInterfaceImmutable;
use crate::json::JsonFile;
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_pcre::Preg;
use shirabe_php_shim::{
InvalidArgumentException, PHP_URL_HOST, PhpMixed, RuntimeException, impl_php_class, parse_url,
php_regex, strtolower,
};
+use shirabe_symfony_console::command::command::Command;
+use shirabe_symfony_console::input::InputInterface;
+use shirabe_symfony_console::output::OutputInterface;
#[derive(Debug)]
pub struct RepositoryCommand {
@@ -160,9 +160,7 @@ impl RepositoryCommand {
// PHP passes the CompletionInput itself; the accessors only read from it, so a
// clone behind a fresh handle is equivalent.
let input_handle: std::rc::Rc<
- std::cell::RefCell<
- dyn shirabe_external_packages::symfony::console::input::InputInterface,
- >,
+ std::cell::RefCell<dyn shirabe_symfony_console::input::InputInterface>,
> = std::rc::Rc::new(std::cell::RefCell::new(input.clone()));
let config = crate::factory::Factory::create_config(None, None)?;
let config_file = JsonFile::new(
@@ -580,13 +578,13 @@ impl Command for RepositoryCommand {
fn complete(
&self,
- input: &shirabe_external_packages::symfony::console::completion::completion_input::CompletionInput,
- suggestions: &mut shirabe_external_packages::symfony::console::completion::completion_suggestions::CompletionSuggestions,
+ input: &shirabe_symfony_console::completion::completion_input::CompletionInput,
+ suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions,
) -> anyhow::Result<()> {
crate::command::base_command::base_command_complete(self, input, suggestions)
}
- 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 RepositoryCommand {
diff --git a/crates/shirabe/src/command/require_command.rs b/crates/shirabe/src/command/require_command.rs
index 88916175..44ebc54c 100644
--- a/crates/shirabe/src/command/require_command.rs
+++ b/crates/shirabe/src/command/require_command.rs
@@ -33,14 +33,14 @@ use crate::util::PackageSorter;
use crate::util::Silencer;
use indexmap::IndexMap;
use shirabe_external_packages::seld::signal::SignalHandler;
-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_shim::{
PhpMixed, RuntimeException, array_fill_keys, array_intersect, array_keys, array_map,
array_merge, array_unique, empty, file_exists, file_get_contents, file_put_contents, filesize,
impl_php_class, implode, is_writable, strtolower, unlink,
};
+use shirabe_symfony_console::command::command::Command;
+use shirabe_symfony_console::input::InputInterface;
+use shirabe_symfony_console::output::OutputInterface;
#[derive(Debug)]
pub struct RequireCommand {
@@ -1289,13 +1289,13 @@ impl Command for RequireCommand {
fn complete(
&self,
- input: &shirabe_external_packages::symfony::console::completion::completion_input::CompletionInput,
- suggestions: &mut shirabe_external_packages::symfony::console::completion::completion_suggestions::CompletionSuggestions,
+ input: &shirabe_symfony_console::completion::completion_input::CompletionInput,
+ suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions,
) -> anyhow::Result<()> {
crate::command::base_command::base_command_complete(self, input, suggestions)
}
- 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 RequireCommand {
diff --git a/crates/shirabe/src/command/run_script_command.rs b/crates/shirabe/src/command/run_script_command.rs
index be50c4be..56833daa 100644
--- a/crates/shirabe/src/command/run_script_command.rs
+++ b/crates/shirabe/src/command/run_script_command.rs
@@ -11,14 +11,14 @@ use crate::script::ScriptEvents;
use crate::util::Platform;
use crate::util::ProcessExecutor;
use indexmap::IndexMap;
-use shirabe_external_packages::symfony::console::command::command::Command;
-use shirabe_external_packages::symfony::console::exception::CommandNotFoundException;
-use shirabe_external_packages::symfony::console::exception::namespace_not_found_exception::NamespaceNotFoundException;
-use shirabe_external_packages::symfony::console::input::InputInterface;
-use shirabe_external_packages::symfony::console::output::OutputInterface;
use shirabe_php_shim::Catch as _;
use shirabe_php_shim::{InvalidArgumentException, RuntimeException};
use shirabe_php_shim::{PhpMixed, impl_php_class};
+use shirabe_symfony_console::command::command::Command;
+use shirabe_symfony_console::exception::CommandNotFoundException;
+use shirabe_symfony_console::exception::namespace_not_found_exception::NamespaceNotFoundException;
+use shirabe_symfony_console::input::InputInterface;
+use shirabe_symfony_console::output::OutputInterface;
#[derive(Debug)]
pub struct RunScriptCommand {
@@ -347,13 +347,13 @@ impl Command for RunScriptCommand {
fn complete(
&self,
- input: &shirabe_external_packages::symfony::console::completion::completion_input::CompletionInput,
- suggestions: &mut shirabe_external_packages::symfony::console::completion::completion_suggestions::CompletionSuggestions,
+ input: &shirabe_symfony_console::completion::completion_input::CompletionInput,
+ suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions,
) -> anyhow::Result<()> {
crate::command::base_command::base_command_complete(self, input, suggestions)
}
- 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 RunScriptCommand {
diff --git a/crates/shirabe/src/command/script_alias_command.rs b/crates/shirabe/src/command/script_alias_command.rs
index 5aa65109..214cb51f 100644
--- a/crates/shirabe/src/command/script_alias_command.rs
+++ b/crates/shirabe/src/command/script_alias_command.rs
@@ -6,13 +6,13 @@ use crate::command::base_command::base_command_initialize;
use crate::console::input::InputArgument;
use crate::console::input::InputOption;
use crate::util::Platform;
-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_pcre::Preg;
use shirabe_php_shim::{
InvalidArgumentException, LogicException, PhpMixed, impl_php_class, is_string, php_regex,
};
+use shirabe_symfony_console::command::command::Command;
+use shirabe_symfony_console::input::InputInterface;
+use shirabe_symfony_console::output::OutputInterface;
#[derive(Debug)]
pub struct ScriptAliasCommand {
@@ -171,13 +171,13 @@ impl Command for ScriptAliasCommand {
fn complete(
&self,
- input: &shirabe_external_packages::symfony::console::completion::completion_input::CompletionInput,
- suggestions: &mut shirabe_external_packages::symfony::console::completion::completion_suggestions::CompletionSuggestions,
+ input: &shirabe_symfony_console::completion::completion_input::CompletionInput,
+ suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions,
) -> anyhow::Result<()> {
crate::command::base_command::base_command_complete(self, input, suggestions)
}
- 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 ScriptAliasCommand {
diff --git a/crates/shirabe/src/command/search_command.rs b/crates/shirabe/src/command/search_command.rs
index 51432ed9..3f797551 100644
--- a/crates/shirabe/src/command/search_command.rs
+++ b/crates/shirabe/src/command/search_command.rs
@@ -14,13 +14,13 @@ use crate::repository::PlatformRepository;
use crate::repository::RepositoryInterfaceHandle;
use crate::repository::repository_interface::{self, AbandonedInfo, RepositoryInterface};
use indexmap::IndexMap;
-use shirabe_external_packages::symfony::console::command::command::Command;
-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, impl_php_class, implode, in_array_loose, preg_quote, substr,
};
+use shirabe_symfony_console::command::command::Command;
+use shirabe_symfony_console::formatter::OutputFormatter;
+use shirabe_symfony_console::input::InputInterface;
+use shirabe_symfony_console::output::OutputInterface;
#[derive(Debug)]
pub struct SearchCommand {
@@ -307,13 +307,13 @@ impl Command for SearchCommand {
fn complete(
&self,
- input: &shirabe_external_packages::symfony::console::completion::completion_input::CompletionInput,
- suggestions: &mut shirabe_external_packages::symfony::console::completion::completion_suggestions::CompletionSuggestions,
+ input: &shirabe_symfony_console::completion::completion_input::CompletionInput,
+ suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions,
) -> anyhow::Result<()> {
crate::command::base_command::base_command_complete(self, input, suggestions)
}
- 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 SearchCommand {
diff --git a/crates/shirabe/src/command/self_update_command.rs b/crates/shirabe/src/command/self_update_command.rs
index 55aca0dc..6872730e 100644
--- a/crates/shirabe/src/command/self_update_command.rs
+++ b/crates/shirabe/src/command/self_update_command.rs
@@ -7,10 +7,10 @@ use crate::console::input::InputArgument;
use crate::console::input::InputOption;
use crate::io::IOInterfaceImmutable;
use crate::io::io_interface;
-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_shim::{PhpMixed, impl_php_class};
+use shirabe_symfony_console::command::command::Command;
+use shirabe_symfony_console::input::InputInterface;
+use shirabe_symfony_console::output::OutputInterface;
#[derive(Debug)]
pub struct SelfUpdateCommand {
@@ -95,13 +95,13 @@ impl Command for SelfUpdateCommand {
fn complete(
&self,
- input: &shirabe_external_packages::symfony::console::completion::completion_input::CompletionInput,
- suggestions: &mut shirabe_external_packages::symfony::console::completion::completion_suggestions::CompletionSuggestions,
+ input: &shirabe_symfony_console::completion::completion_input::CompletionInput,
+ suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions,
) -> anyhow::Result<()> {
crate::command::base_command::base_command_complete(self, input, suggestions)
}
- 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 SelfUpdateCommand {
diff --git a/crates/shirabe/src/command/show_command.rs b/crates/shirabe/src/command/show_command.rs
index 178d0947..c456f71a 100644
--- a/crates/shirabe/src/command/show_command.rs
+++ b/crates/shirabe/src/command/show_command.rs
@@ -36,11 +36,6 @@ use crate::repository::RepositoryUtils;
use crate::repository::RootPackageRepository;
use crate::util::PackageInfo;
use indexmap::IndexMap;
-use shirabe_external_packages::symfony::console::command::command::Command;
-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_pcre::{CaptureKey, Preg};
use shirabe_php_shim::{
CmpOp, DATE_ATOM, InvalidArgumentException, LogicException, PhpMixed, UnexpectedValueException,
@@ -50,6 +45,11 @@ use shirabe_php_shim::{
use shirabe_semver::Semver;
use shirabe_semver::constraint::AnyConstraint;
use shirabe_spdx_licenses::SpdxLicenses;
+use shirabe_symfony_console::command::command::Command;
+use shirabe_symfony_console::formatter::OutputFormatter;
+use shirabe_symfony_console::formatter::OutputFormatterStyle;
+use shirabe_symfony_console::input::InputInterface;
+use shirabe_symfony_console::output::OutputInterface;
#[derive(Debug)]
pub struct ShowCommand {
@@ -2885,13 +2885,13 @@ impl Command for ShowCommand {
fn complete(
&self,
- input: &shirabe_external_packages::symfony::console::completion::completion_input::CompletionInput,
- suggestions: &mut shirabe_external_packages::symfony::console::completion::completion_suggestions::CompletionSuggestions,
+ input: &shirabe_symfony_console::completion::completion_input::CompletionInput,
+ suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions,
) -> anyhow::Result<()> {
crate::command::base_command::base_command_complete(self, input, suggestions)
}
- 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 ShowCommand {
diff --git a/crates/shirabe/src/command/status_command.rs b/crates/shirabe/src/command/status_command.rs
index 7a8ac04c..097d7a40 100644
--- a/crates/shirabe/src/command/status_command.rs
+++ b/crates/shirabe/src/command/status_command.rs
@@ -13,10 +13,10 @@ use crate::plugin::PluginEvents;
use crate::script::ScriptEvents;
use crate::util::ProcessExecutor;
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_shim::impl_php_class;
+use shirabe_symfony_console::command::command::Command;
+use shirabe_symfony_console::input::InputInterface;
+use shirabe_symfony_console::output::OutputInterface;
#[derive(Debug)]
pub struct StatusCommand {
@@ -390,13 +390,13 @@ impl Command for StatusCommand {
fn complete(
&self,
- input: &shirabe_external_packages::symfony::console::completion::completion_input::CompletionInput,
- suggestions: &mut shirabe_external_packages::symfony::console::completion::completion_suggestions::CompletionSuggestions,
+ input: &shirabe_symfony_console::completion::completion_input::CompletionInput,
+ suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions,
) -> anyhow::Result<()> {
crate::command::base_command::base_command_complete(self, input, suggestions)
}
- 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 StatusCommand {
diff --git a/crates/shirabe/src/command/suggests_command.rs b/crates/shirabe/src/command/suggests_command.rs
index 96989dc0..fba93b79 100644
--- a/crates/shirabe/src/command/suggests_command.rs
+++ b/crates/shirabe/src/command/suggests_command.rs
@@ -12,10 +12,10 @@ use crate::repository::RepositoryInterface;
use crate::repository::RepositoryInterfaceHandle;
use crate::repository::RootPackageRepository;
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_shim::{PhpMixed, empty, impl_php_class, in_array_loose};
+use shirabe_symfony_console::command::command::Command;
+use shirabe_symfony_console::input::InputInterface;
+use shirabe_symfony_console::output::OutputInterface;
#[derive(Debug)]
pub struct SuggestsCommand {
@@ -228,13 +228,13 @@ impl Command for SuggestsCommand {
fn complete(
&self,
- input: &shirabe_external_packages::symfony::console::completion::completion_input::CompletionInput,
- suggestions: &mut shirabe_external_packages::symfony::console::completion::completion_suggestions::CompletionSuggestions,
+ input: &shirabe_symfony_console::completion::completion_input::CompletionInput,
+ suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions,
) -> anyhow::Result<()> {
crate::command::base_command::base_command_complete(self, input, suggestions)
}
- 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 SuggestsCommand {
diff --git a/crates/shirabe/src/command/update_command.rs b/crates/shirabe/src/command/update_command.rs
index 1aff73c5..abf9696a 100644
--- a/crates/shirabe/src/command/update_command.rs
+++ b/crates/shirabe/src/command/update_command.rs
@@ -27,10 +27,6 @@ use crate::repository::PlatformRepository;
use crate::repository::RepositorySet;
use crate::util::HttpDownloader;
use indexmap::IndexMap;
-use shirabe_external_packages::symfony::console::command::command::Command;
-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_pcre::Preg;
use shirabe_php_shim::{
InvalidArgumentException, PhpMixed, RuntimeException, array_filter, array_intersect,
@@ -38,6 +34,10 @@ use shirabe_php_shim::{
};
use shirabe_semver::Intervals;
use shirabe_semver::constraint::MultiConstraint;
+use shirabe_symfony_console::command::command::Command;
+use shirabe_symfony_console::helper::Table;
+use shirabe_symfony_console::input::InputInterface;
+use shirabe_symfony_console::output::OutputInterface;
#[derive(Debug)]
pub struct UpdateCommand {
@@ -764,13 +764,13 @@ impl Command for UpdateCommand {
fn complete(
&self,
- input: &shirabe_external_packages::symfony::console::completion::completion_input::CompletionInput,
- suggestions: &mut shirabe_external_packages::symfony::console::completion::completion_suggestions::CompletionSuggestions,
+ input: &shirabe_symfony_console::completion::completion_input::CompletionInput,
+ suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions,
) -> anyhow::Result<()> {
crate::command::base_command::base_command_complete(self, input, suggestions)
}
- 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 UpdateCommand {
diff --git a/crates/shirabe/src/command/validate_command.rs b/crates/shirabe/src/command/validate_command.rs
index c663c868..116c0b27 100644
--- a/crates/shirabe/src/command/validate_command.rs
+++ b/crates/shirabe/src/command/validate_command.rs
@@ -13,10 +13,10 @@ use crate::plugin::CommandEvent;
use crate::plugin::PluginEvents;
use crate::util::ConfigValidator;
use crate::util::Filesystem;
-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_shim::impl_php_class;
+use shirabe_symfony_console::command::command::Command;
+use shirabe_symfony_console::input::InputInterface;
+use shirabe_symfony_console::output::OutputInterface;
#[derive(Debug)]
pub struct ValidateCommand {
@@ -406,13 +406,13 @@ impl Command for ValidateCommand {
fn complete(
&self,
- input: &shirabe_external_packages::symfony::console::completion::completion_input::CompletionInput,
- suggestions: &mut shirabe_external_packages::symfony::console::completion::completion_suggestions::CompletionSuggestions,
+ input: &shirabe_symfony_console::completion::completion_input::CompletionInput,
+ suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions,
) -> anyhow::Result<()> {
crate::command::base_command::base_command_complete(self, input, suggestions)
}
- 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 ValidateCommand {
diff --git a/crates/shirabe/src/console/application.rs b/crates/shirabe/src/console/application.rs
index 8b60c988..2e93c33d 100644
--- a/crates/shirabe/src/console/application.rs
+++ b/crates/shirabe/src/console/application.rs
@@ -56,42 +56,6 @@ use crate::util::Silencer;
use indexmap::IndexMap;
use shirabe_external_packages::composer::xdebug_handler::XdebugHandler;
use shirabe_external_packages::seld::json_lint::ParsingException;
-use shirabe_external_packages::symfony::console::application::Application as BaseApplication;
-use shirabe_external_packages::symfony::console::command::Command as SymfonyCommand;
-use shirabe_external_packages::symfony::console::command::help_command::HelpCommand;
-use shirabe_external_packages::symfony::console::command::signalable_command_interface::SignalableCommandInterface;
-use shirabe_external_packages::symfony::console::command_loader::command_loader_interface::CommandLoaderInterface;
-use shirabe_external_packages::symfony::console::completion::completion_input::CompletionInput;
-use shirabe_external_packages::symfony::console::completion::completion_suggestions::CompletionSuggestions;
-use shirabe_external_packages::symfony::console::exception::CommandNotFoundException;
-use shirabe_external_packages::symfony::console::exception::invalid_argument_exception::InvalidArgumentException as ConsoleInvalidArgumentException;
-use shirabe_external_packages::symfony::console::exception::invalid_option_exception::InvalidOptionException;
-use shirabe_external_packages::symfony::console::exception::logic_exception::LogicException as ConsoleLogicException;
-use shirabe_external_packages::symfony::console::exception::missing_input_exception::MissingInputException;
-use shirabe_external_packages::symfony::console::exception::namespace_not_found_exception::NamespaceNotFoundException;
-use shirabe_external_packages::symfony::console::exception::runtime_exception::RuntimeException as ConsoleRuntimeException;
-use shirabe_external_packages::symfony::console::formatter::output_formatter::OutputFormatter;
-use shirabe_external_packages::symfony::console::helper::HelperSet;
-use shirabe_external_packages::symfony::console::helper::QuestionHelper;
-use shirabe_external_packages::symfony::console::helper::formatter_helper::{
- FormatBlockMessages, FormatterHelper,
-};
-use shirabe_external_packages::symfony::console::helper::helper::Helper;
-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::input::argv_input::ArgvInput;
-use shirabe_external_packages::symfony::console::input::array_input::ArrayInput;
-use shirabe_external_packages::symfony::console::input::input_argument::InputArgument;
-use shirabe_external_packages::symfony::console::output::ConsoleOutputInterface;
-use shirabe_external_packages::symfony::console::output::console_output::ConsoleOutput;
-use shirabe_external_packages::symfony::console::output::output_interface::{
- self, OutputInterface,
-};
-use shirabe_external_packages::symfony::console::signal_registry::signal_registry::SignalRegistry;
-use shirabe_external_packages::symfony::console::style::style_interface::StyleInterface;
-use shirabe_external_packages::symfony::console::style::symfony_style::SymfonyStyle;
-use shirabe_external_packages::symfony::console::terminal::Terminal;
use shirabe_php_shim::Catch as _;
use shirabe_php_shim::{
LogicException as ShimLogicException, PHP_VERSION, PHP_VERSION_ID, PhpMixed, RuntimeException,
@@ -102,6 +66,38 @@ use shirabe_php_shim::{
php_uname, posix_getuid, random_bytes, realpath, restore_error_handler, round, str_contains,
str_replace, strpos, strtoupper, sys_get_temp_dir, time, unlink,
};
+use shirabe_symfony_console::application::Application as BaseApplication;
+use shirabe_symfony_console::command::Command as SymfonyCommand;
+use shirabe_symfony_console::command::help_command::HelpCommand;
+use shirabe_symfony_console::command::signalable_command_interface::SignalableCommandInterface;
+use shirabe_symfony_console::command_loader::command_loader_interface::CommandLoaderInterface;
+use shirabe_symfony_console::completion::completion_input::CompletionInput;
+use shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions;
+use shirabe_symfony_console::exception::CommandNotFoundException;
+use shirabe_symfony_console::exception::invalid_argument_exception::InvalidArgumentException as ConsoleInvalidArgumentException;
+use shirabe_symfony_console::exception::invalid_option_exception::InvalidOptionException;
+use shirabe_symfony_console::exception::logic_exception::LogicException as ConsoleLogicException;
+use shirabe_symfony_console::exception::missing_input_exception::MissingInputException;
+use shirabe_symfony_console::exception::namespace_not_found_exception::NamespaceNotFoundException;
+use shirabe_symfony_console::exception::runtime_exception::RuntimeException as ConsoleRuntimeException;
+use shirabe_symfony_console::formatter::output_formatter::OutputFormatter;
+use shirabe_symfony_console::helper::HelperSet;
+use shirabe_symfony_console::helper::QuestionHelper;
+use shirabe_symfony_console::helper::formatter_helper::{FormatBlockMessages, FormatterHelper};
+use shirabe_symfony_console::helper::helper::Helper;
+use shirabe_symfony_console::input::InputDefinition;
+use shirabe_symfony_console::input::InputInterface;
+use shirabe_symfony_console::input::InputOption;
+use shirabe_symfony_console::input::argv_input::ArgvInput;
+use shirabe_symfony_console::input::array_input::ArrayInput;
+use shirabe_symfony_console::input::input_argument::InputArgument;
+use shirabe_symfony_console::output::ConsoleOutputInterface;
+use shirabe_symfony_console::output::console_output::ConsoleOutput;
+use shirabe_symfony_console::output::output_interface::{self, OutputInterface};
+use shirabe_symfony_console::signal_registry::signal_registry::SignalRegistry;
+use shirabe_symfony_console::style::style_interface::StyleInterface;
+use shirabe_symfony_console::style::symfony_style::SymfonyStyle;
+use shirabe_symfony_console::terminal::Terminal;
use shirabe_symfony_process::exception::ProcessTimedOutException;
/// The PHP `Composer\Console\Application` and `Symfony\Component\Console\Application` are
@@ -782,12 +778,12 @@ impl Application {
}
}
// array_filter($commandNames)
- let filtered: Vec<shirabe_external_packages::symfony::console::completion::completion_suggestions::StringOrSuggestion> =
+ let filtered: Vec<shirabe_symfony_console::completion::completion_suggestions::StringOrSuggestion> =
command_names
.into_iter()
.filter(shirabe_php_shim::php_truthy)
.map(|n| {
- shirabe_external_packages::symfony::console::completion::completion_suggestions::StringOrSuggestion::String(
+ shirabe_symfony_console::completion::completion_suggestions::StringOrSuggestion::String(
shirabe_php_shim::php_to_string(&n),
)
})
@@ -1568,7 +1564,7 @@ impl Application {
/// Gets the default input definition (Symfony base; `parent::getDefaultInputDefinition`).
pub fn base_get_default_input_definition(&self) -> InputDefinition {
- use shirabe_external_packages::symfony::console::input::input_definition::DefinitionItem;
+ use shirabe_symfony_console::input::input_definition::DefinitionItem;
InputDefinition::new(vec![
DefinitionItem::InputArgument(
InputArgument::new(
@@ -1651,10 +1647,10 @@ impl Application {
pub fn base_get_default_commands(
&self,
) -> Vec<std::rc::Rc<std::cell::RefCell<dyn SymfonyCommand>>> {
- use shirabe_external_packages::symfony::console::command::complete_command::CompleteCommand;
- use shirabe_external_packages::symfony::console::command::dump_completion_command::DumpCompletionCommand;
- use shirabe_external_packages::symfony::console::command::help_command::HelpCommand;
- use shirabe_external_packages::symfony::console::command::list_command::ListCommand;
+ use shirabe_symfony_console::command::complete_command::CompleteCommand;
+ use shirabe_symfony_console::command::dump_completion_command::DumpCompletionCommand;
+ use shirabe_symfony_console::command::help_command::HelpCommand;
+ use shirabe_symfony_console::command::list_command::ListCommand;
vec![
std::rc::Rc::new(std::cell::RefCell::new(HelpCommand::new()))
@@ -3074,9 +3070,7 @@ pub(crate) fn run_worker_reverse_command(name: &str, input_line: &str) -> anyhow
};
let input: std::rc::Rc<std::cell::RefCell<dyn InputInterface>> =
std::rc::Rc::new(std::cell::RefCell::new(
- shirabe_external_packages::symfony::console::input::string_input::StringInput::new(
- &line,
- )?,
+ shirabe_symfony_console::input::string_input::StringInput::new(&line)?,
));
let output: std::rc::Rc<std::cell::RefCell<dyn OutputInterface>> = std::rc::Rc::new(
std::cell::RefCell::new(ConsoleOutput::new(None, None, None)?),
diff --git a/crates/shirabe/src/console/html_output_formatter.rs b/crates/shirabe/src/console/html_output_formatter.rs
index ddfd3044..2f523c37 100644
--- a/crates/shirabe/src/console/html_output_formatter.rs
+++ b/crates/shirabe/src/console/html_output_formatter.rs
@@ -1,10 +1,10 @@
//! ref: composer/src/Composer/Console/HtmlOutputFormatter.php
use indexmap::IndexMap;
-use shirabe_external_packages::symfony::console::formatter::OutputFormatter;
-use shirabe_external_packages::symfony::console::formatter::OutputFormatterInterface;
-use shirabe_external_packages::symfony::console::formatter::OutputFormatterStyleInterface;
use shirabe_pcre::{CaptureKey, Preg};
+use shirabe_symfony_console::formatter::OutputFormatter;
+use shirabe_symfony_console::formatter::OutputFormatterInterface;
+use shirabe_symfony_console::formatter::OutputFormatterStyleInterface;
#[derive(Debug)]
pub struct HtmlOutputFormatter {
diff --git a/crates/shirabe/src/console/input.rs b/crates/shirabe/src/console/input.rs
index 9661c7ad..b8076247 100644
--- a/crates/shirabe/src/console/input.rs
+++ b/crates/shirabe/src/console/input.rs
@@ -4,8 +4,8 @@ pub mod input_option;
pub use input_argument::*;
pub use input_option::*;
-use shirabe_external_packages::symfony::console::completion::completion_input::CompletionInput;
-use shirabe_external_packages::symfony::console::completion::completion_suggestions::{
+use shirabe_symfony_console::completion::completion_input::CompletionInput;
+use shirabe_symfony_console::completion::completion_suggestions::{
CompletionSuggestions, StringOrSuggestion,
};
@@ -90,8 +90,8 @@ impl InputDefinitionItem {
/// Converts to the Symfony-typed definition item accepted by `CommandData::set_definition`.
pub(crate) fn to_definition_item(
&self,
- ) -> shirabe_external_packages::symfony::console::input::input_definition::DefinitionItem {
- use shirabe_external_packages::symfony::console::input::input_definition::DefinitionItem;
+ ) -> shirabe_symfony_console::input::input_definition::DefinitionItem {
+ use shirabe_symfony_console::input::input_definition::DefinitionItem;
match self {
InputDefinitionItem::Argument(argument) => {
DefinitionItem::InputArgument(argument.to_base())
diff --git a/crates/shirabe/src/console/input/input_argument.rs b/crates/shirabe/src/console/input/input_argument.rs
index ab32ffba..ab6f174c 100644
--- a/crates/shirabe/src/console/input/input_argument.rs
+++ b/crates/shirabe/src/console/input/input_argument.rs
@@ -1,10 +1,10 @@
//! ref: composer/src/Composer/Console/Input/InputArgument.php
use crate::console::input::SuggestedValues;
-use shirabe_external_packages::symfony::console::completion::completion_input::CompletionInput;
-use shirabe_external_packages::symfony::console::completion::completion_suggestions::CompletionSuggestions;
-use shirabe_external_packages::symfony::console::input::InputArgument as BaseInputArgument;
use shirabe_php_shim::PhpMixed;
+use shirabe_symfony_console::completion::completion_input::CompletionInput;
+use shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions;
+use shirabe_symfony_console::input::InputArgument as BaseInputArgument;
#[derive(Debug)]
pub struct InputArgument {
diff --git a/crates/shirabe/src/console/input/input_option.rs b/crates/shirabe/src/console/input/input_option.rs
index 7fa3d699..8a9c19f7 100644
--- a/crates/shirabe/src/console/input/input_option.rs
+++ b/crates/shirabe/src/console/input/input_option.rs
@@ -1,10 +1,10 @@
//! ref: composer/src/Composer/Console/Input/InputOption.php
use crate::console::input::SuggestedValues;
-use shirabe_external_packages::symfony::console::completion::completion_input::CompletionInput;
-use shirabe_external_packages::symfony::console::completion::completion_suggestions::CompletionSuggestions;
-use shirabe_external_packages::symfony::console::input::InputOption as BaseInputOption;
use shirabe_php_shim::PhpMixed;
+use shirabe_symfony_console::completion::completion_input::CompletionInput;
+use shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions;
+use shirabe_symfony_console::input::InputOption as BaseInputOption;
#[derive(Debug)]
pub struct InputOption {
diff --git a/crates/shirabe/src/dependency_resolver/problem.rs b/crates/shirabe/src/dependency_resolver/problem.rs
index 99fc02b9..9ca4569c 100644
--- a/crates/shirabe/src/dependency_resolver/problem.rs
+++ b/crates/shirabe/src/dependency_resolver/problem.rs
@@ -10,7 +10,6 @@ use crate::repository::LockArrayRepository;
use crate::repository::PlatformRepository;
use crate::repository::RepositorySet;
use indexmap::IndexMap;
-use shirabe_external_packages::symfony::console::formatter::OutputFormatter;
use shirabe_pcre::{CaptureKey, Preg};
use shirabe_php_shim::{
CmpOp, LogicException, PhpMixed, defined, extension_loaded, implode, loosely_compare,
@@ -20,6 +19,7 @@ use shirabe_php_shim::{
use shirabe_semver::constraint::AnyConstraint;
use shirabe_semver::constraint::MultiConstraint;
use shirabe_semver::constraint::SimpleConstraint;
+use shirabe_symfony_console::formatter::OutputFormatter;
/// Represents a problem detected while solving dependencies
#[derive(Debug)]
diff --git a/crates/shirabe/src/event_dispatcher/event_dispatcher.rs b/crates/shirabe/src/event_dispatcher/event_dispatcher.rs
index 04c590c6..72db0543 100644
--- a/crates/shirabe/src/event_dispatcher/event_dispatcher.rs
+++ b/crates/shirabe/src/event_dispatcher/event_dispatcher.rs
@@ -21,7 +21,6 @@ use crate::script::Event as ScriptEvent;
use crate::util::Platform;
use crate::util::ProcessExecutor;
use indexmap::IndexMap;
-use shirabe_external_packages::symfony::console::output::output_interface;
use shirabe_pcre::{CaptureKey, Preg};
use shirabe_php_rpc::{
PhpThrow, PluginValue, RustMethodDispatcher, RustObjHandle, call_function,
@@ -36,6 +35,7 @@ use shirabe_php_shim::{
str_contains, str_ends_with, str_replace, str_starts_with, strlen, strpos, strtoupper, substr,
trim,
};
+use shirabe_symfony_console::output::output_interface;
use shirabe_symfony_process::ExecutableFinder;
use shirabe_symfony_process::PhpExecutableFinder;
diff --git a/crates/shirabe/src/factory.rs b/crates/shirabe/src/factory.rs
index 18ff8ef5..6d20c3cb 100644
--- a/crates/shirabe/src/factory.rs
+++ b/crates/shirabe/src/factory.rs
@@ -51,10 +51,6 @@ use crate::util::ProcessExecutor;
use crate::util::Silencer;
use crate::util::r#loop::Loop;
use indexmap::IndexMap;
-use shirabe_external_packages::symfony::console::formatter::OutputFormatter;
-use shirabe_external_packages::symfony::console::formatter::OutputFormatterStyle;
-use shirabe_external_packages::symfony::console::formatter::OutputFormatterStyleInterface;
-use shirabe_external_packages::symfony::console::output::ConsoleOutput;
use shirabe_php_shim::Catch as _;
use shirabe_php_shim::{
InvalidArgumentException, PATHINFO_EXTENSION, PHP_EOL, PHP_OS, PhpMixed, RuntimeException,
@@ -62,6 +58,10 @@ use shirabe_php_shim::{
file_exists, file_get_contents, file_put_contents, implode, is_dir, is_file, json_decode,
mkdir, pathinfo, realpath, rename, rtrim, strpos, strtr, substr, trim,
};
+use shirabe_symfony_console::formatter::OutputFormatter;
+use shirabe_symfony_console::formatter::OutputFormatterStyle;
+use shirabe_symfony_console::formatter::OutputFormatterStyleInterface;
+use shirabe_symfony_console::output::ConsoleOutput;
/// Either a configuration array or a filename to read from. PHP's `$localConfig` accepts both.
pub enum LocalConfigInput {
@@ -402,7 +402,7 @@ impl Factory {
let formatter = OutputFormatter::new(false, styles);
ConsoleOutput::new(
- Some(shirabe_external_packages::symfony::console::output::output_interface::VERBOSITY_NORMAL),
+ Some(shirabe_symfony_console::output::output_interface::VERBOSITY_NORMAL),
None,
Some(std::rc::Rc::new(std::cell::RefCell::new(formatter))),
)
diff --git a/crates/shirabe/src/installer/suggested_packages_reporter.rs b/crates/shirabe/src/installer/suggested_packages_reporter.rs
index 86540f50..916f647d 100644
--- a/crates/shirabe/src/installer/suggested_packages_reporter.rs
+++ b/crates/shirabe/src/installer/suggested_packages_reporter.rs
@@ -6,9 +6,9 @@ use crate::package::PackageInterfaceHandle;
use crate::repository::InstalledRepository;
use crate::repository::RepositoryInterface;
use indexmap::IndexMap;
-use shirabe_external_packages::symfony::console::formatter::OutputFormatter;
use shirabe_pcre::Preg;
use shirabe_php_shim::php_regex;
+use shirabe_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 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<PhpMixed>,
) -> Result<
PhpMixed,
- shirabe_external_packages::symfony::console::exception::InvalidArgumentException,
+ shirabe_symfony_console::exception::InvalidArgumentException,
>,
> = Box::new(move |answer: Option<PhpMixed>| {
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));
diff --git a/crates/shirabe/src/lib.rs b/crates/shirabe/src/lib.rs
index afcc0cee..7730bc66 100644
--- a/crates/shirabe/src/lib.rs
+++ b/crates/shirabe/src/lib.rs
@@ -32,7 +32,7 @@ pub mod util;
pub fn run(argv: Vec<String>) -> anyhow::Result<i32> {
use crate::console::ApplicationHandle;
use crate::util::Platform;
- use shirabe_external_packages::symfony::console::input::argv_input::ArgvInput;
+ use shirabe_symfony_console::input::argv_input::ArgvInput;
// TODO(php-runtime): the full initialization process in composer/bin/composer should be ported
// somewhere else that communicates with the real PHP runtime.
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 {
diff --git a/crates/shirabe/src/question/strict_confirmation_question.rs b/crates/shirabe/src/question/strict_confirmation_question.rs
index 4d246631..107b9c25 100644
--- a/crates/shirabe/src/question/strict_confirmation_question.rs
+++ b/crates/shirabe/src/question/strict_confirmation_question.rs
@@ -1,10 +1,10 @@
//! ref: composer/src/Composer/Question/StrictConfirmationQuestion.php
-use shirabe_external_packages::symfony::console::exception::InvalidArgumentException;
-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, empty, is_bool};
+use shirabe_symfony_console::exception::InvalidArgumentException;
+use shirabe_symfony_console::question::Question;
+use shirabe_symfony_console::question::QuestionInterface;
#[derive(Debug)]
pub struct StrictConfirmationQuestion {
diff --git a/crates/shirabe/src/util/loop.rs b/crates/shirabe/src/util/loop.rs
index f94788ac..5d2845c1 100644
--- a/crates/shirabe/src/util/loop.rs
+++ b/crates/shirabe/src/util/loop.rs
@@ -4,7 +4,7 @@ use crate::util::HttpDownloader;
use crate::util::ProcessExecutor;
use futures::StreamExt;
use futures::stream::FuturesUnordered;
-use shirabe_external_packages::symfony::console::helper::ProgressBar;
+use shirabe_symfony_console::helper::ProgressBar;
#[derive(Debug)]
pub struct Loop {
diff --git a/crates/shirabe/src/util/process_executor.rs b/crates/shirabe/src/util/process_executor.rs
index 56199868..91c27fd0 100644
--- a/crates/shirabe/src/util/process_executor.rs
+++ b/crates/shirabe/src/util/process_executor.rs
@@ -707,7 +707,7 @@ impl ProcessExecutor {
// the spawn request to the PHP child over that channel instead of calling `Process::start()`
// here. Release the permit on the child's completion notification, not by polling a
// Rust-owned process handle. The return type below is provisional: the real deliverable is a
- // handle to the live PHP-side Process object, not a `shirabe_external_packages` `Process`
+ // handle to the live PHP-side Process object, not a `shirabe_symfony_process` `Process`
// value, so this signature will need to change once the RPC plumbing exists.
pub fn execute_async_php<C>(
&mut self,
diff --git a/crates/shirabe/tests/advisory/auditor_test.rs b/crates/shirabe/tests/advisory/auditor_test.rs
index e3b72536..3a066ed7 100644
--- a/crates/shirabe/tests/advisory/auditor_test.rs
+++ b/crates/shirabe/tests/advisory/auditor_test.rs
@@ -24,11 +24,11 @@ use shirabe::repository::RepositoryInterfaceHandle;
use shirabe::repository::RepositorySet;
use shirabe::repository::SearchResult;
use shirabe::repository::SecurityAdvisoryResult;
-use shirabe_external_packages::symfony::console::output::output_interface;
use shirabe_php_shim::date_create;
use shirabe_semver::VersionParser;
use shirabe_semver::constraint::AnyConstraint;
use shirabe_semver::constraint::SimpleConstraint;
+use shirabe_symfony_console::output::output_interface;
fn constraint(operator: &str, version: &str) -> shirabe_semver::constraint::AnyConstraint {
SimpleConstraint::new(operator.to_string(), version.to_string(), None).into()
diff --git a/crates/shirabe/tests/application_test.rs b/crates/shirabe/tests/application_test.rs
index 4e8a0f05..f0bde547 100644
--- a/crates/shirabe/tests/application_test.rs
+++ b/crates/shirabe/tests/application_test.rs
@@ -12,12 +12,12 @@ use shirabe::command::about_command::AboutCommand;
use shirabe::command::self_update_command::SelfUpdateCommand;
use shirabe::console::application::ApplicationHandle;
use shirabe::util::platform::Platform;
-use shirabe_external_packages::symfony::console::command::Command;
-use shirabe_external_packages::symfony::console::input::array_input::ArrayInput;
-use shirabe_external_packages::symfony::console::input::input_interface::InputInterface;
-use shirabe_external_packages::symfony::console::output::buffered_output::BufferedOutput;
-use shirabe_external_packages::symfony::console::output::output_interface::OutputInterface;
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;
fn set_up() {
Platform::put_env("COMPOSER_DISABLE_XDEBUG_WARN", "1");
diff --git a/crates/shirabe/tests/autoload/autoload_generator_test.rs b/crates/shirabe/tests/autoload/autoload_generator_test.rs
index 81a4040f..cd0a3e5b 100644
--- a/crates/shirabe/tests/autoload/autoload_generator_test.rs
+++ b/crates/shirabe/tests/autoload/autoload_generator_test.rs
@@ -18,10 +18,10 @@ use shirabe::repository::{InstalledArrayRepository, InstalledRepositoryInterface
use shirabe::script::ScriptEvents;
use shirabe::util::http_downloader::HttpDownloader;
use shirabe::util::r#loop::Loop;
-use shirabe_external_packages::symfony::console::output::output_interface;
use shirabe_php_shim::{PhpMixed, dirname, preg_quote, realpath, strtr};
use shirabe_semver::VersionParser;
use shirabe_semver::constraint::{AnyConstraint, MatchAllConstraint, SimpleConstraint};
+use shirabe_symfony_console::output::output_interface;
use tempfile::TempDir;
/// The mock `InstallationManager::getInstallPath` used throughout the test: metapackages return
diff --git a/crates/shirabe/tests/command/archive_command_test.rs b/crates/shirabe/tests/command/archive_command_test.rs
index 6d20fda0..ac1ad462 100644
--- a/crates/shirabe/tests/command/archive_command_test.rs
+++ b/crates/shirabe/tests/command/archive_command_test.rs
@@ -15,13 +15,13 @@ use shirabe::repository::{
InstalledArrayRepository, RepositoryInterfaceHandle, RepositoryManagerInterface,
};
use shirabe::util::Platform;
-use shirabe_external_packages::symfony::console::command::command::Command;
-use shirabe_external_packages::symfony::console::input::InputInterface;
-use shirabe_external_packages::symfony::console::input::array_input::ArrayInput;
-use shirabe_external_packages::symfony::console::output::OutputInterface;
-use shirabe_external_packages::symfony::console::output::buffered_output::BufferedOutput;
use shirabe_php_shim::PhpMixed;
use shirabe_semver::VersionParser;
+use shirabe_symfony_console::command::command::Command;
+use shirabe_symfony_console::input::InputInterface;
+use shirabe_symfony_console::input::array_input::ArrayInput;
+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/io_mock.rs b/crates/shirabe/tests/common/io_mock.rs
index edb5806f..7ea3059c 100644
--- a/crates/shirabe/tests/common/io_mock.rs
+++ b/crates/shirabe/tests/common/io_mock.rs
@@ -5,9 +5,9 @@ use shirabe::io::buffer_io::BufferIO;
use shirabe::io::io_interface;
use shirabe::io::{IOInterface, IOInterfaceImmutable, IOInterfaceMutable};
use shirabe::util::platform::Platform;
-use shirabe_external_packages::symfony::console::output::output_interface;
use shirabe_pcre::Preg;
use shirabe_php_shim::{PHP_EOL, PhpMixed, php_regex, preg_quote};
+use shirabe_symfony_console::output::output_interface;
use std::collections::VecDeque;
// A single entry of the IO expectation list. PHP models these as associative
diff --git a/crates/shirabe/tests/common/test_case.rs b/crates/shirabe/tests/common/test_case.rs
index 7f8e1d54..e15d2883 100644
--- a/crates/shirabe/tests/common/test_case.rs
+++ b/crates/shirabe/tests/common/test_case.rs
@@ -21,16 +21,16 @@ use shirabe::util::http_downloader::HttpDownloader;
use shirabe::util::r#loop::Loop;
use shirabe::util::platform::Platform;
use shirabe::util::process_executor::ProcessExecutor;
-use shirabe_external_packages::symfony::console::input::array_input::ArrayInput;
-use shirabe_external_packages::symfony::console::input::input_interface::InputInterface;
-use shirabe_external_packages::symfony::console::input::streamable_input_interface::StreamableInputInterface;
-use shirabe_external_packages::symfony::console::output::console_output::ConsoleOutput;
-use shirabe_external_packages::symfony::console::output::console_output_interface::ConsoleOutputInterface;
-use shirabe_external_packages::symfony::console::output::output_interface::OutputInterface;
-use shirabe_external_packages::symfony::console::output::stream_output::StreamOutput;
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 std::path::PathBuf;
use tempfile::TempDir;
@@ -309,8 +309,8 @@ pub fn get_application_tester() -> ApplicationTester {
/// ref: Symfony\Component\Console\Tester\ApplicationTester::run options.
///
-/// Lives in the test harness (not `shirabe_external_packages`) because the tester drives shirabe's
-/// own `ApplicationHandle`, which the external-packages crate cannot depend on.
+/// Lives in the test harness (not `shirabe_symfony_console`) because the tester drives shirabe's
+/// own `ApplicationHandle`, which the console crate cannot depend on.
#[derive(Debug, Default)]
pub struct RunOptions {
pub interactive: Option<bool>,
diff --git a/crates/shirabe/tests/completion_functional_test.rs b/crates/shirabe/tests/completion_functional_test.rs
index 89478d9d..66f2f87b 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_external_packages::symfony::console::tester::command_completion_tester::CommandCompletionTester;
+use shirabe_symfony_console::tester::command_completion_tester::CommandCompletionTester;
struct RestoreCwd(std::path::PathBuf);
@@ -48,8 +48,7 @@ fn assert_complete(input: &str, expected_suggestions: Option<&[&str]>) {
let base = application.__base_application();
let command = {
let mut app_ref = base.borrow_mut();
- let app_dyn: &mut dyn shirabe_external_packages::symfony::console::application::Application =
- &mut *app_ref;
+ let app_dyn: &mut dyn shirabe_symfony_console::application::Application = &mut *app_ref;
let app = app_dyn
.as_any_mut()
.downcast_mut::<Application>()
diff --git a/crates/shirabe/tests/console/html_output_formatter_test.rs b/crates/shirabe/tests/console/html_output_formatter_test.rs
index 31bd460d..e0835973 100644
--- a/crates/shirabe/tests/console/html_output_formatter_test.rs
+++ b/crates/shirabe/tests/console/html_output_formatter_test.rs
@@ -2,9 +2,7 @@
use indexmap::IndexMap;
use shirabe::console::html_output_formatter::HtmlOutputFormatter;
-use shirabe_external_packages::symfony::console::formatter::{
- OutputFormatterStyle, OutputFormatterStyleInterface,
-};
+use shirabe_symfony_console::formatter::{OutputFormatterStyle, OutputFormatterStyleInterface};
#[test]
fn test_formatting() {
diff --git a/crates/shirabe/tests/documentation_test.rs b/crates/shirabe/tests/documentation_test.rs
index 7a13ce1d..ad945aa3 100644
--- a/crates/shirabe/tests/documentation_test.rs
+++ b/crates/shirabe/tests/documentation_test.rs
@@ -1,8 +1,8 @@
//! ref: composer/tests/Composer/Test/DocumentationTest.php
use shirabe::console::application::ApplicationHandle;
-use shirabe_external_packages::symfony::console::command::Command;
-use shirabe_external_packages::symfony::console::descriptor::application_description::ApplicationDescription;
+use shirabe_symfony_console::command::Command;
+use shirabe_symfony_console::descriptor::application_description::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/event_dispatcher/event_dispatcher_test.rs b/crates/shirabe/tests/event_dispatcher/event_dispatcher_test.rs
index 817a6954..a343d056 100644
--- a/crates/shirabe/tests/event_dispatcher/event_dispatcher_test.rs
+++ b/crates/shirabe/tests/event_dispatcher/event_dispatcher_test.rs
@@ -26,9 +26,9 @@ use shirabe::script::ScriptEvents;
use shirabe::util::platform::Platform;
use shirabe::util::process_executor::{MockHandler, ProcessExecutor};
use shirabe_class_map_generator::class_map::ClassMap;
-use shirabe_external_packages::symfony::console::output::output_interface;
use shirabe_php_shim::Catch as _;
use shirabe_php_shim::{PHP_EOL, PhpMixed};
+use shirabe_symfony_console::output::output_interface;
fn tear_down() {
Platform::clear_env("COMPOSER_SKIP_SCRIPTS");
diff --git a/crates/shirabe/tests/installer_test.rs b/crates/shirabe/tests/installer_test.rs
index 4c6ce981..295d9250 100644
--- a/crates/shirabe/tests/installer_test.rs
+++ b/crates/shirabe/tests/installer_test.rs
@@ -42,20 +42,18 @@ use shirabe::util::r#loop::Loop;
use shirabe::util::platform::Platform;
use shirabe::util::process_executor::ProcessExecutor;
use shirabe_class_map_generator::class_map::ClassMap;
-use shirabe_external_packages::symfony::console::command::command::Command as SymfonyCommand;
-use shirabe_external_packages::symfony::console::command::command::CommandData;
-use shirabe_external_packages::symfony::console::input::input_argument::InputArgument;
-use shirabe_external_packages::symfony::console::input::input_interface::InputInterface;
-use shirabe_external_packages::symfony::console::input::input_option::InputOption;
-use shirabe_external_packages::symfony::console::input::string_input::StringInput;
-use shirabe_external_packages::symfony::console::output::output_interface::{
- OutputInterface, VERBOSITY_NORMAL,
-};
-use shirabe_external_packages::symfony::console::output::stream_output::StreamOutput;
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;
// 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 c33fd804..5036a172 100644
--- a/crates/shirabe/tests/io/buffer_io_test.rs
+++ b/crates/shirabe/tests/io/buffer_io_test.rs
@@ -2,8 +2,8 @@
use shirabe::io::IOInterfaceImmutable;
use shirabe::io::buffer_io::BufferIO;
-use shirabe_external_packages::symfony::console::output::output_interface::VERBOSITY_NORMAL;
use shirabe_php_shim::PhpMixed;
+use shirabe_symfony_console::output::output_interface::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 15e7100b..c3240ea5 100644
--- a/crates/shirabe/tests/io/console_io_test.rs
+++ b/crates/shirabe/tests/io/console_io_test.rs
@@ -16,15 +16,15 @@ use shirabe::io::ConsoleIO;
use shirabe::io::IOInterfaceImmutable;
use shirabe::io::IOInterfaceMutable;
use shirabe::io::io_interface::NORMAL;
-use shirabe_external_packages::symfony::console::helper::QuestionHelper;
-use shirabe_external_packages::symfony::console::input::array_input::ArrayInput;
-use shirabe_external_packages::symfony::console::input::input_interface::InputInterface;
-use shirabe_external_packages::symfony::console::input::streamable_input_interface::StreamableInputInterface;
-use shirabe_external_packages::symfony::console::output::buffered_output::BufferedOutput;
-use shirabe_external_packages::symfony::console::output::console_output::ConsoleOutput;
-use shirabe_external_packages::symfony::console::output::console_output_interface::ConsoleOutputInterface;
-use shirabe_external_packages::symfony::console::output::output_interface::OutputInterface;
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;
/// 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/package/version/version_selector_test.rs b/crates/shirabe/tests/package/version/version_selector_test.rs
index 16ad5fe2..8a3e44a5 100644
--- a/crates/shirabe/tests/package/version/version_selector_test.rs
+++ b/crates/shirabe/tests/package/version/version_selector_test.rs
@@ -15,10 +15,10 @@ use shirabe::package::version::VersionSelector;
use shirabe::package::version::version_parser::VersionParser;
use shirabe::repository::PlatformRepository;
use shirabe::repository::RepositorySetInterface;
-use shirabe_external_packages::symfony::console::output::output_interface;
use shirabe_php_shim::PhpMixed;
use shirabe_php_shim::{PHP_MAJOR_VERSION, PHP_MINOR_VERSION, PHP_RELEASE_VERSION};
use shirabe_semver::constraint::AnyConstraint;
+use shirabe_symfony_console::output::output_interface;
mockall::mock! {
RepositorySet {}
diff --git a/crates/shirabe/tests/plugin/plugin_installer_test.rs b/crates/shirabe/tests/plugin/plugin_installer_test.rs
index 65a8872b..0ef36923 100644
--- a/crates/shirabe/tests/plugin/plugin_installer_test.rs
+++ b/crates/shirabe/tests/plugin/plugin_installer_test.rs
@@ -29,10 +29,10 @@ use shirabe::util::Platform;
use shirabe::util::http_downloader::HttpDownloader;
use shirabe::util::r#loop::Loop;
use shirabe::util::process_executor::ProcessExecutor;
-use shirabe_external_packages::symfony::console::output::output_interface::VERBOSITY_NORMAL;
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_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 f7f79eb6..3e1ae72e 100644
--- a/crates/shirabe/tests/question/strict_confirmation_question_test.rs
+++ b/crates/shirabe/tests/question/strict_confirmation_question_test.rs
@@ -1,14 +1,12 @@
//! ref: composer/tests/Composer/Test/Question/StrictConfirmationQuestionTest.php
use shirabe::question::StrictConfirmationQuestion;
-use shirabe_external_packages::symfony::console::helper::question_helper::{
- QuestionHelper, QuestionHelperInterface,
-};
-use shirabe_external_packages::symfony::console::input::array_input::ArrayInput;
-use shirabe_external_packages::symfony::console::input::streamable_input_interface::StreamableInputInterface;
-use shirabe_external_packages::symfony::console::output::output_interface::OutputInterface;
-use shirabe_external_packages::symfony::console::output::stream_output::StreamOutput;
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;
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 f1883721..fcbfd925 100644
--- a/crates/shirabe/tests/util/http_downloader_test.rs
+++ b/crates/shirabe/tests/util/http_downloader_test.rs
@@ -10,9 +10,9 @@ use shirabe::io::buffer_io::BufferIO;
use shirabe::io::io_interface;
use shirabe::util::Platform;
use shirabe::util::http_downloader::HttpDownloader;
-use shirabe_external_packages::symfony::console::output::output_interface::VERBOSITY_NORMAL;
use shirabe_php_shim::Catch as _;
use shirabe_php_shim::{PHP_EOL, PhpMixed};
+use shirabe_symfony_console::output::output_interface::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 268bc548..b772c1bc 100644
--- a/crates/shirabe/tests/util/process_executor_test.rs
+++ b/crates/shirabe/tests/util/process_executor_test.rs
@@ -8,14 +8,14 @@ use shirabe::io::ConsoleIO;
use shirabe::io::IOInterface;
use shirabe::io::buffer_io::BufferIO;
use shirabe::util::process_executor::ProcessExecutor;
-use shirabe_external_packages::symfony::console::helper::QuestionHelper;
-use shirabe_external_packages::symfony::console::input::array_input::ArrayInput;
-use shirabe_external_packages::symfony::console::input::input_interface::InputInterface;
-use shirabe_external_packages::symfony::console::output::buffered_output::BufferedOutput;
-use shirabe_external_packages::symfony::console::output::output_interface::{
+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_php_shim::{PHP_EOL, ob_get_clean, ob_start, trim};
#[test]
fn test_execute_captures_output() {