RegexArrayShapeMatcher - Fix PREG_UNMATCHED_AS_NULL with top level al…

…ternation
phpstan · Jul 15, 2024 · b116e71 · b116e71
1 parent 7d3be58
commit b116e71
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/src/Type/Php/RegexArrayShapeMatcher.php b/src/Type/Php/RegexArrayShapeMatcher.php
@@ -170,7 +170,7 @@ private function matchRegex(string $regex, ?int $flags, TrinaryLogic $wasMatched
 						$beforeCurrentCombo = false;
 					} elseif ($beforeCurrentCombo && !$group->resetsGroupCounter()) {
 						$group->forceNonOptional();
-					} elseif ($group->getAlternationId() === $onlyTopLevelAlternationId) {
+					} elseif ($group->getAlternationId() === $onlyTopLevelAlternationId && !$this->containsUnmatchedAsNull($flags ?? 0)) {
 						unset($comboList[$groupId]);
 					}
 				}
@@ -191,7 +191,7 @@ private function matchRegex(string $regex, ?int $flags, TrinaryLogic $wasMatched
 				}
 			}
 
-			if ($isOptionalAlternation) {
+			if ($isOptionalAlternation && !$this->containsUnmatchedAsNull($flags ?? 0)) {
 				$combiTypes[] = new ConstantArrayType([new ConstantIntegerType(0)], [new StringType()], [0], [], true);
 			}
 

diff --git a/tests/PHPStan/Analyser/nsrt/bug-11311.php b/tests/PHPStan/Analyser/nsrt/bug-11311.php
@@ -65,3 +65,17 @@ function bug11331c(string $url):void {
 		assertType('array{string, string|null, string|null, string, string}', $matches);
 	}
 }
+
+class UnmatchedAsNullWithTopLevelAlternation {
+	function doFoo(string $s): void {
+		if (preg_match('/Price: (?:(£)|(€))\d+/', $s, $matches, PREG_UNMATCHED_AS_NULL)) {
+			assertType('array{string, string|null, string|null}', $matches); // could be array{0: string, 1: null, 2: string}|array{0: string, 1: string, 2: null}
+		}
+	}
+
+	function doBar(string $s): void {
+		if (preg_match('/Price: (?:(£)|(€))?\d+/', $s, $matches, PREG_UNMATCHED_AS_NULL)) {
+			assertType('array{string, string|null, string|null}', $matches);
+		}
+	}
+}