Fix regex comment support eating too much chars

phpstan · Dec 17, 2024 · 6bf30fd · 6bf30fd
1 parent c053dbc
commit 6bf30fd
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/src/Type/Regex/RegexGroupParser.php b/src/Type/Regex/RegexGroupParser.php
@@ -74,7 +74,7 @@ public function parseGroups(string $regex): ?array
 
 		if (str_contains($modifiers, 'x')) {
 			// in freespacing mode the # character starts a comment and runs until the end of the line
-			$regex = preg_replace('/[^?]#.*/', '', $regex) ?? '';
+			$regex = preg_replace('/(?<!\?)#.*/', '', $regex) ?? '';
 		}
 
 		$rawRegex = $this->regexExpressionHelper->removeDelimitersAndModifiers($regex);

diff --git a/tests/PHPStan/Analyser/nsrt/bug-12242.php b/tests/PHPStan/Analyser/nsrt/bug-12242.php
@@ -30,3 +30,14 @@ function bar(string $str): void
 		assertType('array{string, non-empty-string, string, string}', $matches);
 	}
 }
+
+function foobar(string $str): void
+{
+	$regexp = '/
+		# (
+		([\d,]*)# a comment immediately behind with a closing parenthesis )
+	/x';
+	if (preg_match($regexp, $str, $match)) {
+		assertType('array{string, string}', $match);
+	}
+}