Fix count() narrowing on $matches

phpstan · Jul 3, 2024 · 74d58e4 · 74d58e4
1 parent 0b3e74f
commit 74d58e4
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 2 deletions.
diff --git a/src/Type/Php/RegexArrayShapeMatcher.php b/src/Type/Php/RegexArrayShapeMatcher.php
@@ -114,7 +114,7 @@ private function matchRegex(string $regex, ?int $flags, TrinaryLogic $wasMatched
 			);
 
 			return TypeCombinator::union(
-				new ConstantArrayType([new ConstantIntegerType(0)], [new StringType()]),
+				new ConstantArrayType([new ConstantIntegerType(0)], [new StringType()], [0], [], true),
 				$combiType,
 			);
 		} elseif (
@@ -156,7 +156,7 @@ private function matchRegex(string $regex, ?int $flags, TrinaryLogic $wasMatched
 			}
 
 			if ($isOptionalAlternation) {
-				$combiTypes[] = new ConstantArrayType([new ConstantIntegerType(0)], [new StringType()]);
+				$combiTypes[] = new ConstantArrayType([new ConstantIntegerType(0)], [new StringType()], [0], [], true);
 			}
 
 			return TypeCombinator::union(...$combiTypes);

diff --git a/tests/PHPStan/Analyser/nsrt/preg_match_shapes.php b/tests/PHPStan/Analyser/nsrt/preg_match_shapes.php
@@ -337,3 +337,26 @@ function (string $size): void {
 	assertType('array{0: string, 1: string, 2?: string, 3?: string}', $matches);
 };
 
+
+function bug11277a(string $value): void
+{
+	if (preg_match('/^\[(.+,?)*\]$/', $value, $matches)) {
+		assertType('array{0: string, 1?: string}', $matches);
+		if (count($matches) === 2) {
+			assertType('array{string, string}', $matches);
+		}
+	}
+}
+
+function bug11277b(string $value): void
+{
+	if (preg_match('/^(?:(.+,?)|(x))*$/', $value, $matches)) {
+		assertType('array{0: string, 1?: string, 2?: string}', $matches);
+		if (count($matches) === 2) {
+			assertType('array{string, string}', $matches);
+		}
+		if (count($matches) === 3) {
+			assertType('array{string, string, string}', $matches);
+		}
+	}
+}