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/tests/util/auth_helper_test.rs | 5 +++-- crates/shirabe/tests/util/git_test.rs | 3 ++- crates/shirabe/tests/util/http_downloader_test.rs | 3 ++- crates/shirabe/tests/util/silencer_test.rs | 6 +----- 4 files changed, 8 insertions(+), 9 deletions(-) (limited to 'crates/shirabe/tests/util') diff --git a/crates/shirabe/tests/util/auth_helper_test.rs b/crates/shirabe/tests/util/auth_helper_test.rs index ef5daaf7..6b376f97 100644 --- a/crates/shirabe/tests/util/auth_helper_test.rs +++ b/crates/shirabe/tests/util/auth_helper_test.rs @@ -7,6 +7,7 @@ use shirabe::config::ConfigSourceInterface; use shirabe::io::IOInterface; use shirabe::io::io_interface; use shirabe::util::{AuthHelper, Bitbucket, StoreAuth}; +use shirabe_php_shim::Catch as _; use shirabe_php_shim::{PhpMixed, base64_encode, json_encode}; // Mirrors AuthHelperTest::setUp: a DEBUG-verbosity IOMock plus a real Config, both @@ -560,7 +561,7 @@ fn test_store_auth_with_prompt_invalid_answer() { let err = auth_helper .store_auth(origin, StoreAuth::Prompt) .expect_err("expected a RuntimeException"); - assert!(err.downcast_ref::().is_some()); + assert!(err.is_instanceof::()); // Mirrors PHP's `->with('Do you want to store credentials for '.$origin.' in '. // $configSourceName.' ? [Yn] ', $this->anything(), null, 'y')` verification on askAndValidate. @@ -639,7 +640,7 @@ fn test_prompt_auth_if_needed_git_lab_no_auth_change() { ); let err = result.expect_err("expected a TransportException"); - assert!(err.downcast_ref::().is_some()); + assert!(err.is_instanceof::()); assert_eq!( vec![( diff --git a/crates/shirabe/tests/util/git_test.rs b/crates/shirabe/tests/util/git_test.rs index 907ec38a..dbc06137 100644 --- a/crates/shirabe/tests/util/git_test.rs +++ b/crates/shirabe/tests/util/git_test.rs @@ -11,6 +11,7 @@ use shirabe::util::filesystem::Filesystem; use shirabe::util::git::Git; use shirabe::util::http_downloader::HttpDownloaderMockHandler; use shirabe::util::process_executor::{MockExpectation, MockHandler, ProcessExecutor}; +use shirabe_php_shim::Catch as _; use shirabe_php_shim::{PhpMixed, RuntimeException}; // No-op ConfigSourceInterface, equivalent to PHPUnit's @@ -195,7 +196,7 @@ fn test_run_command_private_git_hub_repository_not_initial_clone_not_interactive ); let err = result.expect_err("expected a RuntimeException"); - assert!(err.downcast_ref::().is_some()); + assert!(err.is_instanceof::()); } // privateGithubWithCredentialsProvider helper. diff --git a/crates/shirabe/tests/util/http_downloader_test.rs b/crates/shirabe/tests/util/http_downloader_test.rs index b438dca9..f1883721 100644 --- a/crates/shirabe/tests/util/http_downloader_test.rs +++ b/crates/shirabe/tests/util/http_downloader_test.rs @@ -11,6 +11,7 @@ use shirabe::io::io_interface; use shirabe::util::Platform; use shirabe::util::http_downloader::HttpDownloader; use shirabe_external_packages::symfony::console::output::output_interface::VERBOSITY_NORMAL; +use shirabe_php_shim::Catch as _; use shirabe_php_shim::{PHP_EOL, PhpMixed}; // PHP performs a live HTTP get to assert the URL's user:pass is captured via @@ -49,7 +50,7 @@ fn test_capture_authentication_params_from_url() { if let Err(e) = fs.get( "https://user:pass@github.com/composer/composer/404", IndexMap::new(), - ) && let Some(te) = e.downcast_ref::() + ) && let Some(te) = e.catch::() { assert_ne!(200, te.get_code()); } diff --git a/crates/shirabe/tests/util/silencer_test.rs b/crates/shirabe/tests/util/silencer_test.rs index 000e7371..8c319400 100644 --- a/crates/shirabe/tests/util/silencer_test.rs +++ b/crates/shirabe/tests/util/silencer_test.rs @@ -35,11 +35,7 @@ fn test_silencer() { fn test_silenced_exception() { let verification = format!("{}", microtime()); let err = Silencer::call(|| -> anyhow::Result<()> { - Err(RuntimeException { - message: verification.clone(), - code: 0, - } - .into()) + Err(RuntimeException::new(verification.clone()).into()) }) .unwrap_err(); assert_eq!(verification, err.to_string()); -- cgit v1.3.1-4-g156e