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.

2 files changed, 3 insertions, 4 deletions

diff --git a/crates/shirabe/src/console/application.rs b/crates/shirabe/src/console/application.rs
index e818823e..43a2597b 100644
--- a/crates/shirabe/src/console/application.rs
+++ b/crates/shirabe/src/console/application.rs
@@ -1790,8 +1790,7 @@ impl Application {
         let mut line = String::new();
 
         let mut offset = 0i64;
-        let mut m: indexmap::IndexMap<shirabe_php_shim::CaptureKey, Option<String>> =
-            indexmap::IndexMap::new();
+        let mut m = shirabe_php_shim::PregMatches::new();
         while preg_match2(
             php_regex!(r"/.{1,10000}/u"),
             &utf8_string,
diff --git a/crates/shirabe/src/console/html_output_formatter.rs b/crates/shirabe/src/console/html_output_formatter.rs
index 2f523c37..3b4018e3 100644
--- a/crates/shirabe/src/console/html_output_formatter.rs
+++ b/crates/shirabe/src/console/html_output_formatter.rs
@@ -1,7 +1,7 @@
 //! ref: composer/src/Composer/Console/HtmlOutputFormatter.php
 
 use indexmap::IndexMap;
-use shirabe_pcre::{CaptureKey, Preg};
+use shirabe_pcre::{CaptureKey, Preg, PregMatchedGroups};
 use shirabe_symfony_console::formatter::OutputFormatter;
 use shirabe_symfony_console::formatter::OutputFormatterInterface;
 use shirabe_symfony_console::formatter::OutputFormatterStyleInterface;
@@ -72,7 +72,7 @@ impl HtmlOutputFormatter {
         )))
     }
 
-    fn format_html(&self, matches: &IndexMap<CaptureKey, String>) -> String {
+    fn format_html(&self, matches: &PregMatchedGroups) -> String {
         let codes_str = matches
             .get(&CaptureKey::ByIndex(1))
             .map(|s| s.as_str())