From 52a0665acbbe5bf5b8c6875118fb9cdf7952453b Mon Sep 17 00:00:00 2001
From: nsfisis <nsfisis@gmail.com>
Date: Mon, 17 Aug 2026 06:43:52 +0900
Subject: refactor(preg): wrap the preg_* $matches maps in newtypes

The five IndexMap shapes that the preg_* functions and Preg fill in are
now distinct types generated by preg_match_map!, so a matches map no
longer interchanges with any other map of the same key and value type.

Index<usize> is kept alongside Index<&Q> because call sites such as
config_command and event_dispatcher reach for a group by its position in
the map rather than by its capture key.
---
 crates/shirabe-symfony-process/src/process.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'crates/shirabe-symfony-process')

diff --git a/crates/shirabe-symfony-process/src/process.rs b/crates/shirabe-symfony-process/src/process.rs
index 045224c5..6fea07c8 100644
--- a/crates/shirabe-symfony-process/src/process.rs
+++ b/crates/shirabe-symfony-process/src/process.rs
@@ -12,8 +12,8 @@ use crate::pipes::windows_pipes::WindowsPipes;
 use crate::process_utils::ProcessUtils;
 use indexmap::IndexMap;
 use shirabe_php_shim::{
-    CaptureKey, Descriptor, PhpMixed, PhpResource, php_regex, preg_match, preg_replace,
-    preg_replace_callback,
+    CaptureKey, Descriptor, PhpMixed, PhpResource, PregMatches, php_regex, preg_match,
+    preg_replace, preg_replace_callback,
 };
 use std::sync::OnceLock;
 
@@ -938,7 +938,7 @@ impl Process {
                 )++
             ) | [^"]*+ )"/x"#
             ),
-            |m: &IndexMap<CaptureKey, Option<String>>| -> anyhow::Result<String> {
+            |m: &PregMatches| -> anyhow::Result<String> {
                 let m0 = m[&CaptureKey::ByIndex(0)].clone().unwrap_or_default();
                 let m1 = m.get(&CaptureKey::ByIndex(1)).cloned().flatten();
                 if m1.is_none() {
@@ -1072,7 +1072,7 @@ impl Process {
     ) -> anyhow::Result<String> {
         preg_replace_callback(
             php_regex!(r#"/"\$\{:([_a-zA-Z]+[_a-zA-Z0-9]*)\}"/"#),
-            |matches: &IndexMap<CaptureKey, Option<String>>| -> anyhow::Result<String> {
+            |matches: &PregMatches| -> anyhow::Result<String> {
                 let key = matches
                     .get(&CaptureKey::ByIndex(1))
                     .cloned()
-- 
cgit v1.3.1-4-g156e