From e093b2be1c333e67c96aebb0a5291bea9ae3d6db Mon Sep 17 00:00:00 2001
From: nsfisis <nsfisis@gmail.com>
Date: Tue, 18 Aug 2026 01:57:02 +0900
Subject: 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>
---
 .../src/package/loader/validating_array_loader.rs    | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

(limited to 'crates/shirabe/src/package/loader/validating_array_loader.rs')

diff --git a/crates/shirabe/src/package/loader/validating_array_loader.rs b/crates/shirabe/src/package/loader/validating_array_loader.rs
index 5ac1a929..e893756a 100644
--- a/crates/shirabe/src/package/loader/validating_array_loader.rs
+++ b/crates/shirabe/src/package/loader/validating_array_loader.rs
@@ -10,7 +10,7 @@ use indexmap::IndexMap;
 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, preg_match2, preg_replace, str_replace,
+    json_encode, parse_url, php_regex, php_to_string, preg_match, preg_replace, str_replace,
     strcasecmp, strtolower, strtotime, substr, trigger_error, trim, var_export,
 };
 use shirabe_semver::Intervals;
@@ -73,12 +73,11 @@ impl ValidatingArrayLoader {
             return None;
         }
 
-        if preg_match2(
+        if preg_match(
             php_regex!(
                 "{^[a-z0-9](?:[_.-]?[a-z0-9]++)*+/[a-z0-9](?:(?:[_.]|-{1,2})?[a-z0-9]++)*+$}iD"
             ),
             name,
-            0,
         )
         .is_none()
         {
@@ -102,14 +101,14 @@ impl ValidatingArrayLoader {
             ));
         }
 
-        if preg_match2(php_regex!("{\\.json$}"), name, 0).is_some() {
+        if preg_match(php_regex!("{\\.json$}"), name).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_match2(php_regex!("{[A-Z]}"), name, 0).is_some() {
+        if preg_match(php_regex!("{[A-Z]}"), name).is_some() {
             if is_link {
                 return Some(format!(
                     "{} is invalid, it should not contain uppercase characters. Please use {} instead.",
@@ -143,7 +142,7 @@ impl ValidatingArrayLoader {
             .as_string()
             .unwrap_or("")
             .to_string();
-        if preg_match2(format!("{{^{}$}}u", regex), &value, 0).is_none() {
+        if preg_match(format!("{{^{}$}}u", regex), &value).is_none() {
             let message = format!(
                 "{} : invalid value ({}), must match {}",
                 property, value, regex
@@ -258,7 +257,7 @@ impl ValidatingArrayLoader {
 
             if let Some(regex_str) = regex {
                 let value_str = php_to_string(&value);
-                if preg_match2(format!("{{^{}$}}u", regex_str), &value_str, 0).is_none() {
+                if preg_match(format!("{{^{}$}}u", regex_str), &value_str).is_none() {
                     self.warnings.borrow_mut().push(format!(
                         "{}.{} : invalid value ({}), must match {}",
                         property, key, value_str, regex_str
@@ -1187,8 +1186,7 @@ impl LoaderInterface for ValidatingArrayLoader {
                         self.warnings
                             .borrow_mut()
                             .push(format!("{}.{}", link_type, err));
-                    } else if preg_match2(php_regex!("{^[A-Za-z0-9_./-]+$}"), &package, 0).is_none()
-                    {
+                    } else if preg_match(php_regex!("{^[A-Za-z0-9_./-]+$}"), &package).is_none() {
                         self.errors.borrow_mut().push(format!(
                             "{}.{} : invalid key, package names must be strings containing only [A-Za-z0-9_./-]",
                             link_type, package
@@ -1451,7 +1449,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_match2(php_regex!("{^\\s*-}"), &ref_str, 0).is_some() {
+                    if preg_match(php_regex!("{^\\s*-}"), &ref_str).is_some() {
                         self.errors.borrow_mut().push(format!(
                             "{}.reference : must not start with a \"-\", \"{}\" given",
                             src_type, ref_str
@@ -1460,7 +1458,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_match2(php_regex!("{^\\s*-}"), &url_str, 0).is_some() {
+                    if preg_match(php_regex!("{^\\s*-}"), &url_str).is_some() {
                         self.errors.borrow_mut().push(format!(
                             "{}.url : must not start with a \"-\", \"{}\" given",
                             src_type, url_str
-- 
cgit v1.3.1-4-g156e