aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe/src/util/gitlab.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/util/gitlab.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/util/gitlab.rs')
-rw-r--r--crates/shirabe/src/util/gitlab.rs34
1 files changed, 17 insertions, 17 deletions
diff --git a/crates/shirabe/src/util/gitlab.rs b/crates/shirabe/src/util/gitlab.rs
index c14ad46a..cdeb0f21 100644
--- a/crates/shirabe/src/util/gitlab.rs
+++ b/crates/shirabe/src/util/gitlab.rs
@@ -10,6 +10,7 @@ use crate::util::HttpDownloader;
use crate::util::ProcessExecutor;
use indexmap::IndexMap;
use shirabe_external_packages::composer::pcre::Preg;
+use shirabe_php_shim::Catch as _;
use shirabe_php_shim::{
PhpMixed, RuntimeException, http_build_query, in_array_strict, json_decode, php_regex, time,
};
@@ -248,9 +249,9 @@ impl GitLab {
Err(e) => {
// 401 is bad credentials,
// 403 is max login attempts exceeded
- match e.downcast::<TransportException>() {
- Ok(te) if te.code == 403 || te.code == 401 => {
- if te.code == 401 {
+ match e.catch::<TransportException>() {
+ Some(te) if te.get_code() == 403 || te.get_code() == 401 => {
+ if te.get_code() == 401 {
let response =
te.get_response().and_then(|r| json_decode(r, true).ok());
let is_invalid_grant = response
@@ -301,8 +302,7 @@ impl GitLab {
continue;
}
- Ok(te) => return Err(te.into()),
- Err(e) => return Err(e),
+ _ => return Err(e),
}
}
};
@@ -360,10 +360,9 @@ impl GitLab {
return Ok(true);
}
- Err(RuntimeException {
- message: "Invalid GitLab credentials 5 times in a row, aborting.".to_string(),
- code: 0,
- }
+ Err(RuntimeException::new(
+ "Invalid GitLab credentials 5 times in a row, aborting.".to_string(),
+ )
.into())
}
@@ -374,16 +373,17 @@ impl GitLab {
) -> anyhow::Result<bool> {
let response = match self.refresh_token(scheme, origin_url) {
Ok(r) => r,
- Err(e) => match e.downcast::<TransportException>() {
- Ok(te) => {
+ Err(e) => match e.catch::<TransportException>() {
+ Some(te) => {
+ let message = te.get_message().to_string();
self.io.write_error3(
- &format!("Couldn't refresh access token: {}", te.message),
+ &format!("Couldn't refresh access token: {}", message),
true,
io_interface::NORMAL,
);
return Ok(false);
}
- Err(e) => return Err(e),
+ None => return Err(e),
},
};
@@ -488,10 +488,10 @@ impl GitLab {
let refresh_token = match refresh_token {
Some(t) => t,
None => {
- return Err(RuntimeException {
- message: format!("No GitLab refresh token present for {}.", origin_url),
- code: 0,
- }
+ return Err(RuntimeException::new(format!(
+ "No GitLab refresh token present for {}.",
+ origin_url
+ ))
.into());
}
};