diff options
| author | nsfisis <nsfisis@gmail.com> | 2026-08-08 22:14:12 +0900 |
|---|---|---|
| committer | nsfisis <nsfisis@gmail.com> | 2026-08-08 22:14:12 +0900 |
| commit | f4cad2123b2af0de72bda4ce039e16e74f163f4e (patch) | |
| tree | 21803308c5ff41e23c9d3b117433eea16b4ff663 /crates/shirabe/src/util/svn.rs | |
| parent | 0209f63210e5b547b5c6b73367bb80ea86c255ec (diff) | |
| download | php-shirabe-f4cad2123b2af0de72bda4ce039e16e74f163f4e.tar.gz php-shirabe-f4cad2123b2af0de72bda4ce039e16e74f163f4e.tar.zst php-shirabe-f4cad2123b2af0de72bda4ce039e16e74f163f4e.zip | |
feat(php-shim): give ported exceptions PHP's class hierarchy
Ported exceptions were flat structs reached with `downcast_ref`, so
Composer's `catch (\RuntimeException $e)` only matched the exact leaf
type and `get_class($e)` had nothing to report. Each exception now
embeds an instance of the class it extends and travels inside an
`AnyThrowable`; `Catch::catch`/`catch_mut` walk that chain, and
`PhpClass::php_class_name` yields the PHP FQCN.
Dropping the `std::error::Error` impls from the exception types leaves
`AnyThrowable` as the only route into an `anyhow::Error`, so the walk
cannot be bypassed. A `no_exception_downcast` linter catches the
`downcast::<X>()` calls that would now silently answer `None`.
Three sites change behavior as a result: the `TransportException`
exit-code override reaches `MaxFileSizeExceededException`, the
`catch (\LogicException)` in findSimilar() reaches its subclasses, and
rendered exception titles carry the real class name rather than a
guess. `get_class_err()` is no longer a `todo!()`, which re-enables
FilesystemRepositoryTest::testCorruptedRepositoryFile.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Diffstat (limited to 'crates/shirabe/src/util/svn.rs')
| -rw-r--r-- | crates/shirabe/src/util/svn.rs | 31 |
1 files changed, 7 insertions, 24 deletions
diff --git a/crates/shirabe/src/util/svn.rs b/crates/shirabe/src/util/svn.rs index a2974760..aaa0c6d1 100644 --- a/crates/shirabe/src/util/svn.rs +++ b/crates/shirabe/src/util/svn.rs @@ -177,11 +177,7 @@ impl Svn { && stripos(&full_output, "svn: E170001:").is_none() && stripos(&full_output, "svn: E215004:").is_none() { - return Err(RuntimeException { - message: full_output, - code: 0, - } - .into()); + return Err(RuntimeException::new(full_output).into()); } if !self.has_auth() { @@ -196,11 +192,7 @@ impl Svn { return self.execute_with_auth_retry(svn_command, cwd, url, path, verbose); } - Err(RuntimeException { - message: format!("wrong credentials provided ({})", full_output), - code: 0, - } - .into()) + Err(RuntimeException::new(format!("wrong credentials provided ({})", full_output)).into()) } pub fn set_cache_credentials(&mut self, cache_credentials: bool) { @@ -213,10 +205,9 @@ impl Svn { pub(crate) fn do_auth_dance(&mut self) -> anyhow::Result<&mut Self> { // cannot ask for credentials in non interactive mode if !self.io.is_interactive() { - return Err(RuntimeException { - message: "can not ask for authentication in non interactive mode".to_string(), - code: 0, - } + return Err(RuntimeException::new( + "can not ask for authentication in non interactive mode".to_string(), + ) .into()); } @@ -310,11 +301,7 @@ impl Svn { /// @throws \LogicException pub(crate) fn get_password(&self) -> anyhow::Result<String> { if self.credentials.is_none() { - return Err(LogicException { - message: "No svn auth detected.".to_string(), - code: 0, - } - .into()); + return Err(LogicException::new("No svn auth detected.".to_string()).into()); } Ok(self.credentials.as_ref().unwrap().password.clone()) @@ -325,11 +312,7 @@ impl Svn { /// @throws \LogicException pub(crate) fn get_username(&self) -> anyhow::Result<String> { if self.credentials.is_none() { - return Err(LogicException { - message: "No svn auth detected.".to_string(), - code: 0, - } - .into()); + return Err(LogicException::new("No svn auth detected.".to_string()).into()); } Ok(self.credentials.as_ref().unwrap().username.clone()) |
