diff options
| author | nsfisis <nsfisis@gmail.com> | 2026-08-18 01:57:02 +0900 |
|---|---|---|
| committer | nsfisis <nsfisis@gmail.com> | 2026-08-18 01:57:02 +0900 |
| commit | 34c74255d781ad0a0bf7cc5ad4ec1761bef61e04 (patch) | |
| tree | 6a4c9e11a0d8e98dccf72a5857db73e74722489b /crates/shirabe/src/installer | |
| parent | 844097edf44bf1424d28e2d5fbefda90c1c8f46c (diff) | |
| download | php-shirabe-34c74255d781ad0a0bf7cc5ad4ec1761bef61e04.tar.gz php-shirabe-34c74255d781ad0a0bf7cc5ad4ec1761bef61e04.tar.zst php-shirabe-34c74255d781ad0a0bf7cc5ad4ec1761bef61e04.zip | |
refactor(pcre): drop the two bespoke isMatch variants
is_match_named and is_match_with_indexed_captures reshaped a match into
a name-keyed map or a number-positioned vec, each allocating a String
per group up front for callers that then read one or two of them. Every
one of the eleven call sites ports a plain Preg::isMatch in PHP, so they
now call is_match3 and reach for the group they want through
get(&CaptureKey::ByIndex(N)) / get(&CaptureKey::ByName(..)), the same
way the rest of the tree already reads a match.
Falling out of that: PregNamedGroups existed only to type the first
variant; PregMatches::iter() only to build both; and PregMatches::pattern
only to give iter() the capture names. PregMatches is now a plain
wrapper over regex::Captures, so preg_replace_callback no longer clones
the resolved pattern for every match, and preg_match_map! is internal to
the shim again.
SvnDriver::get_file_content and get_change_date recover the flat
`isMatch(..) && $match[2] !== null` condition the PHP has, which the vec
shape had forced into a nested if.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Diffstat (limited to 'crates/shirabe/src/installer')
| -rw-r--r-- | crates/shirabe/src/installer/binary_installer.rs | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/crates/shirabe/src/installer/binary_installer.rs b/crates/shirabe/src/installer/binary_installer.rs index b382f7c1..1e750439 100644 --- a/crates/shirabe/src/installer/binary_installer.rs +++ b/crates/shirabe/src/installer/binary_installer.rs @@ -316,15 +316,14 @@ impl BinaryInstaller { file_get_contents5(bin, false, PhpMixed::Null, 0, Some(500)).unwrap_or_default(); // For php files, we generate a PHP proxy instead of a shell one, // which allows calling the proxy with a custom php process - if let Some(m) = Preg::is_match_with_indexed_captures( + if let Some(m) = Preg::is_match3( php_regex!(r"{^(#!.*\r?\n)?[\r\n\t ]*<\?php}"), &bin_contents, ) { // carry over the existing shebang if present, otherwise add our own - let proxy_code = if m[1].is_none() { - "#!/usr/bin/env php".to_string() - } else { - trim(m[1].as_deref().unwrap_or(""), None) + let proxy_code = match m.get(&CaptureKey::ByIndex(1)) { + None => "#!/usr/bin/env php".to_string(), + Some(shebang) => trim(shebang, None), }; let bin_path_exported = self .filesystem @@ -370,7 +369,7 @@ impl BinaryInstaller { $data = str_replace('__FILE__', var_export($this->realpath, true), $data);" .to_string(); } - if trim(m[0].as_deref().unwrap_or(""), None) != "<?php" { + if trim(m.get(&CaptureKey::ByIndex(0)).unwrap_or(""), None) != "<?php" { stream_hint = " using a stream wrapper to prevent the shebang from being output on PHP<8\n *" .to_string(); |
