aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe/src/command/init_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/init_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/init_command.rs')
-rw-r--r--crates/shirabe/src/command/init_command.rs83
1 files changed, 32 insertions, 51 deletions
diff --git a/crates/shirabe/src/command/init_command.rs b/crates/shirabe/src/command/init_command.rs
index 5168b2ba..7b4012ce 100644
--- a/crates/shirabe/src/command/init_command.rs
+++ b/crates/shirabe/src/command/init_command.rs
@@ -25,6 +25,7 @@ use shirabe_external_packages::symfony::console::helper::FormatBlockMessages;
use shirabe_external_packages::symfony::console::input::ArrayInput;
use shirabe_external_packages::symfony::console::input::InputInterface;
use shirabe_external_packages::symfony::console::output::OutputInterface;
+use shirabe_php_shim::Catch as _;
use shirabe_php_shim::{
FILE_IGNORE_NEW_LINES, InvalidArgumentException, PHP_EOL, PHP_SERVER, PhpMixed,
array_flip_strings, array_intersect_key, array_map, basename, empty, explode, file,
@@ -99,11 +100,9 @@ impl InitCommand {
if let Some(ref email) = email
&& !self.is_valid_email(email)
{
- return Err(InvalidArgumentException {
- message: format!("Invalid email \"{}\"", email),
- code: 0,
- }
- .into());
+ return Err(
+ InvalidArgumentException::new(format!("Invalid email \"{}\"", email)).into(),
+ );
}
let mut result: IndexMap<String, Option<String>> = IndexMap::new();
@@ -121,11 +120,8 @@ impl InitCommand {
return Ok(result);
}
- Err(InvalidArgumentException {
- message: "Invalid author string. Must be in the formats: Jane Doe or John Smith <john@example.com>"
- .to_string(),
- code: 0,
- }
+ Err(InvalidArgumentException::new("Invalid author string. Must be in the formats: Jane Doe or John Smith <john@example.com>"
+ .to_string())
.into())
}
@@ -517,13 +513,10 @@ impl Command for InitCommand {
.unwrap_or(""),
)
{
- return Err(InvalidArgumentException {
- message: format!(
- "The package name {} is invalid, it should be lowercase and have a vendor name, a forward slash, and a package name, matching: [a-z0-9_.-]+/[a-z0-9_.-]+",
- options.get("name").and_then(|v| v.as_string()).unwrap_or("")
- ),
- code: 0,
- }
+ return Err(InvalidArgumentException::new(format!(
+ "The package name {} is invalid, it should be lowercase and have a vendor name, a forward slash, and a package name, matching: [a-z0-9_.-]+/[a-z0-9_.-]+",
+ options.get("name").and_then(|v| v.as_string()).unwrap_or("")
+ ))
.into());
}
@@ -678,7 +671,7 @@ impl Command for InitCommand {
let validate_result = file_obj.validate_schema(JsonFile::LAX_SCHEMA, None);
if let Err(e) = validate_result {
// try to downcast to JsonValidationException
- if let Some(json_err) = e.downcast_ref::<JsonValidationException>() {
+ if let Some(json_err) = e.catch::<JsonValidationException>() {
io.write_error3(
"<error>Schema validation error, aborting</error>",
true,
@@ -926,13 +919,10 @@ impl Command for InitCommand {
php_regex!(r"{^[a-z0-9]([_.-]?[a-z0-9]+)*\/[a-z0-9](([_.]|-{1,2})?[a-z0-9]+)*$}D"),
value.as_string().unwrap_or(""),
) {
- return Err(InvalidArgumentException {
- message: format!(
- "The package name {} is invalid, it should be lowercase and have a vendor name, a forward slash, and a package name, matching: [a-z0-9_.-]+/[a-z0-9_.-]+",
- value.as_string().unwrap_or("")
- ),
- code: 0,
- }
+ return Err(InvalidArgumentException::new(format!(
+ "The package name {} is invalid, it should be lowercase and have a vendor name, a forward slash, and a package name, matching: [a-z0-9_.-]+/[a-z0-9_.-]+",
+ value.as_string().unwrap_or("")
+ ))
.into());
}
@@ -1031,20 +1021,17 @@ impl Command for InitCommand {
}
if !base_package::STABILITIES.contains_key(value.as_string().unwrap_or("")) {
- return Err(InvalidArgumentException {
- message: format!(
- "Invalid minimum stability \"{}\". Must be empty or one of: {}",
- value.as_string().unwrap_or(""),
- implode(
- ", ",
- &base_package::STABILITIES
- .keys()
- .map(|k| k.to_string())
- .collect::<Vec<_>>()
- )
- ),
- code: 0,
- }
+ return Err(InvalidArgumentException::new(format!(
+ "Invalid minimum stability \"{}\". Must be empty or one of: {}",
+ value.as_string().unwrap_or(""),
+ implode(
+ ", ",
+ &base_package::STABILITIES
+ .keys()
+ .map(|k| k.to_string())
+ .collect::<Vec<_>>()
+ )
+ ))
.into());
}
@@ -1107,13 +1094,10 @@ impl Command for InitCommand {
&& !spdx.validate(license.as_string().unwrap_or(""))
&& license.as_string() != Some("proprietary")
{
- return Err(InvalidArgumentException {
- message: format!(
+ return Err(InvalidArgumentException::new(format!(
"Invalid license provided: {}. Only SPDX license identifiers (https://spdx.org/licenses/) or \"proprietary\" are accepted.",
license.as_string().unwrap_or("")
- ),
- code: 0,
- }
+ ))
.into());
}
input.borrow_mut().set_option("license", license);
@@ -1246,13 +1230,10 @@ impl Command for InitCommand {
if !Preg::is_match(php_regex!(r"{^[^/][A-Za-z0-9\-_/]+/$}"), &value_or_default)
{
- return Err(InvalidArgumentException {
- message: format!(
- "The src folder name \"{}\" is invalid. Please add a relative path with tailing forward slash. [A-Za-z0-9_-/]+/",
- value_or_default,
- ),
- code: 0,
- }
+ return Err(InvalidArgumentException::new(format!(
+ "The src folder name \"{}\" is invalid. Please add a relative path with tailing forward slash. [A-Za-z0-9_-/]+/",
+ value_or_default,
+ ))
.into());
}