From efe5bdb1987411a473d4af15451a376d20928245 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Fri, 12 Jun 2026 03:19:34 +0900 Subject: refactor(php-shim): replace literal sprintf calls with format! Convert every sprintf() call with a compile-time literal format string to format!, implementing Display for PhpMixed (delegating to php_to_string) so PhpMixed values render with PHP string semantics through {}. Also merge the format!-wrapped and conditional-literal dynamic sites into single format! calls. Genuinely runtime format strings (table styles, configurable error messages, command synopsis, progress-bar modifiers, regex-built messages) still go through sprintf. Co-Authored-By: Claude Opus 4.8 (1M context) --- .../src/symfony/console/helper/process_helper.rs | 24 +++++++++------------- 1 file changed, 10 insertions(+), 14 deletions(-) (limited to 'crates/shirabe-external-packages/src/symfony/console/helper/process_helper.rs') diff --git a/crates/shirabe-external-packages/src/symfony/console/helper/process_helper.rs b/crates/shirabe-external-packages/src/symfony/console/helper/process_helper.rs index 7652cac..bd26003 100644 --- a/crates/shirabe-external-packages/src/symfony/console/helper/process_helper.rs +++ b/crates/shirabe-external-packages/src/symfony/console/helper/process_helper.rs @@ -95,11 +95,9 @@ impl ProcessHelper { } None => { anyhow::bail!(shirabe_php_shim::InvalidArgumentException { - message: shirabe_php_shim::sprintf( - "Invalid command provided to \"%s()\": the command should be an array whose first element is either the path to the binary to run or a \"Process\" object.", - &[shirabe_php_shim::PhpMixed::String( - "ProcessHelper::run".to_string() - )], + message: format!( + "Invalid command provided to \"{}()\": the command should be an array whose first element is either the path to the binary to run or a \"Process\" object.", + shirabe_php_shim::PhpMixed::String("ProcessHelper::run".to_string()), ), code: 0, }); @@ -130,12 +128,12 @@ impl ProcessHelper { let message = if process.is_successful() { "Command ran successfully".to_string() } else { - shirabe_php_shim::sprintf( - "%s Command did not run successfully", - &[match process.get_exit_code() { + format!( + "{} Command did not run successfully", + match process.get_exit_code() { Some(code) => shirabe_php_shim::PhpMixed::Int(code), None => shirabe_php_shim::PhpMixed::Null, - }], + }, ) }; let stopped = Self::formatter_stop( @@ -151,11 +149,9 @@ impl ProcessHelper { if !process.is_successful() && error.is_some() { output.borrow().writeln( - &[shirabe_php_shim::sprintf( - "%s", - &[shirabe_php_shim::PhpMixed::String( - self.escape_string(error.unwrap()), - )], + &[format!( + "{}", + shirabe_php_shim::PhpMixed::String(self.escape_string(error.unwrap()),), )], output_interface::OUTPUT_NORMAL, ); -- cgit v1.3.1