aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe/src/json/json_manipulator.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/json/json_manipulator.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/json/json_manipulator.rs')
-rw-r--r--crates/shirabe/src/json/json_manipulator.rs35
1 files changed, 14 insertions, 21 deletions
diff --git a/crates/shirabe/src/json/json_manipulator.rs b/crates/shirabe/src/json/json_manipulator.rs
index eec823b6..d66fe645 100644
--- a/crates/shirabe/src/json/json_manipulator.rs
+++ b/crates/shirabe/src/json/json_manipulator.rs
@@ -36,10 +36,9 @@ impl JsonManipulator {
contents = "{}".to_string();
}
if !Preg::is_match3(php_regex!("#^\\{(.*)\\}$#s"), &contents, None) {
- return Err(InvalidArgumentException {
- message: "The json file must be an object ({})".to_string(),
- code: 0,
- }
+ return Err(InvalidArgumentException::new(
+ "The json file must be an object ({})".to_string(),
+ )
.into());
}
let newline = if strpos(&contents, "\r\n").is_some() {
@@ -823,10 +822,10 @@ impl JsonManipulator {
);
}
} else {
- return Err(LogicException {
- message: format!("Nothing matched above for: {}", children),
- code: 0,
- }
+ return Err(LogicException::new(format!(
+ "Nothing matched above for: {}",
+ children
+ ))
.into());
}
}
@@ -940,10 +939,7 @@ impl JsonManipulator {
children_clean = Some(children.clone());
}
- let children_clean = children_clean.ok_or_else(|| InvalidArgumentException {
- message: "JsonManipulator: $childrenClean is not defined. Please report at https://github.com/composer/composer/issues/new.".to_string(),
- code: 0,
- })?;
+ let children_clean = children_clean.ok_or_else(|| InvalidArgumentException::new("JsonManipulator: $childrenClean is not defined. Please report at https://github.com/composer/composer/issues/new.".to_string()))?;
// no child data left, $name was the only key in
let mut empty_match: IndexMap<String, String> = IndexMap::new();
@@ -1113,11 +1109,9 @@ impl JsonManipulator {
);
}
} else {
- return Err(LogicException {
- message: format!("Nothing matched above for: {}", children),
- code: 0,
- }
- .into());
+ return Err(
+ LogicException::new(format!("Nothing matched above for: {}", children)).into(),
+ );
}
self.contents = format!("{}{}{}", node_start, children, node_end);
@@ -1132,10 +1126,9 @@ impl JsonManipulator {
index: i64,
) -> anyhow::Result<bool> {
if index < 0 {
- return Err(InvalidArgumentException {
- message: "Index can only be positive integer".to_string(),
- code: 0,
- }
+ return Err(InvalidArgumentException::new(
+ "Index can only be positive integer".to_string(),
+ )
.into());
}