diff options
| author | nsfisis <nsfisis@gmail.com> | 2026-08-18 06:38:26 +0900 |
|---|---|---|
| committer | nsfisis <nsfisis@gmail.com> | 2026-08-18 06:38:26 +0900 |
| commit | bed0cd33ca32b95aed9d65891f97649a6f9d0069 (patch) | |
| tree | c04f9f3d6c89198222f9617f4dc84bed14fc0b4e /crates/shirabe/src/util/filesystem.rs | |
| parent | ced1f9aa91ee36857fec9664c9ccd86ba2310821 (diff) | |
| download | php-shirabe-bed0cd33ca32b95aed9d65891f97649a6f9d0069.tar.gz php-shirabe-bed0cd33ca32b95aed9d65891f97649a6f9d0069.tar.zst php-shirabe-bed0cd33ca32b95aed9d65891f97649a6f9d0069.zip | |
fix(process-executor): model commands as a CommandLine enum
Commands were carried as `PhpMixed`, whose `String`/`List` variants do
not tell a shell command line apart from an argv list at the type level.
`Perforce::execute_command` and `Git::run_command` therefore funnelled
string commands through `execute_args`, spawning `p4 set` or
`git command` as a single argument instead of running it through a shell
as PHP does; their tests were written against that shape.
Introduce `CommandLine::{Shell, Args}` and use it for every
`ProcessExecutor` entry point, the mock expectation queue and the
`Git::run_command` callables. The unreachable "Invalid command type"
branches disappear with it, and the affected tests go back to the string
expectations the PHP suite uses.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Diffstat (limited to 'crates/shirabe/src/util/filesystem.rs')
| -rw-r--r-- | crates/shirabe/src/util/filesystem.rs | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/crates/shirabe/src/util/filesystem.rs b/crates/shirabe/src/util/filesystem.rs index 2395d1cd..8726df63 100644 --- a/crates/shirabe/src/util/filesystem.rs +++ b/crates/shirabe/src/util/filesystem.rs @@ -145,11 +145,7 @@ impl Filesystem { let mut output = PhpMixed::Null; let result = self .get_process() - .execute( - PhpMixed::List(cmd.iter().map(|s| PhpMixed::String(s.clone())).collect()), - &mut output, - None, - ) + .execute(&cmd, &mut output, None) .map(|n| n == 0) .unwrap_or(false); @@ -198,10 +194,7 @@ impl Filesystem { (fs.get_process_handle(), cmd) }; - let process_future = process_executor.borrow_mut().execute_async( - PhpMixed::List(cmd.iter().map(|s| PhpMixed::String(s.clone())).collect()), - None, - ); + let process_future = process_executor.borrow_mut().execute_async(&cmd, None); let mut process = process_future.await?; // clear stat cache because external processes aren't tracked by the php stat cache |
