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/advisory | |
| 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/advisory')
| -rw-r--r-- | crates/shirabe/src/advisory/audit_config.rs | 11 | ||||
| -rw-r--r-- | crates/shirabe/src/advisory/auditor.rs | 28 |
2 files changed, 14 insertions, 25 deletions
diff --git a/crates/shirabe/src/advisory/audit_config.rs b/crates/shirabe/src/advisory/audit_config.rs index 71730317..fc1cbedb 100644 --- a/crates/shirabe/src/advisory/audit_config.rs +++ b/crates/shirabe/src/advisory/audit_config.rs @@ -103,13 +103,10 @@ impl AuditConfig { .map(|s| s.to_string()); if !["audit", "block", "all"].contains(&apply.as_str()) { - return Err(InvalidArgumentException { - message: format!( - "Invalid 'apply' value for '{}': {}. Expected 'audit', 'block', or 'all'.", - key, apply - ), - code: 0, - }.into()); + return Err(InvalidArgumentException::new(format!( + "Invalid 'apply' value for '{}': {}. Expected 'audit', 'block', or 'all'.", + key, apply + )).into()); } (key.clone(), apply, reason) diff --git a/crates/shirabe/src/advisory/auditor.rs b/crates/shirabe/src/advisory/auditor.rs index d20c9453..d661cf90 100644 --- a/crates/shirabe/src/advisory/auditor.rs +++ b/crates/shirabe/src/advisory/auditor.rs @@ -422,13 +422,10 @@ impl Auditor { .map(|buffer_io| &buffer_io.inner) }); if io_as_console.is_none() { - return Err(InvalidArgumentException { - message: format!( - "Cannot use table format with {}", - get_class(&PhpMixed::Null) - ), - code: 0, - } + return Err(InvalidArgumentException::new(format!( + "Cannot use table format with {}", + get_class(&PhpMixed::Null) + )) .into()); } self.output_advisories_table(io_as_console.unwrap(), advisories)?; @@ -441,11 +438,9 @@ impl Auditor { Ok(()) } Self::FORMAT_SUMMARY => Ok(()), - _ => Err(InvalidArgumentException { - message: format!("Invalid format \"{}\".", format), - code: 0, + _ => { + Err(InvalidArgumentException::new(format!("Invalid format \"{}\".", format)).into()) } - .into()), } } @@ -597,13 +592,10 @@ impl Auditor { .map(|buffer_io| &buffer_io.inner) }); if io_as_console.is_none() { - return Err(InvalidArgumentException { - message: format!( - "Cannot use table format with {}", - get_class(&PhpMixed::Null) - ), - code: 0, - } + return Err(InvalidArgumentException::new(format!( + "Cannot use table format with {}", + get_class(&PhpMixed::Null) + )) .into()); } |
