aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe/src/dependency_resolver
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
commite093b2be1c333e67c96aebb0a5291bea9ae3d6db (patch)
tree0743fad689f419959c3a898605e21485087884fa /crates/shirabe/src/dependency_resolver
parent050c56ef263d90d862ef565bc1762909110e02eb (diff)
downloadphp-shirabe-e093b2be1c333e67c96aebb0a5291bea9ae3d6db.tar.gz
php-shirabe-e093b2be1c333e67c96aebb0a5291bea9ae3d6db.tar.zst
php-shirabe-e093b2be1c333e67c96aebb0a5291bea9ae3d6db.zip
refactor(preg): drop the offset argument from preg_match
Every call site but one passed offset 0. The remaining one, the UTF-8 chunking loop in Application, slices the subject instead: its pattern has no anchor or lookaround, so matching a suffix is equivalent to starting the search at that offset. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Diffstat (limited to 'crates/shirabe/src/dependency_resolver')
-rw-r--r--crates/shirabe/src/dependency_resolver/lock_transaction.rs6
-rw-r--r--crates/shirabe/src/dependency_resolver/pool_builder.rs8
-rw-r--r--crates/shirabe/src/dependency_resolver/problem.rs11
3 files changed, 12 insertions, 13 deletions
diff --git a/crates/shirabe/src/dependency_resolver/lock_transaction.rs b/crates/shirabe/src/dependency_resolver/lock_transaction.rs
index df9a737d..71609658 100644
--- a/crates/shirabe/src/dependency_resolver/lock_transaction.rs
+++ b/crates/shirabe/src/dependency_resolver/lock_transaction.rs
@@ -5,7 +5,7 @@ use crate::dependency_resolver::Pool;
use crate::dependency_resolver::Transaction;
use crate::package::PackageInterfaceHandle;
use indexmap::IndexMap;
-use shirabe_php_shim::{PregMatches, php_regex, preg_match2, preg_replace_callback};
+use shirabe_php_shim::{PregMatches, php_regex, preg_match, preg_replace_callback};
#[derive(Debug)]
pub struct LockTransaction {
@@ -158,9 +158,9 @@ impl LockTransaction {
if package.get_dist_url().is_some()
&& present_package.get_dist_reference().is_some()
- && preg_match2(php_regex!(
+ && preg_match(php_regex!(
r"{^https?://(?:(?:www\.)?bitbucket\.org|(api\.)?github\.com|(?:www\.)?gitlab\.com)/}i"
- ), &package.get_dist_url().unwrap(), 0).is_some()
+ ), &package.get_dist_url().unwrap()).is_some()
{
// Regex pattern compatibility:
// The `regex` crate has no look-around, so `(?<=/|sha=)[a-f0-9]{40}(?=/|$)` is
diff --git a/crates/shirabe/src/dependency_resolver/pool_builder.rs b/crates/shirabe/src/dependency_resolver/pool_builder.rs
index 8c5064c5..354a794c 100644
--- a/crates/shirabe/src/dependency_resolver/pool_builder.rs
+++ b/crates/shirabe/src/dependency_resolver/pool_builder.rs
@@ -21,7 +21,7 @@ use crate::repository::RootPackageRepository;
use indexmap::IndexMap;
use shirabe_php_shim::{
CmpOp, LogicException, PhpMixed, array_flip_strings, array_map, in_array_strict, microtime,
- number_format, preg_match2, round, strpos,
+ number_format, preg_match, round, strpos,
};
use shirabe_semver::CompilingMatcher;
use shirabe_semver::Intervals;
@@ -785,7 +785,7 @@ impl PoolBuilder {
fn is_update_allowed(&self, package: PackageInterfaceHandle) -> bool {
for pattern in &self.update_allow_list {
let pattern_regexp = base_package::package_name_to_regexp(pattern);
- if preg_match2(&pattern_regexp, &package.get_name(), 0).is_some() {
+ if preg_match(&pattern_regexp, &package.get_name()).is_some() {
return true;
}
}
@@ -812,13 +812,13 @@ impl PoolBuilder {
.borrow_mut()
.get_packages()?
{
- if preg_match2(&pattern_regexp, &package.get_name(), 0).is_some() {
+ if preg_match(&pattern_regexp, &package.get_name()).is_some() {
continue 'outer;
}
}
// update pattern matches a root require? => all good, probably a new package
for (package_name, _constraint) in request.get_requires() {
- if preg_match2(&pattern_regexp, package_name, 0).is_some() {
+ if preg_match(&pattern_regexp, package_name).is_some() {
if PlatformRepository::is_platform_package(package_name) {
matched_platform_package = true;
continue;
diff --git a/crates/shirabe/src/dependency_resolver/problem.rs b/crates/shirabe/src/dependency_resolver/problem.rs
index 867dc3fe..6c1ae8c0 100644
--- a/crates/shirabe/src/dependency_resolver/problem.rs
+++ b/crates/shirabe/src/dependency_resolver/problem.rs
@@ -12,7 +12,7 @@ use crate::repository::RepositorySet;
use indexmap::IndexMap;
use shirabe_php_shim::{
CmpOp, LogicException, PhpMixed, extension_loaded, implode, loosely_compare, php_regex,
- preg_match2, preg_replace, spl_object_hash, sprintf, str_replace, stripos, strpos, strtolower,
+ preg_match, preg_replace, spl_object_hash, sprintf, str_replace, stripos, strpos, strtolower,
substr, substr_count, version_compare,
};
use shirabe_semver::constraint::AnyConstraint;
@@ -223,12 +223,11 @@ impl Problem {
rule_ref.get_reason(),
rule::RULE_PACKAGE_REQUIRES | rule::RULE_PACKAGE_CONFLICT
) {
- preg_match2(
+ preg_match(
php_regex!(
r"{^(?P<package>\S+) (?P<version>\S+) (?P<type>requires|conflicts)}"
),
&message,
- 0,
)
} else {
None
@@ -557,7 +556,7 @@ impl Problem {
if let Some(c) = constraint
&& c.is_constraint()
&& c.get_operator() == Some(CmpOp::Eq)
- && preg_match2(php_regex!(r"{^dev-.*#.*}"), &c.get_pretty_string(), 0).is_some()
+ && preg_match(php_regex!(r"{^dev-.*#.*}"), &c.get_pretty_string()).is_some()
{
let new_constraint = preg_replace(
php_regex!(r"{ +as +([^,\s|]+)$}"),
@@ -991,7 +990,7 @@ impl Problem {
));
}
- if preg_match2(php_regex!(r"{^[A-Za-z0-9_./-]+$}"), package_name, 0).is_none() {
+ if preg_match(php_regex!(r"{^[A-Za-z0-9_./-]+$}"), package_name).is_none() {
let illegal_chars = preg_replace(php_regex!(r"{[A-Za-z0-9_./-]+}"), "", package_name);
return Ok((
@@ -1381,7 +1380,7 @@ impl Problem {
&& c.get_operator() == Some(CmpOp::Eq)
&& !c.get_version().starts_with("dev-")
{
- if preg_match2(php_regex!(r"{^\d+(?:\.\d+)*$}"), &c.get_pretty_string(), 0).is_none() {
+ if preg_match(php_regex!(r"{^\d+(?:\.\d+)*$}"), &c.get_pretty_string()).is_none() {
return format!(" {} (exact version match)", c.get_pretty_string());
}