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 | |
| 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')
| -rw-r--r-- | crates/shirabe/src/installer/installation_manager.rs | 6 | ||||
| -rw-r--r-- | crates/shirabe/src/installer/library_installer.rs | 25 | ||||
| -rw-r--r-- | crates/shirabe/src/installer/metapackage_installer.rs | 16 | ||||
| -rw-r--r-- | crates/shirabe/src/installer/noop_installer.rs | 16 | ||||
| -rw-r--r-- | crates/shirabe/src/installer/plugin_installer.rs | 11 | ||||
| -rw-r--r-- | crates/shirabe/src/installer/project_installer.rs | 20 |
6 files changed, 38 insertions, 56 deletions
diff --git a/crates/shirabe/src/installer/installation_manager.rs b/crates/shirabe/src/installer/installation_manager.rs index 1f1c60a5..454dfa86 100644 --- a/crates/shirabe/src/installer/installation_manager.rs +++ b/crates/shirabe/src/installer/installation_manager.rs @@ -191,11 +191,7 @@ impl InstallationManager { } } - Err(InvalidArgumentException { - message: format!("Unknown installer type: {}", r#type), - code: 0, - } - .into()) + Err(InvalidArgumentException::new(format!("Unknown installer type: {}", r#type)).into()) } /// Checks whether provided package is installed in one of the registered installers. diff --git a/crates/shirabe/src/installer/library_installer.rs b/crates/shirabe/src/installer/library_installer.rs index e53b9546..6c94e0c1 100644 --- a/crates/shirabe/src/installer/library_installer.rs +++ b/crates/shirabe/src/installer/library_installer.rs @@ -210,14 +210,11 @@ impl LibraryInstaller { assert!( self.download_manager.is_some(), "{}", - LogicException { - message: format!( + LogicException::new(format!( "{} should be initialized with a fully loaded Composer instance to be able to install/... packages", "LibraryInstaller", - ), - code: 0, - } - .message + )) + .get_message() ); self.download_manager.as_ref().unwrap() @@ -345,10 +342,10 @@ impl InstallerInterface for LibraryInstaller { target: PackageInterfaceHandle, ) -> anyhow::Result<Option<PhpMixed>> { if !repo.borrow_mut().has_package(initial.clone())? { - return Err(InvalidArgumentException { - message: format!("Package is not installed: {}", initial), - code: 0, - } + return Err(InvalidArgumentException::new(format!( + "Package is not installed: {}", + initial + )) .into()); } @@ -378,10 +375,10 @@ impl InstallerInterface for LibraryInstaller { package: PackageInterfaceHandle, ) -> anyhow::Result<Option<PhpMixed>> { if !repo.borrow_mut().has_package(package.clone())? { - return Err(InvalidArgumentException { - message: format!("Package is not installed: {}", package), - code: 0, - } + return Err(InvalidArgumentException::new(format!( + "Package is not installed: {}", + package + )) .into()); } diff --git a/crates/shirabe/src/installer/metapackage_installer.rs b/crates/shirabe/src/installer/metapackage_installer.rs index 52c152ea..99d3786c 100644 --- a/crates/shirabe/src/installer/metapackage_installer.rs +++ b/crates/shirabe/src/installer/metapackage_installer.rs @@ -86,10 +86,10 @@ impl InstallerInterface for MetapackageInstaller { target: PackageInterfaceHandle, ) -> anyhow::Result<Option<PhpMixed>> { if !repo.borrow_mut().has_package(initial.clone())? { - return Err(InvalidArgumentException { - message: format!("Package is not installed: {}", initial), - code: 0, - } + return Err(InvalidArgumentException::new(format!( + "Package is not installed: {}", + initial + )) .into()); } @@ -115,10 +115,10 @@ impl InstallerInterface for MetapackageInstaller { package: PackageInterfaceHandle, ) -> anyhow::Result<Option<PhpMixed>> { if !repo.borrow_mut().has_package(package.clone())? { - return Err(InvalidArgumentException { - message: format!("Package is not installed: {}", package), - code: 0, - } + return Err(InvalidArgumentException::new(format!( + "Package is not installed: {}", + package + )) .into()); } diff --git a/crates/shirabe/src/installer/noop_installer.rs b/crates/shirabe/src/installer/noop_installer.rs index 95f31f2e..d36f5c9e 100644 --- a/crates/shirabe/src/installer/noop_installer.rs +++ b/crates/shirabe/src/installer/noop_installer.rs @@ -69,10 +69,10 @@ impl InstallerInterface for NoopInstaller { ) -> anyhow::Result<Option<PhpMixed>> { let mut repo = repo.borrow_mut(); if !repo.has_package(initial.clone())? { - return Err(InvalidArgumentException { - message: format!("Package is not installed: {}", initial), - code: 0, - } + return Err(InvalidArgumentException::new(format!( + "Package is not installed: {}", + initial + )) .into()); } @@ -91,10 +91,10 @@ impl InstallerInterface for NoopInstaller { ) -> anyhow::Result<Option<PhpMixed>> { let mut repo = repo.borrow_mut(); if !repo.has_package(package.clone())? { - return Err(InvalidArgumentException { - message: format!("Package is not installed: {}", package), - code: 0, - } + return Err(InvalidArgumentException::new(format!( + "Package is not installed: {}", + package + )) .into()); } repo.remove_package(package); diff --git a/crates/shirabe/src/installer/plugin_installer.rs b/crates/shirabe/src/installer/plugin_installer.rs index 7683a7d5..abe313b7 100644 --- a/crates/shirabe/src/installer/plugin_installer.rs +++ b/crates/shirabe/src/installer/plugin_installer.rs @@ -121,13 +121,10 @@ impl InstallerInterface for PluginInstaller { let extra = package.get_extra(); let class = extra.get("class").cloned().unwrap_or(PhpMixed::Null); if empty(&class) { - return Err(UnexpectedValueException { - message: format!( - "Error while installing {}, composer-plugin packages should have a class defined in their extra key to be usable.", - package.get_pretty_name() - ), - code: 0, - }.into()); + return Err(UnexpectedValueException::new(format!( + "Error while installing {}, composer-plugin packages should have a class defined in their extra key to be usable.", + package.get_pretty_name() + )).into()); } self.inner.download(package, prev_package).await diff --git a/crates/shirabe/src/installer/project_installer.rs b/crates/shirabe/src/installer/project_installer.rs index 59d44410..8b878352 100644 --- a/crates/shirabe/src/installer/project_installer.rs +++ b/crates/shirabe/src/installer/project_installer.rs @@ -52,10 +52,10 @@ impl InstallerInterface for ProjectInstaller { if std::path::Path::new(install_path).exists() && !self.filesystem.borrow().is_dir_empty(install_path) { - return Err(InvalidArgumentException { - message: format!("Project directory {} is not empty.", install_path), - code: 0, - } + return Err(InvalidArgumentException::new(format!( + "Project directory {} is not empty.", + install_path + )) .into()); } if !std::path::Path::new(install_path).is_dir() { @@ -109,11 +109,7 @@ impl InstallerInterface for ProjectInstaller { _initial: PackageInterfaceHandle, _target: PackageInterfaceHandle, ) -> anyhow::Result<Option<PhpMixed>> { - Err(InvalidArgumentException { - message: "not supported".to_string(), - code: 0, - } - .into()) + Err(InvalidArgumentException::new("not supported".to_string()).into()) } async fn uninstall( @@ -121,11 +117,7 @@ impl InstallerInterface for ProjectInstaller { _repo: &InstalledRepositoryInterfaceHandle, _package: PackageInterfaceHandle, ) -> anyhow::Result<Option<PhpMixed>> { - Err(InvalidArgumentException { - message: "not supported".to_string(), - code: 0, - } - .into()) + Err(InvalidArgumentException::new("not supported".to_string()).into()) } fn get_install_path(&self, _package: PackageInterfaceHandle) -> Option<String> { |
