aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe-external-packages/src/symfony/console/input
diff options
context:
space:
mode:
authornsfisis <nsfisis@gmail.com>2026-06-14 13:02:59 +0900
committernsfisis <nsfisis@gmail.com>2026-06-14 13:02:59 +0900
commitcfd2a4488797ddaabd0087aa0021b26892663ffb (patch)
treeed2c030dded78355e0721d5458c2c6b12a3c2f2c /crates/shirabe-external-packages/src/symfony/console/input
parentc1070afe69f53b621adea232527080d2c922e1a9 (diff)
downloadphp-shirabe-cfd2a4488797ddaabd0087aa0021b26892663ffb.tar.gz
php-shirabe-cfd2a4488797ddaabd0087aa0021b26892663ffb.tar.zst
php-shirabe-cfd2a4488797ddaabd0087aa0021b26892663ffb.zip
refactor(pcre): treat regex compile failure as fatal in shim
The preg_* shim helpers wrapped their results in Option/Result solely to signal a regex that failed to compile. Composer never feeds a pattern that fails at runtime, so such a failure is a programming error: panic instead and drop the Option/Result wrappers, updating all callers. preg_replace_callback keeps its Result return type since the callback itself is fallible. preg_match_groups is removed in favor of preg_match at its sole call site. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Diffstat (limited to 'crates/shirabe-external-packages/src/symfony/console/input')
-rw-r--r--crates/shirabe-external-packages/src/symfony/console/input/argv_input.rs9
-rw-r--r--crates/shirabe-external-packages/src/symfony/console/input/input_option.rs2
-rw-r--r--crates/shirabe-external-packages/src/symfony/console/input/string_input.rs13
3 files changed, 11 insertions, 13 deletions
diff --git a/crates/shirabe-external-packages/src/symfony/console/input/argv_input.rs b/crates/shirabe-external-packages/src/symfony/console/input/argv_input.rs
index ea36e26..2b1102c 100644
--- a/crates/shirabe-external-packages/src/symfony/console/input/argv_input.rs
+++ b/crates/shirabe-external-packages/src/symfony/console/input/argv_input.rs
@@ -528,8 +528,13 @@ impl ArgvInput {
.tokens
.iter()
.map(|token| {
- if let Some(m) = shirabe_php_shim::preg_match_groups("{^(-[^=]+=)(.+)}", token) {
- return format!("{}{}", m[1], self.inner.escape_token(&m[2]));
+ let mut r#match: Vec<Option<String>> = Vec::new();
+ if shirabe_php_shim::preg_match("{^(-[^=]+=)(.+)}", token, &mut r#match) != 0 {
+ return format!(
+ "{}{}",
+ r#match[1].as_deref().unwrap_or(""),
+ self.inner.escape_token(r#match[2].as_deref().unwrap_or(""))
+ );
}
if !token.is_empty() && token.as_bytes()[0] != b'-' {
diff --git a/crates/shirabe-external-packages/src/symfony/console/input/input_option.rs b/crates/shirabe-external-packages/src/symfony/console/input/input_option.rs
index 7e2d086..5ef265e 100644
--- a/crates/shirabe-external-packages/src/symfony/console/input/input_option.rs
+++ b/crates/shirabe-external-packages/src/symfony/console/input/input_option.rs
@@ -110,7 +110,7 @@ impl InputOption {
fn normalize_shortcut(s: String) -> anyhow::Result<Option<String>> {
let stripped = shirabe_php_shim::ltrim(&s, Some("-"));
- let parts = shirabe_php_shim::preg_split(r"\|(-?)", &stripped).unwrap_or_default();
+ let parts = shirabe_php_shim::preg_split(r"\|(-?)", &stripped);
let filtered: Vec<String> =
shirabe_php_shim::array_filter(&parts, |s: &String| !s.is_empty());
let result = shirabe_php_shim::implode("|", &filtered);
diff --git a/crates/shirabe-external-packages/src/symfony/console/input/string_input.rs b/crates/shirabe-external-packages/src/symfony/console/input/string_input.rs
index 952a18e..f57fcf6 100644
--- a/crates/shirabe-external-packages/src/symfony/console/input/string_input.rs
+++ b/crates/shirabe-external-packages/src/symfony/console/input/string_input.rs
@@ -56,7 +56,6 @@ impl StringInput {
let mut m: IndexMap<CaptureKey, Option<String>> = IndexMap::new();
if shirabe_php_shim::preg_match2(r"/\s+/A", input, Some(&mut m), 0, cursor as usize)
- .expect("invalid regex")
== 1
{
if token.is_some() {
@@ -70,9 +69,7 @@ impl StringInput {
Some(&mut m),
0,
cursor as usize,
- )
- .expect("invalid regex")
- == 1
+ ) == 1
{
let inner = shirabe_php_shim::substr(
m[&CaptureKey::ByIndex(3)].as_deref().unwrap_or(""),
@@ -96,9 +93,7 @@ impl StringInput {
Some(&mut m),
0,
cursor as usize,
- )
- .expect("invalid regex")
- == 1
+ ) == 1
{
token = Some(format!(
"{}{}",
@@ -117,9 +112,7 @@ impl StringInput {
Some(&mut m),
0,
cursor as usize,
- )
- .expect("invalid regex")
- == 1
+ ) == 1
{
token = Some(format!(
"{}{}",