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/array_input.rs | 36 +++++++++------------- 1 file changed, 14 insertions(+), 22 deletions(-) (limited to 'crates/shirabe-external-packages/src/symfony/console/input/array_input.rs') diff --git a/crates/shirabe-external-packages/src/symfony/console/input/array_input.rs b/crates/shirabe-external-packages/src/symfony/console/input/array_input.rs index 9a19b839..de89a340 100644 --- a/crates/shirabe-external-packages/src/symfony/console/input/array_input.rs +++ b/crates/shirabe-external-packages/src/symfony/console/input/array_input.rs @@ -154,11 +154,9 @@ impl ArrayInput { /// 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(InvalidOptionException(InvalidArgumentException( - shirabe_php_shim::InvalidArgumentException { - message: format!("The \"-{}\" option does not exist.", shortcut), - code: 0, - }, + return Err(InvalidOptionException::new(format!( + "The \"-{}\" option does not exist.", + shortcut )) .into()); } @@ -176,11 +174,9 @@ impl ArrayInput { 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(InvalidOptionException(InvalidArgumentException( - shirabe_php_shim::InvalidArgumentException { - message: format!("The \"--{}\" option does not exist.", name), - code: 0, - }, + return Err(InvalidOptionException::new(format!( + "The \"--{}\" option does not exist.", + name )) .into()); } @@ -197,11 +193,9 @@ impl ArrayInput { if matches!(value, PhpMixed::Null) { if option.is_value_required() { - return Err(InvalidOptionException(InvalidArgumentException( - shirabe_php_shim::InvalidArgumentException { - message: format!("The \"--{}\" option requires a value.", name), - code: 0, - }, + return Err(InvalidOptionException::new(format!( + "The \"--{}\" option requires a value.", + name )) .into()); } @@ -219,13 +213,11 @@ impl ArrayInput { /// Adds an argument value. fn add_argument(&mut self, name: &PhpMixed, value: PhpMixed) -> anyhow::Result<()> { if !self.inner.definition.has_argument(name) { - return Err( - InvalidArgumentException(shirabe_php_shim::InvalidArgumentException { - message: format!("The \"{}\" argument does not exist.", name.clone()), - code: 0, - }) - .into(), - ); + return Err(InvalidArgumentException::new(format!( + "The \"{}\" argument does not exist.", + name.clone() + )) + .into()); } self.inner -- cgit v1.3.1-4-g156e