diff options
| author | nsfisis <nsfisis@gmail.com> | 2026-08-09 11:10:53 +0900 |
|---|---|---|
| committer | nsfisis <nsfisis@gmail.com> | 2026-08-09 11:10:53 +0900 |
| commit | 66c3eba15ba6302d43de057a9063f7feee8c6fb3 (patch) | |
| tree | d44bf5cec4d9ddfffa1a732dba85418c2873de82 /crates/shirabe/src/util/http | |
| parent | 0b737de495e9a8530a6a32ce2799dc49f3e5786f (diff) | |
| download | php-shirabe-66c3eba15ba6302d43de057a9063f7feee8c6fb3.tar.gz php-shirabe-66c3eba15ba6302d43de057a9063f7feee8c6fb3.tar.zst php-shirabe-66c3eba15ba6302d43de057a9063f7feee8c6fb3.zip | |
refactor(pcre): extract composer/pcre into the shirabe-pcre crate
Move `Composer\Pcre` out of shirabe-external-packages and into its own
crate, so the path is `shirabe_pcre::preg::Preg` instead of
`shirabe_external_packages::composer::pcre::preg::Preg`.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Diffstat (limited to 'crates/shirabe/src/util/http')
| -rw-r--r-- | crates/shirabe/src/util/http/curl_downloader.rs | 2 | ||||
| -rw-r--r-- | crates/shirabe/src/util/http/response.rs | 11 |
2 files changed, 5 insertions, 8 deletions
diff --git a/crates/shirabe/src/util/http/curl_downloader.rs b/crates/shirabe/src/util/http/curl_downloader.rs index 6409c9d5..bd77f75e 100644 --- a/crates/shirabe/src/util/http/curl_downloader.rs +++ b/crates/shirabe/src/util/http/curl_downloader.rs @@ -31,7 +31,7 @@ use crate::util::http::ProxyManager; use crate::util::http::Response; use crate::util::{AuthHelper, PromptAuthResult, StoreAuth}; use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::Preg; +use shirabe_pcre::Preg; use shirabe_php_shim::{ PhpMixed, in_array_loose, in_array_strict, parse_url, php_regex, preg_quote, rename, strpos, substr, unlink_silent, diff --git a/crates/shirabe/src/util/http/response.rs b/crates/shirabe/src/util/http/response.rs index 3ee538d5..47a1593f 100644 --- a/crates/shirabe/src/util/http/response.rs +++ b/crates/shirabe/src/util/http/response.rs @@ -1,7 +1,7 @@ //! ref: composer/src/Composer/Util/Http/Response.php use crate::json::JsonFile; -use shirabe_external_packages::composer::pcre::Preg; +use shirabe_pcre::Preg; use shirabe_php_shim::{PhpMixed, php_regex, preg_quote}; #[derive(Debug)] @@ -65,13 +65,10 @@ impl Response { let mut value = None; let pattern = format!("{{^{}:\\s*(.+?)\\s*$}}i", preg_quote(name, None)); for header in headers { - let mut matches: indexmap::IndexMap< - shirabe_external_packages::composer::pcre::CaptureKey, - String, - > = indexmap::IndexMap::new(); + let mut matches: indexmap::IndexMap<shirabe_pcre::CaptureKey, String> = + indexmap::IndexMap::new(); if Preg::match3(&pattern, header, Some(&mut matches)) - && let Some(s) = - matches.get(&shirabe_external_packages::composer::pcre::CaptureKey::ByIndex(1)) + && let Some(s) = matches.get(&shirabe_pcre::CaptureKey::ByIndex(1)) { value = Some(s.clone()); } |
