RegexExpressionHelper - Support all bracket style delimiters

Author: staabm

Diff for: src/Type/Php/RegexArrayShapeMatcher.php

@@ -406,8 +406,9 @@ private function parseGroups(string $regex): ?array
 			return null;
 		}
 
+		$rawRegex = $this->regexExpressionHelper->removeDelimitersAndModifiers($regex);
 		try {
-			$ast = self::$parser->parse($regex);
+			$ast = self::$parser->parse($rawRegex);
 		} catch (Exception) {
 			return null;
 		}

Diff for: 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;
 
@@ -71,23 +72,48 @@ public function resolve(Expr $expr): Type
 
 	public function getPatternModifiers(string $pattern): ?string
 	{
-		$delimiter = $this->getDelimiterFromString(new ConstantStringType($pattern));
-		if ($delimiter === null) {
+		$endDelimiterPos = $this->getEndDelimiterPos($pattern);
+
+		if ($endDelimiterPos === false) {
 			return null;
 		}
 
-		if ($delimiter === '{') {
-			$endDelimiterPos = strrpos($pattern, '}');
-		} else {
-			// same start and end delimiter
-			$endDelimiterPos = strrpos($pattern, $delimiter);
-		}
+		return substr($pattern, $endDelimiterPos + 1);
+	}
+
+	public function removeDelimitersAndModifiers(string $pattern): string
+	{
+		$endDelimiterPos = $this->getEndDelimiterPos($pattern);
 
 		if ($endDelimiterPos === false) {
-			return null;
+			return $pattern;
 		}
 
-		return substr($pattern, $endDelimiterPos + 1);
+		return substr($pattern, 1, $endDelimiterPos - 1);
+	}
+
+	private function getEndDelimiterPos(string $pattern): false|int
+	{
+		$startDelimiter = $this->getPatternDelimiter($pattern);
+		if ($startDelimiter === null) {
+			return false;
+		}
+
+		// delimiter variants, see https://www.php.net/manual/en/regexp.reference.delimiters.php
+		$bracketStyleDelimiters = [
+			'{' => '}',
+			'(' => ')',
+			'[' => ']',
+			'<' => '>',
+		];
+		if (array_key_exists($startDelimiter, $bracketStyleDelimiters)) {
+			$endDelimiterPos = strrpos($pattern, $bracketStyleDelimiters[$startDelimiter]);
+		} else {
+			// same start and end delimiter
+			$endDelimiterPos = strrpos($pattern, $startDelimiter);
+		}
+
+		return $endDelimiterPos;
 	}
 
 	/**
@@ -105,7 +131,7 @@ public function getPatternDelimiters(Concat $concat, Scope $scope): array
 
 		$delimiters = [];
 		foreach ($left->getConstantStrings() as $leftString) {
-			$delimiter = $this->getDelimiterFromString($leftString);
+			$delimiter = $this->getPatternDelimiter($leftString->getValue());
 			if ($delimiter === null) {
 				continue;
 			}
@@ -115,13 +141,13 @@ public function getPatternDelimiters(Concat $concat, Scope $scope): array
 		return $delimiters;
 	}
 
-	private function getDelimiterFromString(ConstantStringType $string): ?string
+	private function getPatternDelimiter(string $regex): ?string
 	{
-		if ($string->getValue() === '') {
+		if ($regex === '') {
 			return null;
 		}
 
-		return substr($string->getValue(), 0, 1);
+		return substr($regex, 0, 1);
 	}
 
 }

Diff for: tests/PHPStan/Analyser/nsrt/preg_match_shapes.php

@@ -29,9 +29,9 @@ function doMatch(string $s): void {
 	assertType('array{}|array{string, non-empty-string}', $matches);
 
 	if (preg_match('(Price: (£|€))i', $s, $matches)) {
-		assertType('array{string, non-empty-string, non-empty-string}', $matches);
+		assertType('array{string, non-empty-string}', $matches);
 	}
-	assertType('array{}|array{string, non-empty-string, non-empty-string}', $matches);
+	assertType('array{}|array{string, non-empty-string}', $matches);
 
 	if (preg_match('_foo(.)\_i_i', $s, $matches)) {
 		assertType('array{string, non-empty-string}', $matches);

Diff for: tests/PHPStan/Analyser/nsrt/preg_match_shapes_php82.php

@@ -22,3 +22,25 @@ 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);
+	}
+};
+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);
+	}
+};