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/http_downloader.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/http_downloader.rs')
| -rw-r--r-- | crates/shirabe/src/util/http_downloader.rs | 26 |
1 files changed, 9 insertions, 17 deletions
diff --git a/crates/shirabe/src/util/http_downloader.rs b/crates/shirabe/src/util/http_downloader.rs index b60664da..e53ad82f 100644 --- a/crates/shirabe/src/util/http_downloader.rs +++ b/crates/shirabe/src/util/http_downloader.rs @@ -17,6 +17,7 @@ use crate::util::http::Response; use crate::util::sync_executor; use indexmap::IndexMap; use shirabe_external_packages::composer::pcre::{CaptureKey, Preg}; +use shirabe_php_shim::Catch as _; use shirabe_php_shim::{ InvalidArgumentException, LogicException, PhpMixed, array_replace_recursive, extension_loaded, file_get_contents, function_exists, implode, is_numeric, php_regex, rawurldecode, @@ -205,19 +206,14 @@ impl HttpDownloader { return self.mock_get(url, &options); } if url.is_empty() { - return Err(InvalidArgumentException { - message: "$url must not be an empty string".to_string(), - code: 0, - } + return Err(InvalidArgumentException::new( + "$url must not be an empty string".to_string(), + ) .into()); } if !sync && !self.allow_async { - return Err(LogicException { - message: - "You must use the HttpDownloader instance which is part of a Composer\\Loop instance to be able to run async http requests" - .to_string(), - code: 0, - } + return Err(LogicException::new("You must use the HttpDownloader instance which is part of a Composer\\Loop instance to be able to run async http requests" + .to_string()) .into()); } @@ -321,7 +317,7 @@ impl HttpDownloader { let curl = self.curl.as_ref().unwrap(); return match curl.download(&origin, url, options, copy_to).await { Ok(Ok(response)) => Ok(response), - Ok(Err(transport_exception)) => Err(transport_exception.into()), + Ok(Err(e)) => Err(e), Err(e) => Err(e), }; } @@ -463,7 +459,7 @@ impl HttpDownloader { /// @internal pub fn get_exception_hints(e: &anyhow::Error) -> Option<Vec<String>> { - let e_as_transport: Option<&TransportException> = e.downcast_ref::<TransportException>(); + let e_as_transport: Option<&TransportException> = e.catch::<TransportException>(); e_as_transport?; let e_as_transport = e_as_transport.unwrap(); @@ -600,11 +596,7 @@ impl HttpDownloader { options: &IndexMap<String, PhpMixed>, ) -> anyhow::Result<Response> { if file_url.is_empty() { - return Err(LogicException { - message: "url cannot be an empty string".to_string(), - code: 0, - } - .into()); + return Err(LogicException::new("url cannot be an empty string".to_string()).into()); } let mock = self |
