RegexExpressionHelper - Support all bracket style delimiters

Author: staabm

src/Type/Php/RegexExpressionHelper.php

@@ -10,6 +10,7 @@
 use PHPStan\Type\Constant\ConstantStringType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeCombinator;
+use function array_key_exists;
 use function strrpos;
 use function substr;
 
@@ -76,8 +77,15 @@ public function getPatternModifiers(string $pattern): ?string
 			return null;
 		}
 
-		if ($delimiter === '{') {
-			$endDelimiterPos = strrpos($pattern, '}');
+		// delimiter variants, see https://www.php.net/manual/en/regexp.reference.delimiters.php
+		$bracketStyleDelimiters = [
+			'{' => '}',
+			'(' => ')',
+			'[' => ']',
+			'<' => '>',
+		];
+		if (array_key_exists($delimiter, $bracketStyleDelimiters)) {
+			$endDelimiterPos = strrpos($pattern, $bracketStyleDelimiters[$delimiter]);
 		} else {
 			// same start and end delimiter
 			$endDelimiterPos = strrpos($pattern, $delimiter);

tests/PHPStan/Analyser/nsrt/preg_match_shapes_php82.php

@@ -22,3 +22,20 @@ function doNonAutoCapturingFlag(string $s): void {
 	}
 	assertType('array{}|array{0: string, num: numeric-string, 1: numeric-string}', $matches);
 }
+
+// delimiter variants, see https://www.php.net/manual/en/regexp.reference.delimiters.php
+function (string $s): void {
+	if (preg_match('{(\d+)(?P<num>\d+)}n', $s, $matches)) {
+		assertType('array{0: string, num: numeric-string, 1: numeric-string}', $matches);
+	}
+};
+function (string $s): void {
+	if (preg_match('<(\d+)(?P<num>\d+)>n', $s, $matches)) {
+		assertType('array{0: string, num: numeric-string, 1: numeric-string}', $matches);
+	}
+};
+function (string $s): void {
+	if (preg_match('((\d+)(?P<num>\d+))n', $s, $matches)) {
+		assertType('array{0: string, num: numeric-string, 1: numeric-string}', $matches);
+	}
+};