Merge branch refs/heads/1.12.x into 2.0.x

phpstan · Dec 20, 2024 · fa95faf · fa95faf
2 parents 8fd217a + defd406
commit fa95faf
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/src/Type/Regex/RegexGroupParser.php b/src/Type/Regex/RegexGroupParser.php
@@ -527,7 +527,7 @@ private function isMaybeEmptyNode(TreeNode $node, string $patternModifiers, bool
 			if ($literal !== '' && $literal !== '0') {
 				$isNonFalsy = true;
 			}
-			return false;
+			return $literal === '';
 		}
 
 		foreach ($node->getChildren() as $child) {

diff --git a/tests/PHPStan/Analyser/nsrt/bug-12297.php b/tests/PHPStan/Analyser/nsrt/bug-12297.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Bug12297;
+
+use function PHPStan\Testing\assertType;
+
+function doFoo($s) {
+	if (preg_match('/(^.+)/', $s, $matches) === 1) {
+		assertType('non-empty-string', $matches[1]);
+	}
+
+	if (preg_match('/(.+$)/', $s, $matches) === 1) {
+		assertType('non-empty-string', $matches[1]);
+	}
+
+	if (preg_match('/(^.+$)/', $s, $matches) === 1) {
+		assertType('non-empty-string', $matches[1]);
+	}
+}