RegexArrayShapeMatcher - (\d*) can be empty-string

Author: staabm

src/Type/Php/RegexArrayShapeMatcher.php

@@ -572,16 +572,14 @@ private function createGroupType(TreeNode $group): Type
 
 		$this->walkGroupAst($group, $isNonEmpty, $isNumeric, $inOptionalQuantification);
 
-		$accessories = [];
 		if ($isNumeric->yes()) {
-			$accessories[] = new AccessoryNumericStringType();
+			$result = new IntersectionType([new StringType(), new AccessoryNumericStringType()]);
+			if (!$isNonEmpty->yes()) {
+				return TypeCombinator::union(new ConstantStringType(''), $result);
+			}
+			return $result;
 		} elseif ($isNonEmpty->yes()) {
-			$accessories[] = new AccessoryNonEmptyStringType();
-		}
-
-		if ($accessories !== []) {
-			$accessories[] = new StringType();
-			return new IntersectionType($accessories);
+			return new IntersectionType([new StringType(), new AccessoryNonEmptyStringType()]);
 		}
 
 		return new StringType();

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

@@ -3,6 +3,7 @@
 namespace Bug11311;
 
 use function PHPStan\Testing\assertType;
+use InvalidArgumentException;
 
 function doFoo(string $s) {
 	if (1 === preg_match('/(?<major>\d+)\.(?<minor>\d+)(?:\.(?<patch>\d+))?/', $s, $matches, PREG_UNMATCHED_AS_NULL)) {
@@ -105,7 +106,7 @@ function (string $size): void {
 	if (preg_match('/ab(\d+)e(\d?)/', $size, $matches, PREG_UNMATCHED_AS_NULL) !== 1) {
 		throw new InvalidArgumentException(sprintf('Invalid size "%s"', $size));
 	}
-	assertType('array{string, numeric-string, numeric-string}', $matches);
+	assertType("array{string, numeric-string, ''|numeric-string}", $matches);
 };
 
 function (string $size): void {
@@ -187,3 +188,13 @@ function (string $s): void {
 		assertType('array{0: string, whitespace: string, 1: string, value: string, 2: string}', $matches);
 	}
 };
+
+function (string $s): void {
+	preg_match('/%a(\d*)/', $s, $matches, PREG_UNMATCHED_AS_NULL);
+	assertType("array{0?: string, 1?: ''|numeric-string|null}", $matches); // could be array{0?: string, 1?: ''|numeric-string}
+};
+
+function (string $s): void {
+	preg_match('/%a(\d*)?/', $s, $matches, PREG_UNMATCHED_AS_NULL);
+	assertType("array{0?: string, 1?: ''|numeric-string|null}", $matches); // could be array{0?: string, 1?: ''|numeric-string}
+};

tests/PHPStan/Analyser/nsrt/preg_match_shapes.php

@@ -3,7 +3,7 @@
 namespace PregMatchShapes;
 
 use function PHPStan\Testing\assertType;
-
+use InvalidArgumentException;
 
 function doMatch(string $s): void {
 	if (preg_match('/Price: /i', $s, $matches)) {
@@ -519,3 +519,9 @@ function bug11323(string $s): void {
 		assertType('array{string, non-empty-string}', $matches);
 	}
 }
+
+function (string $s): void {
+	preg_match('/%a(\d*)/', $s, $matches);
+	assertType("array{0?: string, 1?: ''|numeric-string}", $matches);
+};
+