add empty subexpression grammar and tests

phpstan · Sep 27, 2024 · d79f280 · d79f280
1 parent 6390d8d
commit d79f280
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 5 deletions.
diff --git a/resources/RegexGrammar.pp b/resources/RegexGrammar.pp
@@ -135,7 +135,7 @@
     alternation()
 
 alternation:
-    concatenation() ( ::alternation:: concatenation() #alternation )*
+    concatenation()? ( <alternation> concatenation()? #alternation )*
 
 concatenation:
     (   internal_options() | assertion() | quantification() | condition() )
@@ -154,8 +154,8 @@
         <index>
       | ::assertion_reference_:: alternation() #assertioncondition
     )
-    ::_capturing:: concatenation()?
-    ( ::alternation:: concatenation()? )?
+    ::_capturing::
+    alternation()
     ::_capturing::
 
 assertion:
@@ -165,7 +165,8 @@
       | ::lookbehind_::          #lookbehind
       | ::negative_lookbehind_:: #negativelookbehind
     )
-    alternation() ::_capturing::
+    alternation()
+    ::_capturing::
 
 quantification:
     ( class() | simple() ) ( quantifier() #quantification )?
@@ -208,7 +209,8 @@
       | ::atomic_group_:: #atomicgroup
       | ::capturing_::
     )
-    alternation() ::_capturing::
+    alternation()
+    ::_capturing::
 
 non_capturing_internal_options:
     <non_capturing_internal_option>

diff --git a/tests/PHPStan/Analyser/nsrt/preg_match_shapes.php b/tests/PHPStan/Analyser/nsrt/preg_match_shapes.php
@@ -899,3 +899,45 @@ function bugUnescapedDashAfterRange (string $string): void {
 		assertType("array{string, non-empty-string}", $matches);
 	}
 }
+
+function bugEmptySubexpression (string $string): void {
+	if (preg_match('//', $string, $matches)) {
+		assertType("array{string}", $matches); // could be array{''}
+	}
+
+	if (preg_match('/()/', $string, $matches)) {
+		assertType("array{string, string}", $matches); // could be array{'', ''}
+	}
+
+	if (preg_match('/|/', $string, $matches)) {
+		assertType("array{string}", $matches); // could be array{''}
+	}
+
+	if (preg_match('~|(a)~', $string, $matches)) {
+		assertType("array{0: string, 1?: 'a'}", $matches);
+	}
+
+	if (preg_match('~(a)|~', $string, $matches)) {
+		assertType("array{0: string, 1?: 'a'}", $matches);
+	}
+
+	if (preg_match('~(a)||(b)~', $string, $matches)) {
+		assertType("array{0: string, 1?: 'a'}|array{string, '', 'b'}", $matches);
+	}
+
+	if (preg_match('~(|(a))~', $string, $matches)) {
+		assertType("array{0: string, 1: ''|'a', 2?: 'a'}", $matches);
+	}
+
+	if (preg_match('~((a)|)~', $string, $matches)) {
+		assertType("array{0: string, 1: ''|'a', 2?: 'a'}", $matches);
+	}
+
+	if (preg_match('~((a)||(b))~', $string, $matches)) {
+		assertType("array{0: string, 1: ''|'a'|'b', 2?: ''|'a', 3?: 'b'}", $matches);
+	}
+
+	if (preg_match('~((a)|()|(b))~', $string, $matches)) {
+		assertType("array{0: string, 1: string, 2?: ''|'a', 3?: string, 4?: 'b'}", $matches);
+	}
+}