From 6047bcc3e63ab84dfc67bce94f402f1bfa3f58d5 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Sun, 2 Aug 2026 16:16:51 +0900 Subject: refactor(php-shim): introduce PhpClass for reporting PHP class names Rust has no runtime class name, so `Command::get_class` existed purely to let each command hand back its PHP class name, supplied through the two-argument variant of `delegate_command_trait_impls_to_inner!` at the impl site. Replace it with a general `PhpClass` trait plus an `impl_php_class!` macro, so the name is stated once next to the type definition and the mechanism is reusable outside commands. `Command` gains `PhpClass` as a supertrait and drops `get_class`, and `VcsDriverKind`'s hand-rolled `php_class_name` table moves onto the trait. Behavior is unchanged: the same class-name strings are reported, and the base command state still panics when asked for a name it cannot supply. Co-Authored-By: Claude Opus 5 (1M context) --- crates/shirabe/src/command/config_command.rs | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'crates/shirabe/src/command/config_command.rs') diff --git a/crates/shirabe/src/command/config_command.rs b/crates/shirabe/src/command/config_command.rs index a6ba2f76..0b22757a 100644 --- a/crates/shirabe/src/command/config_command.rs +++ b/crates/shirabe/src/command/config_command.rs @@ -24,9 +24,9 @@ use shirabe_external_packages::symfony::console::input::InputInterface; use shirabe_external_packages::symfony::console::output::OutputInterface; use shirabe_php_shim::{ InvalidArgumentException, PhpMixed, RuntimeException, array_is_list, array_merge, - escapeshellcmd, exec, explode, file_exists, implode, in_array, is_array, is_bool, is_dir, - is_numeric, is_object, is_string, json_encode, php_regex, str_replace, strpos, strtolower, - system, touch, var_export, + escapeshellcmd, exec, explode, file_exists, impl_php_class, implode, in_array, is_array, + is_bool, is_dir, is_numeric, is_object, is_string, json_encode, php_regex, str_replace, strpos, + strtolower, system, touch, var_export, }; use shirabe_semver::VersionParser; @@ -43,6 +43,8 @@ pub struct ConfigCommand { pub(crate) auth_config_source: std::cell::RefCell>, } +impl_php_class!(ConfigCommand, r"Composer\Command\ConfigCommand"); + impl ConfigCommand { /// List of additional configurable package-properties pub(crate) const CONFIGURABLE_PACKAGE_PROPERTIES: &'static [&'static str] = &[ @@ -1281,10 +1283,7 @@ impl Command for ConfigCommand { crate::command::base_command::base_command_complete(self, input, suggestions) } - shirabe_external_packages::delegate_command_trait_impls_to_inner!( - base_command_data, - "Composer\\Command\\ConfigCommand" - ); + shirabe_external_packages::delegate_command_trait_impls_to_inner!(base_command_data); } impl BaseCommand for ConfigCommand { -- cgit v1.3.1