aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe/src/package/locker.rs
diff options
context:
space:
mode:
authornsfisis <nsfisis@gmail.com>2026-08-08 22:14:12 +0900
committernsfisis <nsfisis@gmail.com>2026-08-08 22:14:12 +0900
commitf4cad2123b2af0de72bda4ce039e16e74f163f4e (patch)
tree21803308c5ff41e23c9d3b117433eea16b4ff663 /crates/shirabe/src/package/locker.rs
parent0209f63210e5b547b5c6b73367bb80ea86c255ec (diff)
downloadphp-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/package/locker.rs')
-rw-r--r--crates/shirabe/src/package/locker.rs47
1 files changed, 18 insertions, 29 deletions
diff --git a/crates/shirabe/src/package/locker.rs b/crates/shirabe/src/package/locker.rs
index a4d28861..3b20704a 100644
--- a/crates/shirabe/src/package/locker.rs
+++ b/crates/shirabe/src/package/locker.rs
@@ -26,6 +26,7 @@ use crate::util::ProcessExecutor;
use indexmap::IndexMap;
use shirabe_external_packages::composer::pcre::{CaptureKey, Preg};
use shirabe_external_packages::seld::json_lint::ParsingException;
+use shirabe_php_shim::Catch as _;
use shirabe_php_shim::{
DATE_RFC3339, LogicException, PhpMixed, RuntimeException, array_intersect, array_keys,
array_map, array_merge, file_get_contents, filemtime, function_exists, hash, in_array_loose,
@@ -194,10 +195,7 @@ impl Locker {
if let Some(packages_dev) = lock_data.get("packages-dev").cloned() {
locked_packages = array_merge(locked_packages, packages_dev);
} else {
- return Err(RuntimeException {
- message: "The lock file does not contain require-dev information, run install with the --no-dev option or delete it and run composer update to generate a new lock file.".to_string(),
- code: 0,
- }
+ return Err(RuntimeException::new("The lock file does not contain require-dev information, run install with the --no-dev option or delete it and run composer update to generate a new lock file.".to_string())
.into());
}
}
@@ -270,12 +268,10 @@ impl Locker {
return Ok(packages);
}
- Err(RuntimeException {
- message:
- "Your composer.lock is invalid. Run \"composer update\" to generate a new one."
- .to_string(),
- code: 0,
- }
+ Err(RuntimeException::new(
+ "Your composer.lock is invalid. Run \"composer update\" to generate a new one."
+ .to_string(),
+ )
.into())
}
@@ -438,10 +434,9 @@ impl Locker {
}
if !self.lock_file.exists() {
- return Err(LogicException {
- message: "No lockfile found. Unable to read locked packages".to_string(),
- code: 0,
- }
+ return Err(LogicException::new(
+ "No lockfile found. Unable to read locked packages".to_string(),
+ )
.into());
}
@@ -582,7 +577,7 @@ impl Locker {
let is_locked = match self.is_locked_result() {
Ok(b) => b,
Err(e) => {
- if e.downcast_ref::<ParsingException>().is_some() {
+ if e.is_instanceof::<ParsingException>() {
false
} else {
return Err(e);
@@ -641,13 +636,10 @@ impl Locker {
let contents = match contents {
Some(s) => s,
None => {
- return Err(RuntimeException {
- message: format!(
- "Unable to read {} contents to update the lock file hash.",
- composer_json.get_path()
- ),
- code: 0,
- }
+ return Err(RuntimeException::new(format!(
+ "Unable to read {} contents to update the lock file hash.",
+ composer_json.get_path()
+ ))
.into());
}
};
@@ -720,13 +712,10 @@ impl Locker {
let version = package.get_pretty_version();
if name.is_empty() || version.is_empty() {
- return Err(LogicException {
- message: format!(
- "Package \"{}\" has no version or name and can not be locked",
- package,
- ),
- code: 0,
- }
+ return Err(LogicException::new(format!(
+ "Package \"{}\" has no version or name and can not be locked",
+ package,
+ ))
.into());
}