From f4cad2123b2af0de72bda4ce039e16e74f163f4e Mon Sep 17 00:00:00 2001 From: nsfisis Date: Sat, 8 Aug 2026 22:14:12 +0900 Subject: 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::()` 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) --- crates/shirabe/src/util/zip.rs | 39 +++++++++++++++------------------------ 1 file changed, 15 insertions(+), 24 deletions(-) (limited to 'crates/shirabe/src/util/zip.rs') diff --git a/crates/shirabe/src/util/zip.rs b/crates/shirabe/src/util/zip.rs index a671d63b..0ba177d0 100644 --- a/crates/shirabe/src/util/zip.rs +++ b/crates/shirabe/src/util/zip.rs @@ -10,10 +10,9 @@ pub struct Zip; impl Zip { pub fn get_composer_json(path_to_zip: &str) -> anyhow::Result> { if !extension_loaded("zip") { - return Err(RuntimeException { - message: "The Zip Util requires PHP's zip extension".to_string(), - code: 0, - } + return Err(RuntimeException::new( + "The Zip Util requires PHP's zip extension".to_string(), + ) .into()); } @@ -64,13 +63,10 @@ impl Zip { if dir_name == "." { top_level_paths.insert(name, true); if top_level_paths.len() > 1 { - return Err(RuntimeException { - message: format!( - "Archive has more than one top level directories, and no composer.json was found on the top level, so it's an invalid archive. Top level paths found were: {}", - implode(",", &top_level_paths.keys().cloned().collect::>()) - ), - code: 0, - } + return Err(RuntimeException::new(format!( + "Archive has more than one top level directories, and no composer.json was found on the top level, so it's an invalid archive. Top level paths found were: {}", + implode(",", &top_level_paths.keys().cloned().collect::>()) + )) .into()); } continue; @@ -80,13 +76,10 @@ impl Zip { if !dir_name.contains('\\') && !dir_name.contains('/') { top_level_paths.insert(format!("{}/", dir_name), true); if top_level_paths.len() > 1 { - return Err(RuntimeException { - message: format!( - "Archive has more than one top level directories, and no composer.json was found on the top level, so it's an invalid archive. Top level paths found were: {}", - implode(",", &top_level_paths.keys().cloned().collect::>()) - ), - code: 0, - } + return Err(RuntimeException::new(format!( + "Archive has more than one top level directories, and no composer.json was found on the top level, so it's an invalid archive. Top level paths found were: {}", + implode(",", &top_level_paths.keys().cloned().collect::>()) + )) .into()); } } @@ -101,12 +94,10 @@ impl Zip { } } - Err(RuntimeException { - message: - "No composer.json found either at the top level or within the topmost directory" - .to_string(), - code: 0, - } + Err(RuntimeException::new( + "No composer.json found either at the top level or within the topmost directory" + .to_string(), + ) .into()) } } -- cgit v1.3.1-4-g156e