aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe/src/autoload
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/autoload
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/autoload')
-rw-r--r--crates/shirabe/src/autoload/autoload_generator.rs10
-rw-r--r--crates/shirabe/src/autoload/class_loader.rs16
2 files changed, 8 insertions, 18 deletions
diff --git a/crates/shirabe/src/autoload/autoload_generator.rs b/crates/shirabe/src/autoload/autoload_generator.rs
index aacbfc0f..4eae319d 100644
--- a/crates/shirabe/src/autoload/autoload_generator.rs
+++ b/crates/shirabe/src/autoload/autoload_generator.rs
@@ -815,19 +815,13 @@ return array(
{
let name = package.get_name();
let _ = package.get_target_dir();
- return Err(InvalidArgumentException {
- message: format!("PSR-4 autoloading is incompatible with the target-dir property, remove the target-dir in package '{}'.", name),
- code: 0,
- }
+ return Err(InvalidArgumentException::new(format!("PSR-4 autoloading is incompatible with the target-dir property, remove the target-dir in package '{}'.", name))
.into());
}
if let Some(psr4) = autoload.get("psr-4").and_then(|v| v.as_array()) {
for (namespace, _dirs) in psr4 {
if !namespace.is_empty() && !namespace.ends_with('\\') {
- return Err(InvalidArgumentException {
- message: format!("psr-4 namespaces must end with a namespace separator, '{}' does not, use '{}\\'.", namespace, namespace),
- code: 0,
- }
+ return Err(InvalidArgumentException::new(format!("psr-4 namespaces must end with a namespace separator, '{}' does not, use '{}\\'.", namespace, namespace))
.into());
}
}
diff --git a/crates/shirabe/src/autoload/class_loader.rs b/crates/shirabe/src/autoload/class_loader.rs
index 89758269..47b6ee4c 100644
--- a/crates/shirabe/src/autoload/class_loader.rs
+++ b/crates/shirabe/src/autoload/class_loader.rs
@@ -175,11 +175,9 @@ impl ClassLoader {
// Register directories for a new namespace.
let length = strlen(prefix);
if "\\" != &prefix[(length as usize - 1)..(length as usize)] {
- return Err(InvalidArgumentException {
- message: "A non-empty PSR-4 prefix must end with a namespace separator."
- .to_string(),
- code: 0,
- }
+ return Err(InvalidArgumentException::new(
+ "A non-empty PSR-4 prefix must end with a namespace separator.".to_string(),
+ )
.into());
}
let first = prefix.chars().next().unwrap_or('\0').to_string();
@@ -226,11 +224,9 @@ impl ClassLoader {
} else {
let length = strlen(prefix);
if "\\" != &prefix[(length as usize - 1)..(length as usize)] {
- return Err(InvalidArgumentException {
- message: "A non-empty PSR-4 prefix must end with a namespace separator."
- .to_string(),
- code: 0,
- }
+ return Err(InvalidArgumentException::new(
+ "A non-empty PSR-4 prefix must end with a namespace separator.".to_string(),
+ )
.into());
}
let first = prefix.chars().next().unwrap_or('\0').to_string();