From 738a258496318edb6e264b13b8a6d0dc313795d3 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Sun, 9 Aug 2026 11:22:59 +0900 Subject: refactor(ca-bundle): extract composer/ca_bundle into the shirabe-ca-bundle crate Move `Composer\CaBundle` out of shirabe-external-packages and into its own crate, so the path is `shirabe_ca_bundle::CaBundle` instead of `shirabe_external_packages::composer::ca_bundle::CaBundle`. Co-Authored-By: Claude Opus 5 (1M context) --- crates/shirabe/Cargo.toml | 1 + crates/shirabe/src/util/stream_context_factory.rs | 2 +- crates/shirabe/src/util/tls_helper.rs | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) (limited to 'crates/shirabe') diff --git a/crates/shirabe/Cargo.toml b/crates/shirabe/Cargo.toml index eef7daf4..469b7e32 100644 --- a/crates/shirabe/Cargo.toml +++ b/crates/shirabe/Cargo.toml @@ -4,6 +4,7 @@ version.workspace = true edition.workspace = true [dependencies] +shirabe-ca-bundle.workspace = true shirabe-class-map-generator.workspace = true shirabe-external-packages.workspace = true shirabe-metadata-minifier.workspace = true diff --git a/crates/shirabe/src/util/stream_context_factory.rs b/crates/shirabe/src/util/stream_context_factory.rs index b407e897..6a63537d 100644 --- a/crates/shirabe/src/util/stream_context_factory.rs +++ b/crates/shirabe/src/util/stream_context_factory.rs @@ -7,7 +7,7 @@ use crate::util::Filesystem; use crate::util::Platform; use crate::util::http::ProxyManager; use indexmap::IndexMap; -use shirabe_external_packages::composer::ca_bundle::CaBundle; +use shirabe_ca_bundle::CaBundle; use shirabe_php_shim::{ HHVM_VERSION, PHP_MAJOR_VERSION, PHP_MINOR_VERSION, PHP_RELEASE_VERSION, PhpMixed, array_replace_recursive, extension_loaded, function_exists, php_uname, stream_context_create, diff --git a/crates/shirabe/src/util/tls_helper.rs b/crates/shirabe/src/util/tls_helper.rs index 0df30b1a..0c3f44dc 100644 --- a/crates/shirabe/src/util/tls_helper.rs +++ b/crates/shirabe/src/util/tls_helper.rs @@ -1,6 +1,6 @@ //! ref: composer/src/Composer/Util/TlsHelper.php -use shirabe_external_packages::composer::ca_bundle::ca_bundle::CaBundle; +use shirabe_ca_bundle::ca_bundle::CaBundle; use shirabe_pcre::Preg; use shirabe_php_shim::{ PhpMixed, ltrim, php_regex, preg_quote, str_replace, strtolower, substr, substr_count, -- cgit v1.3.1-4-g156e