fix numeric string handling

Author: staabm

src/Type/Regex/RegexGroupParser.php

@@ -109,13 +109,20 @@ public function parseGroups(string $regex): ?RegexAstWalkResult
 			$modifiers,
 			RegexGroupWalkResult::createEmpty(),
 		);
-		if ($subjectAsGroupResult->isNonFalsy()->yes() || $subjectAsGroupResult->isNumeric()->yes()) {
-			$astWalkResult = $astWalkResult->withSubjectBaseType(
-				TypeCombinator::intersect(new StringType(), new AccessoryNonFalsyStringType()),
-			);
+
+		// we could handle numeric-string, in case we know the regex is delimited by ^ and $
+		$accessories = [];
+		if ($subjectAsGroupResult->isNonFalsy()->yes()) {
+			$accessories[] = new AccessoryNonFalsyStringType();
 		} elseif ($subjectAsGroupResult->isNonEmpty()->yes()) {
+			$accessories[] = new AccessoryNonEmptyStringType();
+		}
+
+		if ($accessories !== []) {
+			$accessories[] = new StringType();
+
 			$astWalkResult = $astWalkResult->withSubjectBaseType(
-				TypeCombinator::intersect(new StringType(), new AccessoryNonEmptyStringType()),
+				TypeCombinator::intersect(...$accessories),
 			);
 		}
 

tests/PHPStan/Analyser/nsrt/bug11384.php

@@ -14,7 +14,7 @@ class HelloWorld
 	public function sayHello(string $s): void
 	{
 		if (preg_match('{(' . Bar::VAL . ')}', $s, $m)) {
-			assertType("array{non-falsy-string, '3'}", $m);
+			assertType("array{non-empty-string, '3'}", $m);
 		}
 	}
 }

tests/PHPStan/Analyser/nsrt/preg_match_shapes.php

@@ -477,13 +477,13 @@ function bug11323(string $s): void {
 		assertType('array{non-falsy-string, non-falsy-string}', $matches);
 	}
 	if (preg_match('{([[:digit:]])}', $s, $matches)) {
-		assertType('array{non-falsy-string, numeric-string}', $matches);
+		assertType('array{non-empty-string, numeric-string}', $matches);
 	}
 	if (preg_match('{([\d])(\d)}', $s, $matches)) {
 		assertType('array{non-falsy-string, numeric-string, numeric-string}', $matches);
 	}
 	if (preg_match('{([0-9])}', $s, $matches)) {
-		assertType('array{non-falsy-string, numeric-string}', $matches);
+		assertType('array{non-empty-string, numeric-string}', $matches);
 	}
 	if (preg_match('{(\p{L})(\p{P})(\p{Po})}', $s, $matches)) {
 		assertType('array{non-falsy-string, non-empty-string, non-empty-string, non-empty-string}', $matches);
@@ -654,7 +654,7 @@ function (string $s): void {
 
 function (string $s): void {
 	if (preg_match('/( \d+ )/x', $s, $matches)) {
-		assertType('array{non-falsy-string, numeric-string}', $matches);
+		assertType('array{non-empty-string, numeric-string}', $matches);
 	}
 };
 
@@ -792,7 +792,7 @@ function testUnescapeBackslash (string $string): void {
 	if (preg_match(<<<'EOD'
 		~(\d)~
 		EOD, $string, $matches)) {
-		assertType("array{non-falsy-string, numeric-string}", $matches);
+		assertType("array{non-empty-string, numeric-string}", $matches);
 	}
 
 	if (preg_match(<<<'EOD'
@@ -1000,7 +1000,7 @@ function bug12749e(string $str): void
 {
 	// no ^ $ delims, therefore can be anything which contains a number
 	if (preg_match('/[0-9]/', $str, $match)) {
-		assertType('array{non-falsy-string}', $match);
+		assertType('array{non-empty-string}', $match);
 	}
 }
 

tests/PHPStan/Analyser/nsrt/preg_match_shapes_php80.php

@@ -15,7 +15,7 @@ function doOffsetCaptureWithUnmatchedNull(string $s): void {
 function doNonAutoCapturingModifier(string $s): void {
 	if (preg_match('/(?n)(\d+)/', $s, $matches)) {
 		// should be assertType('array{string}', $matches);
-		assertType('array{non-falsy-string, numeric-string}', $matches);
+		assertType('array{non-empty-string, numeric-string}', $matches);
 	}
-	assertType('array{}|array{non-falsy-string, numeric-string}', $matches);
+	assertType('array{}|array{non-empty-string, numeric-string}', $matches);
 }

tests/PHPStan/Analyser/nsrt/preg_match_shapes_php82.php

@@ -8,9 +8,9 @@
 // https://php.watch/versions/8.2/preg-n-no-capture-modifier
 function doNonAutoCapturingFlag(string $s): void {
 	if (preg_match('/(\d+)/n', $s, $matches)) {
-		assertType('array{non-falsy-string}', $matches);
+		assertType('array{non-empty-string}', $matches);
 	}
-	assertType('array{}|array{non-falsy-string}', $matches);
+	assertType('array{}|array{non-empty-string}', $matches);
 
 	if (preg_match('/(\d+)(?P<num>\d+)/n', $s, $matches)) {
 		assertType('array{0: non-falsy-string, num: numeric-string, 1: numeric-string}', $matches);