From f4cad2123b2af0de72bda4ce039e16e74f163f4e Mon Sep 17 00:00:00 2001 From: nsfisis Date: Sat, 8 Aug 2026 22:14:12 +0900 Subject: 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::()` 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) --- .../src/symfony/console/input/argv_input.rs | 52 +++++++++++----------- 1 file changed, 25 insertions(+), 27 deletions(-) (limited to 'crates/shirabe-external-packages/src/symfony/console/input/argv_input.rs') diff --git a/crates/shirabe-external-packages/src/symfony/console/input/argv_input.rs b/crates/shirabe-external-packages/src/symfony/console/input/argv_input.rs index fdc2dcc2..65ab9053 100644 --- a/crates/shirabe-external-packages/src/symfony/console/input/argv_input.rs +++ b/crates/shirabe-external-packages/src/symfony/console/input/argv_input.rs @@ -169,10 +169,10 @@ impl ArgvInput { shirabe_php_shim::mb_substr(name, i, Some(1), Some(&encoding)) } }; - return Err(RuntimeException(shirabe_php_shim::RuntimeException { - message: format!("The \"-{}\" option does not exist.", bad), - code: 0, - }) + return Err(RuntimeException::new(format!( + "The \"-{}\" option does not exist.", + bad + )) .into()); } @@ -292,9 +292,7 @@ impl ArgvInput { format!("No arguments expected, got \"{}\".", token) }; - return Err( - RuntimeException(shirabe_php_shim::RuntimeException { message, code: 0 }).into(), - ); + return Err(RuntimeException::new(message).into()); } Ok(()) @@ -303,10 +301,10 @@ impl ArgvInput { /// Adds a short option value. fn add_short_option(&mut self, shortcut: &str, value: PhpMixed) -> anyhow::Result<()> { if !self.inner.definition.has_shortcut(shortcut) { - return Err(RuntimeException(shirabe_php_shim::RuntimeException { - message: format!("The \"-{}\" option does not exist.", shortcut), - code: 0, - }) + return Err(RuntimeException::new(format!( + "The \"-{}\" option does not exist.", + shortcut + )) .into()); } @@ -323,19 +321,19 @@ impl ArgvInput { fn add_long_option(&mut self, name: &str, mut value: PhpMixed) -> anyhow::Result<()> { if !self.inner.definition.has_option(name) { if !self.inner.definition.has_negation(name) { - return Err(RuntimeException(shirabe_php_shim::RuntimeException { - message: format!("The \"--{}\" option does not exist.", name), - code: 0, - }) + return Err(RuntimeException::new(format!( + "The \"--{}\" option does not exist.", + name + )) .into()); } let option_name = self.inner.definition.negation_to_name(name)?; if !matches!(value, PhpMixed::Null) { - return Err(RuntimeException(shirabe_php_shim::RuntimeException { - message: format!("The \"--{}\" option does not accept a value.", name), - code: 0, - }) + return Err(RuntimeException::new(format!( + "The \"--{}\" option does not accept a value.", + name + )) .into()); } self.inner @@ -348,10 +346,10 @@ impl ArgvInput { let option = self.inner.definition.get_option(name)?; if !matches!(value, PhpMixed::Null) && !option.accept_value() { - return Err(RuntimeException(shirabe_php_shim::RuntimeException { - message: format!("The \"--{}\" option does not accept a value.", name), - code: 0, - }) + return Err(RuntimeException::new(format!( + "The \"--{}\" option does not accept a value.", + name + )) .into()); } @@ -373,10 +371,10 @@ impl ArgvInput { if matches!(value, PhpMixed::Null) { if option.is_value_required() { - return Err(RuntimeException(shirabe_php_shim::RuntimeException { - message: format!("The \"--{}\" option requires a value.", name), - code: 0, - }) + return Err(RuntimeException::new(format!( + "The \"--{}\" option requires a value.", + name + )) .into()); } -- cgit v1.3.1-4-g156e