aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe/src/util/stream_context_factory.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/stream_context_factory.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/stream_context_factory.rs')
-rw-r--r--crates/shirabe/src/util/stream_context_factory.rs26
1 files changed, 13 insertions, 13 deletions
diff --git a/crates/shirabe/src/util/stream_context_factory.rs b/crates/shirabe/src/util/stream_context_factory.rs
index cae00c08..b407e897 100644
--- a/crates/shirabe/src/util/stream_context_factory.rs
+++ b/crates/shirabe/src/util/stream_context_factory.rs
@@ -22,7 +22,7 @@ impl StreamContextFactory {
url: &str,
default_options: IndexMap<String, PhpMixed>,
default_params: IndexMap<String, PhpMixed>,
- ) -> anyhow::Result<PhpMixed, TransportException> {
+ ) -> anyhow::Result<PhpMixed, Box<TransportException>> {
let mut options: IndexMap<String, PhpMixed> = {
let mut http = IndexMap::new();
// specify defaults again to try and work better with curlwrappers enabled
@@ -66,7 +66,7 @@ impl StreamContextFactory {
url: &str,
mut options: IndexMap<String, PhpMixed>,
for_curl: bool,
- ) -> anyhow::Result<IndexMap<String, PhpMixed>, TransportException> {
+ ) -> anyhow::Result<IndexMap<String, PhpMixed>, Box<TransportException>> {
// Make sure the headers are in an array form
let has_header = options
.get("http")
@@ -105,23 +105,23 @@ impl StreamContextFactory {
if proxy.is_secure() {
if !extension_loaded("openssl") {
- return Err(TransportException::new(
+ return Err(Box::new(TransportException::new(
"You must enable the openssl extension to use a secure proxy."
.to_string(),
0,
- ));
+ )));
}
if is_https_request {
- return Err(TransportException::new(
+ return Err(Box::new(TransportException::new(
"You must enable the curl extension to make https requests through a secure proxy.".to_string(),
0,
- ));
+ )));
}
} else if is_https_request && !extension_loaded("openssl") {
- return Err(TransportException::new(
+ return Err(Box::new(TransportException::new(
"You must enable the openssl extension to make https requests through a proxy.".to_string(),
0,
- ));
+ )));
}
// Header will be a Proxy-Authorization string or not set
@@ -224,7 +224,7 @@ impl StreamContextFactory {
// `logger` was a PSR LoggerInterface; CaBundle is slated for removal so
// it is now an unused `()` placeholder.
logger: (),
- ) -> anyhow::Result<IndexMap<String, PhpMixed>, TransportException> {
+ ) -> anyhow::Result<IndexMap<String, PhpMixed>, Box<TransportException>> {
let ciphers = [
"ECDHE-RSA-AES128-GCM-SHA256",
"ECDHE-ECDSA-AES128-GCM-SHA256",
@@ -336,10 +336,10 @@ impl StreamContextFactory {
if let Some(ref cafile) = cafile
&& (!Filesystem::is_readable(cafile) || !CaBundle::validate_ca_file(cafile, logger))
{
- return Err(TransportException::new(
+ return Err(Box::new(TransportException::new(
"The configured cafile was not valid or could not be read.".to_string(),
0,
- ));
+ )));
}
let capath = defaults
@@ -351,10 +351,10 @@ impl StreamContextFactory {
if let Some(ref capath) = capath
&& (!shirabe_php_shim::is_dir(capath) || !Filesystem::is_readable(capath))
{
- return Err(TransportException::new(
+ return Err(Box::new(TransportException::new(
"The configured capath was not valid or could not be read.".to_string(),
0,
- ));
+ )));
}
// Disable TLS compression to prevent CRIME attacks where supported.