From 79b504e55cd4c4d1da102c3a076dc2a2e1edcd65 Mon Sep 17 00:00:00 2001
From: nsfisis <nsfisis@gmail.com>
Date: Mon, 17 Aug 2026 08:05:42 +0900
Subject: refactor(pcre): return the Preg $matches instead of filling an
 out-param

`Composer\Pcre\Preg` fills `$matches` through a by-ref parameter, and the
port mirrored that with a `&mut` (or `Option<&mut>`) out-param plus a
bool or count return. Callers had to declare an empty map one line ahead
of the call, and the type never said the map is only meaningful when the
call matched. Return the matches instead:

- match3/match4/is_match3/is_match4 -> Option<PregMatchedGroups>
- is_match_named -> Option<PregNamedGroups>
- match_all2/is_match_all -> PregMatchesAll
- is_match_all_with_offsets3 -> PregMatchesAllWithOffsets

Nothing is lost: the bool is `Option::is_some()`, and the occurrence
count is the length of any one column of a PREG_PATTERN_ORDER map, now
spelled `PregMatchesAll::occurrence_count()`. is_match() still answers
the bool question directly for callers that want no groups.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
---
 crates/shirabe/src/platform/version.rs | 26 +++++++-------------------
 1 file changed, 7 insertions(+), 19 deletions(-)

(limited to 'crates/shirabe/src/platform/version.rs')

diff --git a/crates/shirabe/src/platform/version.rs b/crates/shirabe/src/platform/version.rs
index 2bcb4c38..b89d052b 100644
--- a/crates/shirabe/src/platform/version.rs
+++ b/crates/shirabe/src/platform/version.rs
@@ -1,6 +1,6 @@
 //! ref: composer/src/Composer/Platform/Version.php
 
-use shirabe_pcre::{CaptureKey, Preg, PregMatchedGroups};
+use shirabe_pcre::{CaptureKey, Preg};
 use shirabe_php_shim::{CmpOp, php_regex, version_compare};
 
 pub struct Version;
@@ -9,16 +9,12 @@ impl Version {
     pub fn parse_openssl(openssl_version: &str, is_fips: &mut bool) -> Option<String> {
         *is_fips = false;
 
-        let mut matches = PregMatchedGroups::new();
-        if !Preg::match3(
+        let matches = Preg::match3(
             php_regex!(
                 r"/^(?P<version>[0-9.]+)(?P<patch>[a-z]{0,2})(?P<suffix>(?:-?(?:dev|pre|alpha|beta|rc|fips)[\d]*)*)(?:-\w+)?(?: \(.+?\))?$/"
             ),
             openssl_version,
-            Some(&mut matches),
-        ) {
-            return None;
-        }
+        )?;
 
         let version = matches
             .get(&CaptureKey::ByName("version".to_string()))
@@ -55,14 +51,10 @@ impl Version {
     }
 
     pub fn parse_libjpeg(libjpeg_version: &str) -> Option<String> {
-        let mut matches = PregMatchedGroups::new();
-        if !Preg::match3(
+        let matches = Preg::match3(
             php_regex!(r"/^(?P<major>\d+)(?P<minor>[a-z]*)$/"),
             libjpeg_version,
-            Some(&mut matches),
-        ) {
-            return None;
-        }
+        )?;
 
         let major = matches
             .get(&CaptureKey::ByName("major".to_string()))
@@ -80,14 +72,10 @@ impl Version {
     }
 
     pub fn parse_zoneinfo_version(zoneinfo_version: &str) -> Option<String> {
-        let mut matches = PregMatchedGroups::new();
-        if !Preg::match3(
+        let matches = Preg::match3(
             php_regex!(r"/^(?P<year>\d{4})(?P<revision>[a-z]*)$/"),
             zoneinfo_version,
-            Some(&mut matches),
-        ) {
-            return None;
-        }
+        )?;
 
         let year = matches
             .get(&CaptureKey::ByName("year".to_string()))
-- 
cgit v1.3.1-4-g156e