From 6a7e64d04a8b0ad932169df43e2d93efe8ceedf8 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Tue, 18 Aug 2026 07:18:07 +0900 Subject: fix: propagate ported exceptions instead of flattening them `ProcessExecutor::execute_args` existed only to turn `execute`'s `anyhow::Result` into an exit code of 1, so every one of its ~87 call sites silently took the "command failed" branch on an error PHP would have thrown. It is gone; callers use `execute` and propagate with `?`. Where the enclosing function had no `Result` to propagate into, its signature grew one, up to and including `Git::get_version`, `Svn::binary_version`, `GitHub`/`GitLab`/`Bitbucket::authorize_oauth`, `InitCommand::get_git_config` and `DiagnoseCommand::check_git`. The VCS drivers had the same problem in the other direction: their `get_contents` returned `Result>`, a type too narrow for the PHP method, which lets any Throwable out of the `catch (TransportException $e)` block. Every non-transport error was therefore rewritten into a `TransportException` with code 0, which the callers switch on. They now return `anyhow::Result>>`: the outer `Result` carries what PHP does not catch, the inner one the exception the drivers handle. That signature also restores `GitLabDriver::getContents`: the 400/401 `TransportException`s it raises to force authentication are thrown inside its own `try` block and handled by its own `catch`, but the port returned them straight to the caller, so the authentication flow behind them never ran. `impl_php_exception!` gains `From> for anyhow::Error` so a caught exception can be re-propagated with `?`. Co-Authored-By: Claude Opus 5 (1M context) --- crates/shirabe/src/util/process_executor.rs | 32 ++++++----------------------- 1 file changed, 6 insertions(+), 26 deletions(-) (limited to 'crates/shirabe/src/util/process_executor.rs') diff --git a/crates/shirabe/src/util/process_executor.rs b/crates/shirabe/src/util/process_executor.rs index c1be0e18..eae6692b 100644 --- a/crates/shirabe/src/util/process_executor.rs +++ b/crates/shirabe/src/util/process_executor.rs @@ -160,32 +160,6 @@ impl ProcessExecutor { self.do_execute(command, cwd, false, output) } - /// Convenience wrapper used by phase-A code that calls - /// `process.execute(&[String], &mut String, Option<&str>) == 0`. - /// Forwards to `execute`, returning the status code (1 on Err for compatibility) — this - /// mirrors PHP call sites that check the `int` return of `execute()` without a surrounding - /// `try`/`catch`, where an uncaught mock-mismatch exception would otherwise propagate. - // TODO(mock): under a strict `ProcessExecutorMock`, an incomplete expectation list now - // surfaces here as a swallowed "exit code 1" instead of the old `panic!`, so a future test - // ported through this call site could silently take a wrong branch instead of failing loudly. - // `ProcessExecutorMockGuard::__assert_complete` still catches unconsumed expectations at - // scope exit, but not a mismatch that happened to consume nothing. Distinguishing "expectation - // mismatch" from "real process failure" here would need a marker type incompatible with - // `RuntimeException` (see `mock_match`'s doc comment) — deferred until a concrete test needs it. - pub fn execute_args( - &mut self, - command: &[String], - output: &mut String, - cwd: Option<&str>, - ) -> i64 { - let mut buf = String::new(); - let rc = self - .execute(CommandLine::Args(command.to_vec()), &mut buf, cwd) - .unwrap_or(1); - *output = buf; - rc - } - /// runs a process on the commandline in TTY mode pub fn execute_tty(&mut self, command: C, cwd: Option<&str>) -> anyhow::Result where @@ -984,6 +958,12 @@ impl IntoExecCommand for &[String] { } } +impl IntoExecCommand for &[String; N] { + fn into_exec_command(self) -> CommandLine { + CommandLine::Args(self.to_vec()) + } +} + /// Models the `mixed &$output` parameter of `ProcessExecutor::execute` (cf. /// `composer/src/Composer/Util/ProcessExecutor.php`). In PHP the behaviour is selected by /// `func_num_args()` and `is_callable($output)`; here each behaviour is a distinct implementing type: -- cgit v1.3.1-4-g156e