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) --- .../src/symfony/console/command/complete_command.rs | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'crates/shirabe-external-packages/src/symfony/console/command/complete_command.rs') diff --git a/crates/shirabe-external-packages/src/symfony/console/command/complete_command.rs b/crates/shirabe-external-packages/src/symfony/console/command/complete_command.rs index a4567829..8a2ccc97 100644 --- a/crates/shirabe-external-packages/src/symfony/console/command/complete_command.rs +++ b/crates/shirabe-external-packages/src/symfony/console/command/complete_command.rs @@ -11,7 +11,7 @@ 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 indexmap::IndexMap; -use shirabe_php_shim::PhpMixed; +use shirabe_php_shim::{PhpMixed, impl_php_class}; use std::ops::{Deref, DerefMut}; /// Responsible for providing the values to the shell completion. @@ -22,6 +22,11 @@ pub struct CompleteCommand { is_debug: std::cell::Cell, } +impl_php_class!( + CompleteCommand, + r"Symfony\Component\Console\Command\CompleteCommand" +); + impl Deref for CompleteCommand { type Target = CommandData; @@ -145,7 +150,7 @@ impl CompleteCommand { fn get_class_of_command(command: &std::rc::Rc>) -> String { // LazyCommand is intentionally not ported. - command.borrow().get_class() + command.borrow().php_class_name().to_string() } fn get_definition_options( @@ -414,8 +419,5 @@ impl Command for CompleteCommand { } } - crate::delegate_command_trait_impls_to_inner!( - inner, - "Symfony\\Component\\Console\\Command\\CompleteCommand" - ); + crate::delegate_command_trait_impls_to_inner!(inner); } -- cgit v1.3.1