From c65cab710bb3d79db20862c9361d4dbbac8ac5d7 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Thu, 25 Jun 2026 03:20:08 +0900 Subject: feat(php-shim): model $_ENV/$_SERVER as OsString snapshots Rework the environment shim around getenv/putenv on the real environment and $_ENV/$_SERVER as startup snapshots, all over OsString. Migrate every caller off the old server()/server_argv() helpers and force the snapshots in main() before any putenv() runs. Document the porting rules in docs/dev/env-vars-porting.md. Co-Authored-By: Claude Opus 4.8 (1M context) --- .../symfony/console/command/complete_command.rs | 25 +++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 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 cc700dc..da59a75 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 @@ -125,7 +125,15 @@ impl CompleteCommand { return; } - let command_name = shirabe_php_shim::basename(&shirabe_php_shim::server_argv()[0]); + let command_name = shirabe_php_shim::basename( + &shirabe_php_shim::PHP_SERVER + .lock() + .unwrap() + .argv() + .next() + .unwrap_or_default() + .to_string_lossy(), + ); shirabe_php_shim::file_put_contents3( &format!( "{}/sf_{}.log", @@ -206,7 +214,9 @@ impl Command for CompleteCommand { ) -> anyhow::Result<()> { let _ = (input, output); self.is_debug.set(shirabe_php_shim::filter_var_boolean( - &shirabe_php_shim::getenv("SYMFONY_COMPLETION_DEBUG").unwrap_or_default(), + &shirabe_php_shim::getenv("SYMFONY_COMPLETION_DEBUG") + .unwrap_or_default() + .to_string_lossy(), )); Ok(()) @@ -268,7 +278,16 @@ impl Command for CompleteCommand { "Input: (\"|\" indicates the cursor position)".to_string(), format!(" {}", completion_input.to_string()), "Command:".to_string(), - format!(" {}", shirabe_php_shim::server_argv().join(" ")), + format!( + " {}", + shirabe_php_shim::PHP_SERVER + .lock() + .unwrap() + .argv() + .map(|a| a.to_string_lossy().into_owned()) + .collect::>() + .join(" ") + ), "Messages:".to_string(), ]); -- cgit v1.3.1