aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe/src/package/loader
diff options
context:
space:
mode:
authornsfisis <nsfisis@gmail.com>2026-08-18 01:57:02 +0900
committernsfisis <nsfisis@gmail.com>2026-08-18 01:57:02 +0900
commit530d085d4f3e19f94ac3cf8f8ac3b17000214b2e (patch)
treeb4de2c2443e2bb2cfc692454ac284dc1d2313e59 /crates/shirabe/src/package/loader
parent0caac63bacefb9a1f62848636d47fca07f592bba (diff)
downloadphp-shirabe-530d085d4f3e19f94ac3cf8f8ac3b17000214b2e.tar.gz
php-shirabe-530d085d4f3e19f94ac3cf8f8ac3b17000214b2e.tar.zst
php-shirabe-530d085d4f3e19f94ac3cf8f8ac3b17000214b2e.zip
refactor(pcre): inline Preg into its call sites and drop the crate
Preg had shed everything it owned: after the last few rounds its methods were one-line forwards to the shim's preg_*(), differing only in a default argument or a wrapper the caller unwrapped anyway. The 460 call sites now name the shim function, and shirabe-pcre is gone from the workspace along with its LICENSE entry. The forwards expand as they read: isMatch becomes preg_match2(.., 0).is_some() (is_none() where PHP negates it), isMatch3 and match3 drop the .is_some(), matchAll counts through preg_match_all2(..).occurrence_count(), and replace4/replace5 spell out the limit and count arguments preg_replace2 takes. Callbacks are the one place the shapes differ: preg_replace_callback carries an error out of the callback, so the fourteen infallible closures wrap their result in Ok() and expect() it back. Config::process() is the fifteenth, and it drops the `error` cell it captured to smuggle a failure past a closure that could only return a String. The `?` in the closure now carries it, which is what the PHP does -- a throw from the callback leaves preg_replace_callback at the failing match rather than running the remaining replacements and reporting the last error. The module doc that explained why composer/pcre's exceptions and *StrictGroups() variants have no counterpart moves to the shim's preg module, where the functions it describes live. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Diffstat (limited to 'crates/shirabe/src/package/loader')
-rw-r--r--crates/shirabe/src/package/loader/array_loader.rs11
-rw-r--r--crates/shirabe/src/package/loader/root_package_loader.rs17
-rw-r--r--crates/shirabe/src/package/loader/validating_array_loader.rs29
3 files changed, 30 insertions, 27 deletions
diff --git a/crates/shirabe/src/package/loader/array_loader.rs b/crates/shirabe/src/package/loader/array_loader.rs
index 21811f14..b6b5ac1e 100644
--- a/crates/shirabe/src/package/loader/array_loader.rs
+++ b/crates/shirabe/src/package/loader/array_loader.rs
@@ -17,11 +17,10 @@ use crate::package::loader::LoaderInterface;
use crate::package::version::VersionParser;
use chrono::Utc;
use indexmap::IndexMap;
-use shirabe_pcre::Preg;
use shirabe_php_shim::{
AnyThrowable, E_USER_DEPRECATED, PhpMixed, UnexpectedValueException, is_scalar, is_string,
- json_encode, ltrim, php_regex, stripos, strpos, strtolower, strval, substr, trigger_error,
- trim,
+ json_encode, ltrim, php_regex, preg_match2, preg_replace, stripos, strpos, strtolower, strval,
+ substr, trigger_error, trim,
};
#[derive(Debug)]
@@ -340,7 +339,7 @@ impl ArrayLoader {
&& !shirabe_php_shim::empty(time_value)
{
let time_str = time_value.as_string().unwrap_or("");
- let time = if Preg::is_match(php_regex!(r"/^\d++$/D"), time_str) {
+ let time = if preg_match2(php_regex!(r"/^\d++$/D"), time_str, 0).is_some() {
format!("@{}", time_str)
} else {
time_str.to_string()
@@ -510,7 +509,7 @@ impl ArrayLoader {
if let Some(alias_normalized) = alias_normalized
&& !alias_normalized.is_empty()
{
- let pretty_alias = Preg::replace(php_regex!(r"{(\.9{7})+}"), ".x", &alias_normalized);
+ let pretty_alias = preg_replace(php_regex!(r"{(\.9{7})+}"), ".x", &alias_normalized);
return Ok(match package {
CompleteOrRootPackage::Root(root) => RootAliasPackageHandle::new(
@@ -771,7 +770,7 @@ impl ArrayLoader {
&& default_branch_is_true
&& self
.version_parser
- .parse_numeric_alias_prefix(&Preg::replace(php_regex!(r"{^v}"), "", &version_str))
+ .parse_numeric_alias_prefix(&preg_replace(php_regex!(r"{^v}"), "", &version_str))
.is_none()
{
return Ok(Some(VersionParser::DEFAULT_BRANCH_ALIAS.to_string()));
diff --git a/crates/shirabe/src/package/loader/root_package_loader.rs b/crates/shirabe/src/package/loader/root_package_loader.rs
index 012c30fd..bc49ffc0 100644
--- a/crates/shirabe/src/package/loader/root_package_loader.rs
+++ b/crates/shirabe/src/package/loader/root_package_loader.rs
@@ -15,9 +15,9 @@ use crate::repository::RepositoryManager;
use crate::util::Platform;
use crate::util::ProcessExecutor;
use indexmap::IndexMap;
-use shirabe_pcre::Preg;
use shirabe_php_shim::{
- PhpMixed, RuntimeException, UnexpectedValueException, php_regex, preg_split, strtolower,
+ PhpMixed, RuntimeException, UnexpectedValueException, php_regex, preg_match2, preg_replace,
+ preg_split, strtolower,
};
#[derive(Debug)]
@@ -252,9 +252,10 @@ impl RootPackageLoader {
mut aliases: Vec<IndexMap<String, String>>,
) -> Vec<IndexMap<String, String>> {
for (req_name, req_version) in requires {
- if let Some(m) = Preg::is_match3(
+ if let Some(m) = preg_match2(
php_regex!(r"{(?:^|\| *|, *)([^,\s#|]+)(?:#[^ ]+)? +as +([^,\s|]+)(?:$| *\|| *,)}"),
req_version,
+ 0,
) {
let m1 = m.get(1).unwrap_or_default().to_string();
let m2 = m.get(2).unwrap_or_default().to_string();
@@ -316,7 +317,7 @@ impl RootPackageLoader {
let mut matched = false;
for constraint in &constraints {
- if let Some(m) = Preg::is_match3(&pattern, constraint) {
+ if let Some(m) = preg_match2(&pattern, constraint, 0) {
let name = strtolower(req_name);
let m1 = m.get(1).unwrap_or_default().to_string();
let normalized_m1 = VersionParser::normalize_stability(&m1).unwrap_or_default();
@@ -336,8 +337,8 @@ impl RootPackageLoader {
for constraint in &constraints {
let req_version_stripped =
- Preg::replace(php_regex!(r"{^([^,\s@]+) as .+$}"), "$1", constraint);
- if Preg::is_match(php_regex!(r"{^[^,\s@]+$}"), &req_version_stripped) {
+ preg_replace(php_regex!(r"{^([^,\s@]+) as .+$}"), "$1", constraint);
+ if preg_match2(php_regex!(r"{^[^,\s@]+$}"), &req_version_stripped, 0).is_some() {
let stability_name = VersionParser::parse_stability(&req_version_stripped);
if stability_name != "stable" {
let name = strtolower(req_name);
@@ -361,8 +362,8 @@ impl RootPackageLoader {
mut references: IndexMap<String, String>,
) -> IndexMap<String, String> {
for (req_name, req_version) in requires {
- let req_version = Preg::replace(php_regex!(r"{^([^,\s@]+) as .+$}"), "$1", req_version);
- if let Some(m) = Preg::is_match3(php_regex!(r"{^[^,\s@]+?#([a-f0-9]+)$}"), &req_version)
+ let req_version = preg_replace(php_regex!(r"{^([^,\s@]+) as .+$}"), "$1", req_version);
+ if let Some(m) = preg_match2(php_regex!(r"{^[^,\s@]+?#([a-f0-9]+)$}"), &req_version, 0)
&& VersionParser::parse_stability(&req_version) == "dev"
{
let name = strtolower(req_name);
diff --git a/crates/shirabe/src/package/loader/validating_array_loader.rs b/crates/shirabe/src/package/loader/validating_array_loader.rs
index 6b9bea91..5ac1a929 100644
--- a/crates/shirabe/src/package/loader/validating_array_loader.rs
+++ b/crates/shirabe/src/package/loader/validating_array_loader.rs
@@ -7,12 +7,11 @@ use crate::package::version::VersionParser;
use crate::package::{STABILITIES, SUPPORTED_LINK_TYPES};
use crate::repository::PlatformRepository;
use indexmap::IndexMap;
-use shirabe_pcre::Preg;
use shirabe_php_shim::{
CmpOp, E_USER_DEPRECATED, PHP_EOL, PhpMixed, array_intersect_key, array_values,
filter_var_email, get_debug_type, is_array, is_bool, is_int, is_numeric, is_scalar, is_string,
- json_encode, parse_url, php_regex, php_to_string, str_replace, strcasecmp, strtolower,
- strtotime, substr, trigger_error, trim, var_export,
+ json_encode, parse_url, php_regex, php_to_string, preg_match2, preg_replace, str_replace,
+ strcasecmp, strtolower, strtotime, substr, trigger_error, trim, var_export,
};
use shirabe_semver::Intervals;
use shirabe_semver::constraint::AnyConstraint;
@@ -74,12 +73,15 @@ impl ValidatingArrayLoader {
return None;
}
- if !Preg::is_match(
+ if preg_match2(
php_regex!(
"{^[a-z0-9](?:[_.-]?[a-z0-9]++)*+/[a-z0-9](?:(?:[_.]|-{1,2})?[a-z0-9]++)*+$}iD"
),
name,
- ) {
+ 0,
+ )
+ .is_none()
+ {
return Some(format!(
"{} is invalid, it should have a vendor name, a forward slash, and a package name. The vendor and package name can be words separated by -, . or _. The complete name should match \"^[a-z0-9]([_.-]?[a-z0-9]+)*/[a-z0-9](([_.]?|-{{0,2}})[a-z0-9]+)*$\".",
name
@@ -100,14 +102,14 @@ impl ValidatingArrayLoader {
));
}
- if Preg::is_match(php_regex!("{\\.json$}"), name) {
+ if preg_match2(php_regex!("{\\.json$}"), name, 0).is_some() {
return Some(format!(
"{} is invalid, package names can not end in .json, consider renaming it or perhaps using a -json suffix instead.",
name
));
}
- if Preg::is_match(php_regex!("{[A-Z]}"), name) {
+ if preg_match2(php_regex!("{[A-Z]}"), name, 0).is_some() {
if is_link {
return Some(format!(
"{} is invalid, it should not contain uppercase characters. Please use {} instead.",
@@ -116,7 +118,7 @@ impl ValidatingArrayLoader {
));
}
- let suggest_name = Preg::replace(
+ let suggest_name = preg_replace(
php_regex!("{(?:([a-z])([A-Z])|([A-Z])([A-Z][a-z]))}"),
"\\1\\3-\\2\\4",
name,
@@ -141,7 +143,7 @@ impl ValidatingArrayLoader {
.as_string()
.unwrap_or("")
.to_string();
- if !Preg::is_match(format!("{{^{}$}}u", regex), &value) {
+ if preg_match2(format!("{{^{}$}}u", regex), &value, 0).is_none() {
let message = format!(
"{} : invalid value ({}), must match {}",
property, value, regex
@@ -256,7 +258,7 @@ impl ValidatingArrayLoader {
if let Some(regex_str) = regex {
let value_str = php_to_string(&value);
- if !Preg::is_match(format!("{{^{}$}}u", regex_str), &value_str) {
+ if preg_match2(format!("{{^{}$}}u", regex_str), &value_str, 0).is_none() {
self.warnings.borrow_mut().push(format!(
"{}.{} : invalid value ({}), must match {}",
property, key, value_str, regex_str
@@ -1185,7 +1187,8 @@ impl LoaderInterface for ValidatingArrayLoader {
self.warnings
.borrow_mut()
.push(format!("{}.{}", link_type, err));
- } else if !Preg::is_match(php_regex!("{^[A-Za-z0-9_./-]+$}"), &package) {
+ } else if preg_match2(php_regex!("{^[A-Za-z0-9_./-]+$}"), &package, 0).is_none()
+ {
self.errors.borrow_mut().push(format!(
"{}.{} : invalid key, package names must be strings containing only [A-Za-z0-9_./-]",
link_type, package
@@ -1448,7 +1451,7 @@ impl LoaderInterface for ValidatingArrayLoader {
}
if let Some(ref_val) = section.get("reference").filter(|_| isset("reference")) {
let ref_str = php_to_string(ref_val);
- if Preg::is_match(php_regex!("{^\\s*-}"), &ref_str) {
+ if preg_match2(php_regex!("{^\\s*-}"), &ref_str, 0).is_some() {
self.errors.borrow_mut().push(format!(
"{}.reference : must not start with a \"-\", \"{}\" given",
src_type, ref_str
@@ -1457,7 +1460,7 @@ impl LoaderInterface for ValidatingArrayLoader {
}
if let Some(url_val) = section.get("url").filter(|_| isset("url")) {
let url_str = php_to_string(url_val);
- if Preg::is_match(php_regex!("{^\\s*-}"), &url_str) {
+ if preg_match2(php_regex!("{^\\s*-}"), &url_str, 0).is_some() {
self.errors.borrow_mut().push(format!(
"{}.url : must not start with a \"-\", \"{}\" given",
src_type, url_str