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/init_command.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'crates/shirabe/src/command/init_command.rs') diff --git a/crates/shirabe/src/command/init_command.rs b/crates/shirabe/src/command/init_command.rs index 53b8915b..ec3f38b5 100644 --- a/crates/shirabe/src/command/init_command.rs +++ b/crates/shirabe/src/command/init_command.rs @@ -28,8 +28,9 @@ use shirabe_external_packages::symfony::console::output::OutputInterface; use shirabe_php_shim::{ FILE_IGNORE_NEW_LINES, InvalidArgumentException, PHP_EOL, PHP_SERVER, PhpMixed, array_flip_strings, array_intersect_key, array_map, basename, empty, explode, file, - file_exists, file_get_contents, file_put_contents, get_current_user, implode, is_dir, - is_string, php_regex, preg_quote, realpath, str_replace, strpos, strtolower, trim, ucwords, + file_exists, file_get_contents, file_put_contents, get_current_user, impl_php_class, implode, + is_dir, is_string, php_regex, preg_quote, realpath, str_replace, strpos, strtolower, trim, + ucwords, }; use shirabe_spdx_licenses::SpdxLicenses; @@ -45,6 +46,8 @@ pub struct InitCommand { >, } +impl_php_class!(InitCommand, r"Composer\Command\InitCommand"); + impl PackageDiscoveryTrait for InitCommand { fn get_repos_mut( &self, @@ -908,10 +911,7 @@ impl Command for InitCommand { crate::command::base_command::base_command_complete(self, input, suggestions) } - shirabe_external_packages::delegate_command_trait_impls_to_inner!( - base_command_data, - "Composer\\Command\\InitCommand" - ); + shirabe_external_packages::delegate_command_trait_impls_to_inner!(base_command_data); } impl BaseCommand for InitCommand { -- cgit v1.3.1