RegexArrayShapeMatcher - Fix matching literal "-" in character classes

Author: staabm

src/Type/Regex/RegexGroupParser.php

@@ -508,7 +508,11 @@ private function getLiteralValue(TreeNode $node, ?array &$onlyLiterals, bool $ap
 		$token = $node->getValueToken();
 		$value = $node->getValueValue();
 
-		if (in_array($token, ['literal', 'escaped_end_class'], true)) {
+		if (
+			in_array($token, ['literal', 'escaped_end_class'], true)
+			// literal "-" in front/back of a character class like '[-a-z]' or '[abc-]', not forming a range
+			|| $token === 'range'
+		) {
 			if (str_contains($patternModifiers, 'x') && trim($value) === '') {
 				return null;
 			}
@@ -517,7 +521,7 @@ private function getLiteralValue(TreeNode $node, ?array &$onlyLiterals, bool $ap
 				return substr($value, 1);
 			} elseif (
 				$appendLiterals
-				&& $token === 'literal'
+				&& in_array($token, ['literal', 'range'], true)
 				&& $onlyLiterals !== null
 				&& !in_array($value, ['.'], true)
 			) {
@@ -533,11 +537,6 @@ private function getLiteralValue(TreeNode $node, ?array &$onlyLiterals, bool $ap
 			return $value;
 		}
 
-		// literal "-" in front/back of a character class like '[-a-z]' or '[abc-]', not forming a range
-		if ($token === 'range') {
-			return $value;
-		}
-
 		// literal "[" or "]" inside character classes '[[]' or '[]]'
 		if (in_array($token, ['class_', '_class_literal'], true)) {
 			return $value;

tests/PHPStan/Analyser/nsrt/preg_match_shapes.php

@@ -699,3 +699,11 @@ function (string $s): void {
 	preg_match('~a|(\d)|(\s)~', $s, $matches);
 	assertType("array{0?: string, 1?: '', 2?: non-empty-string}|array{0?: string, 1?: numeric-string}", $matches);
 };
+
+function bug11490 (string $expression): void {
+	$matches = [];
+
+	if (preg_match('/([-+])?([\d]+)%/', $expression, $matches) === 1) {
+		assertType("array{string, ''|'+'|'-', numeric-string}", $matches);
+	}
+}