aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates
diff options
context:
space:
mode:
authornsfisis <nsfisis@gmail.com>2026-08-09 11:22:59 +0900
committernsfisis <nsfisis@gmail.com>2026-08-09 11:22:59 +0900
commit738a258496318edb6e264b13b8a6d0dc313795d3 (patch)
tree68c293ba2c45d105c7e85cc006918ef9c6b2d843 /crates
parent548ec1ffb232da4411ae8890080bcfd63300cda0 (diff)
downloadphp-shirabe-738a258496318edb6e264b13b8a6d0dc313795d3.tar.gz
php-shirabe-738a258496318edb6e264b13b8a6d0dc313795d3.tar.zst
php-shirabe-738a258496318edb6e264b13b8a6d0dc313795d3.zip
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) <noreply@anthropic.com>
Diffstat (limited to 'crates')
-rw-r--r--crates/shirabe-ca-bundle/Cargo.toml7
-rw-r--r--crates/shirabe-ca-bundle/src/ca_bundle.rs (renamed from crates/shirabe-external-packages/src/composer/ca_bundle/ca_bundle.rs)0
-rw-r--r--crates/shirabe-ca-bundle/src/lib.rs (renamed from crates/shirabe-external-packages/src/composer/ca_bundle.rs)0
-rw-r--r--crates/shirabe-external-packages/src/composer.rs2
-rw-r--r--crates/shirabe/Cargo.toml1
-rw-r--r--crates/shirabe/src/util/stream_context_factory.rs2
-rw-r--r--crates/shirabe/src/util/tls_helper.rs2
7 files changed, 10 insertions, 4 deletions
diff --git a/crates/shirabe-ca-bundle/Cargo.toml b/crates/shirabe-ca-bundle/Cargo.toml
new file mode 100644
index 00000000..e5608175
--- /dev/null
+++ b/crates/shirabe-ca-bundle/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "shirabe-ca-bundle"
+version.workspace = true
+edition.workspace = true
+
+[lints]
+workspace = true
diff --git a/crates/shirabe-external-packages/src/composer/ca_bundle/ca_bundle.rs b/crates/shirabe-ca-bundle/src/ca_bundle.rs
index 3c372cb1..3c372cb1 100644
--- a/crates/shirabe-external-packages/src/composer/ca_bundle/ca_bundle.rs
+++ b/crates/shirabe-ca-bundle/src/ca_bundle.rs
diff --git a/crates/shirabe-external-packages/src/composer/ca_bundle.rs b/crates/shirabe-ca-bundle/src/lib.rs
index 2a325096..2a325096 100644
--- a/crates/shirabe-external-packages/src/composer/ca_bundle.rs
+++ b/crates/shirabe-ca-bundle/src/lib.rs
diff --git a/crates/shirabe-external-packages/src/composer.rs b/crates/shirabe-external-packages/src/composer.rs
index da1ab285..c95f237d 100644
--- a/crates/shirabe-external-packages/src/composer.rs
+++ b/crates/shirabe-external-packages/src/composer.rs
@@ -1,5 +1,3 @@
-pub mod ca_bundle;
pub mod xdebug_handler;
-pub use ca_bundle::*;
pub use xdebug_handler::*;
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,