aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe/src/command/base_command.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/command/base_command.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/command/base_command.rs')
-rw-r--r--crates/shirabe/src/command/base_command.rs77
1 files changed, 27 insertions, 50 deletions
diff --git a/crates/shirabe/src/command/base_command.rs b/crates/shirabe/src/command/base_command.rs
index 7a66862e..a1de9783 100644
--- a/crates/shirabe/src/command/base_command.rs
+++ b/crates/shirabe/src/command/base_command.rs
@@ -294,10 +294,7 @@ impl BaseCommand for BaseCommandData {
if self.composer.borrow().is_none() {
let application = self.get_application();
let Some(application) = application else {
- return Err(RuntimeException {
- message: "Could not create a Composer\\Composer instance, you must inject one if this command is not used with a Composer\\Console\\Application instance".to_string(),
- code: 0,
- }
+ return Err(RuntimeException::new("Could not create a Composer\\Composer instance, you must inject one if this command is not used with a Composer\\Console\\Application instance".to_string())
.into());
};
let composer = {
@@ -455,11 +452,9 @@ impl BaseCommand for BaseCommandData {
.as_bool()
.unwrap_or(false)
{
- return Err(InvalidArgumentException {
- message: "--prefer-source can not be used together with --prefer-install"
- .to_string(),
- code: 0,
- }
+ return Err(InvalidArgumentException::new(
+ "--prefer-source can not be used together with --prefer-install".to_string(),
+ )
.into());
}
if input
@@ -468,11 +463,9 @@ impl BaseCommand for BaseCommandData {
.as_bool()
.unwrap_or(false)
{
- return Err(InvalidArgumentException {
- message: "--prefer-dist can not be used together with --prefer-install"
- .to_string(),
- code: 0,
- }
+ return Err(InvalidArgumentException::new(
+ "--prefer-dist can not be used together with --prefer-install".to_string(),
+ )
.into());
}
let prefer_install = input.borrow().get_option("prefer-install")?;
@@ -492,13 +485,10 @@ impl BaseCommand for BaseCommandData {
prefer_source = false;
}
other => {
- return Err(UnexpectedValueException {
- message: format!(
- "--prefer-install accepts one of \"dist\", \"source\" or \"auto\", got {}",
- other
- ),
- code: 0,
- }
+ return Err(UnexpectedValueException::new(format!(
+ "--prefer-install accepts one of \"dist\", \"source\" or \"auto\", got {}",
+ other
+ ))
.into());
}
}
@@ -551,12 +541,8 @@ impl BaseCommand for BaseCommandData {
if !input.borrow().has_option("ignore-platform-reqs")
|| !input.borrow().has_option("ignore-platform-req")
{
- return Err(LogicException {
- message:
- "Calling getPlatformRequirementFilter from a command which does not define the --ignore-platform-req[s] flags is not permitted."
- .to_string(),
- code: 0,
- }
+ return Err(LogicException::new("Calling getPlatformRequirementFilter from a command which does not define the --ignore-platform-req[s] flags is not permitted."
+ .to_string())
.into());
}
@@ -585,14 +571,11 @@ impl BaseCommand for BaseCommandData {
let requirements = self.normalize_requirements(requirements)?;
for requirement in requirements {
if !requirement.contains_key("version") {
- return Err(UnexpectedValueException {
- message: format!(
- "Option {} is missing a version constraint, use e.g. {}:^1.0",
- requirement.get("name").map(|s| s.as_str()).unwrap_or(""),
- requirement.get("name").map(|s| s.as_str()).unwrap_or(""),
- ),
- code: 0,
- }
+ return Err(UnexpectedValueException::new(format!(
+ "Option {} is missing a version constraint, use e.g. {}:^1.0",
+ requirement.get("name").map(|s| s.as_str()).unwrap_or(""),
+ requirement.get("name").map(|s| s.as_str()).unwrap_or(""),
+ ))
.into());
}
requires.insert(
@@ -648,13 +631,10 @@ impl BaseCommand for BaseCommandData {
opt_name: &str,
) -> anyhow::Result<String> {
if !input.borrow().has_option(opt_name) {
- return Err(LogicException {
- message: format!(
- "This should not be called on a Command which has no {} option defined.",
- opt_name
- ),
- code: 0,
- }
+ return Err(LogicException::new(format!(
+ "This should not be called on a Command which has no {} option defined.",
+ opt_name
+ ))
.into());
}
@@ -664,14 +644,11 @@ impl BaseCommand for BaseCommandData {
.map(|s| PhpMixed::String(s.to_string()))
.collect();
if !in_array_strict(val.clone(), &formats) {
- return Err(InvalidArgumentException {
- message: format!(
- "--{} must be one of {}.",
- opt_name,
- Auditor::FORMATS.join(", ")
- ),
- code: 0,
- }
+ return Err(InvalidArgumentException::new(format!(
+ "--{} must be one of {}.",
+ opt_name,
+ Auditor::FORMATS.join(", ")
+ ))
.into());
}