diff options
| -rw-r--r-- | Cargo.lock | 5 | ||||
| -rw-r--r-- | Cargo.toml | 1 | ||||
| -rw-r--r-- | crates/shirabe-ca-bundle/Cargo.toml | 7 | ||||
| -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.rs | 2 | ||||
| -rw-r--r-- | crates/shirabe/Cargo.toml | 1 | ||||
| -rw-r--r-- | crates/shirabe/src/util/stream_context_factory.rs | 2 | ||||
| -rw-r--r-- | crates/shirabe/src/util/tls_helper.rs | 2 |
9 files changed, 16 insertions, 4 deletions
@@ -2096,6 +2096,7 @@ dependencies = [ "serde_json", "serial_test", "sha1", + "shirabe-ca-bundle", "shirabe-class-map-generator", "shirabe-external-packages", "shirabe-metadata-minifier", @@ -2118,6 +2119,10 @@ dependencies = [ ] [[package]] +name = "shirabe-ca-bundle" +version = "0.0.1" + +[[package]] name = "shirabe-class-map-generator" version = "0.0.1" dependencies = [ @@ -8,6 +8,7 @@ edition = "2024" [workspace.dependencies] shirabe = { path = "crates/shirabe" } +shirabe-ca-bundle = { path = "crates/shirabe-ca-bundle" } shirabe-class-map-generator = { path = "crates/shirabe-class-map-generator" } shirabe-external-packages = { path = "crates/shirabe-external-packages" } shirabe-metadata-minifier = { path = "crates/shirabe-metadata-minifier" } 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, |