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/installer.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/installer.rs')
| -rw-r--r-- | crates/shirabe/src/installer.rs | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/crates/shirabe/src/installer.rs b/crates/shirabe/src/installer.rs index 9028af88..702569aa 100644 --- a/crates/shirabe/src/installer.rs +++ b/crates/shirabe/src/installer.rs @@ -28,6 +28,7 @@ pub use package_event::*; pub use package_events::*; pub use plugin_installer::*; pub use project_installer::*; +use shirabe_php_shim::Catch as _; pub use suggested_packages_reporter::*; use crate::io::io_interface; @@ -226,10 +227,11 @@ impl Installer { gc_disable(); if self.update_allow_list.is_some() && self.update_mirrors { - return Err(RuntimeException { - message: "The installer options updateMirrors and updateAllowList are mutually exclusive.".to_string(), - code: 0, - }.into()); + return Err(RuntimeException::new( + "The installer options updateMirrors and updateAllowList are mutually exclusive." + .to_string(), + ) + .into()); } let is_fresh_install = self @@ -535,7 +537,7 @@ impl Installer { }); } Err(e) => { - if let Some(te) = e.downcast_ref::<TransportException>() { + if let Some(te) = e.catch::<TransportException>() { self.io .error(&format!("Failed to audit {} packages.", target), &[]); if self.io.is_verbose() { @@ -570,27 +572,25 @@ impl Installer { let mut locked_repository: Option<crate::repository::LockArrayRepositoryHandle> = None; let try_load_locked = || -> anyhow::Result< - Result<Option<crate::repository::LockArrayRepositoryHandle>, ParsingException>, + Result<Option<crate::repository::LockArrayRepositoryHandle>, anyhow::Error>, > { - if self.locker.borrow_mut().is_locked() { - match self.locker.borrow_mut().get_locked_repository(true) { - Ok(r) => Ok(Ok(Some(r))), - Err(e) => match e.downcast::<ParsingException>() { - Ok(p) => Ok(Err(p)), - Err(other) => Err(other), - }, - } - } else { - Ok(Ok(None)) + if self.locker.borrow_mut().is_locked() { + match self.locker.borrow_mut().get_locked_repository(true) { + Ok(r) => Ok(Ok(Some(r))), + Err(e) if e.is_instanceof::<ParsingException>() => Ok(Err(e)), + Err(e) => Err(e), } - }; + } else { + Ok(Ok(None)) + } + }; match try_load_locked()? { Ok(r) => locked_repository = r, Err(e) => { if self.update_allow_list.is_some() || self.update_mirrors { // in case we are doing a partial update or updating mirrors, the lock file is needed so we error - return Err(e.into()); + return Err(e); } // otherwise, ignoring parse errors as the lock file will be regenerated from scratch when // doing a full update |
