Merge branch refs/heads/1.12.x into 2.0.x

src/Type/Regex/RegexGroupParser.php

@@ -23,6 +23,7 @@
 use function count;
 use function in_array;
 use function is_int;
+use function preg_replace;
 use function rtrim;
 use function sscanf;
 use function str_contains;
@@ -64,20 +65,25 @@ public function parseGroups(string $regex): ?array
 			return null;
 		}
 
-		$rawRegex = $this->regexExpressionHelper->removeDelimitersAndModifiers($regex);
-		try {
-			$ast = self::$parser->parse($rawRegex);
-		} catch (Exception) {
-			return null;
-		}
-
 		$modifiers = $this->regexExpressionHelper->getPatternModifiers($regex) ?? '';
 		foreach (self::NOT_SUPPORTED_MODIFIERS as $notSupportedModifier) {
 			if (str_contains($modifiers, $notSupportedModifier)) {
 				return null;
 			}
 		}
 
+		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) ?? '';
+		}
+
+		$rawRegex = $this->regexExpressionHelper->removeDelimitersAndModifiers($regex);
+		try {
+			$ast = self::$parser->parse($rawRegex);
+		} catch (Exception) {
+			return null;
+		}
+
 		$captureOnlyNamed = false;
 		if ($this->phpVersion->supportsPregCaptureOnlyNamedGroups()) {
 			$captureOnlyNamed = str_contains($modifiers, 'n');

tests/PHPStan/Analyser/nsrt/bug-12242.php

@@ -0,0 +1,32 @@
+<?php // lint >= 7.4
+
+namespace Bug12242;
+
+use function PHPStan\Testing\assertType;
+
+function foo(string $str): void
+{
+	$regexp = '/
+		# (
+		([\d,]*)
+		# )
+	/x';
+	if (preg_match($regexp, $str, $match)) {
+		assertType('array{string, string}', $match);
+	}
+}
+
+function bar(string $str): void
+{
+	$regexp = '/^
+            (\w+)        # column type [1]
+            [\(]         # (
+                ?([\d,]*)  # size or size, precision [2]
+            [\)]         # )
+            ?\s*         # whitespace
+            (\w*)        # extra description (UNSIGNED, CHARACTER SET, ...) [3]
+        $/x';
+	if (preg_match($regexp, $str, $matches)) {
+		assertType('array{string, non-empty-string, string, string}', $matches);
+	}
+}