fix

Author: staabm

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

@@ -9,21 +9,21 @@ class HelloWorld
 	public function sayHello(string $s): void
 	{
 		if (preg_match('/data-(\d{6})\.json$/', $s, $matches) > 0) {
-			assertType('array{string, non-falsy-string&numeric-string}', $matches);
+			assertType('array{non-falsy-string, non-falsy-string&numeric-string}', $matches);
 		}
 	}
 
 	public function sayHello2(string $s): void
 	{
 		if (preg_match('/data-(\d{6})\.json$/', $s, $matches) === 1) {
-			assertType('array{string, non-falsy-string&numeric-string}', $matches);
+			assertType('array{non-falsy-string, non-falsy-string&numeric-string}', $matches);
 		}
 	}
 
 	public function sayHello3(string $s): void
 	{
 		if (preg_match('/data-(\d{6})\.json$/', $s, $matches) >= 1) {
-			assertType('array{string, non-falsy-string&numeric-string}', $matches);
+			assertType('array{non-falsy-string, non-falsy-string&numeric-string}', $matches);
 		}
 	}
 
@@ -35,7 +35,7 @@ public function sayHello4(string $s): void
 			return;
 		}
 
-		assertType('array{string, non-falsy-string&numeric-string}', $matches);
+		assertType('array{non-falsy-string, non-falsy-string&numeric-string}', $matches);
 	}
 
 	public function sayHello5(string $s): void
@@ -46,7 +46,7 @@ public function sayHello5(string $s): void
 			return;
 		}
 
-		assertType('array{string, non-falsy-string&numeric-string}', $matches);
+		assertType('array{non-falsy-string, non-falsy-string&numeric-string}', $matches);
 	}
 
 	public function sayHello6(string $s): void
@@ -57,6 +57,6 @@ public function sayHello6(string $s): void
 			return;
 		}
 
-		assertType('array{string, non-falsy-string&numeric-string}', $matches);
+		assertType('array{non-falsy-string, non-falsy-string&numeric-string}', $matches);
 	}
 }

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

@@ -10,7 +10,7 @@ public function bad(string $in): void
 	{
 		$matches = [];
 		if (preg_match('~^/xxx/([\w\-]+)/?([\w\-]+)?/?$~', $in, $matches)) {
-			assertType('array{0: string, 1: non-empty-string, 2?: non-empty-string}', $matches);
+			assertType('array{0: non-falsy-string, 1: non-empty-string, 2?: non-empty-string}', $matches);
 		}
 	}
 
@@ -19,7 +19,7 @@ public function bad2(string $in): void
 		$matches = [];
 		$result = preg_match('~^/xxx/([\w\-]+)/?([\w\-]+)?/?$~', $in, $matches);
 		if ($result) {
-			assertType('array{0: string, 1: non-empty-string, 2?: non-empty-string}', $matches);
+			assertType('array{0: non-falsy-string, 1: non-empty-string, 2?: non-empty-string}', $matches);
 		}
 	}
 
@@ -28,7 +28,7 @@ public function bad3(string $in): void
 		$result = preg_match('~^/xxx/([\w\-]+)/?([\w\-]+)?/?$~', $in, $matches);
 		assertType('array{0?: string, 1?: non-empty-string, 2?: non-empty-string}', $matches);
 		if ($result) {
-			assertType('array{0: string, 1: non-empty-string, 2?: non-empty-string}', $matches);
+			assertType('array{0: non-falsy-string, 1: non-empty-string, 2?: non-empty-string}', $matches);
 		}
 	}
 

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

@@ -8,20 +8,20 @@
 
 function bug12210a(string $text): void {
 	assert(preg_match('(((sum|min|max)))', $text, $match) === 1);
-	assertType("array{string, 'max'|'min'|'sum', 'max'|'min'|'sum'}", $match);
+	assertType("array{non-empty-string, 'max'|'min'|'sum', 'max'|'min'|'sum'}", $match);
 }
 
 function bug12210b(string $text): void {
 	assert(preg_match('(((sum|min|ma.)))', $text, $match) === 1);
-	assertType("array{string, non-empty-string, non-falsy-string}", $match);
+	assertType("array{non-empty-string, non-empty-string, non-falsy-string}", $match);
 }
 
 function bug12210c(string $text): void {
 	assert(preg_match('(((su.|min|max)))', $text, $match) === 1);
-	assertType("array{string, non-empty-string, non-falsy-string}", $match);
+	assertType("array{non-empty-string, non-empty-string, non-falsy-string}", $match);
 }
 
 function bug12210d(string $text): void {
 	assert(preg_match('(((sum|mi.|max)))', $text, $match) === 1);
-	assertType("array{string, non-empty-string, non-falsy-string}", $match);
+	assertType("array{non-empty-string, non-empty-string, non-falsy-string}", $match);
 }

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

@@ -27,7 +27,7 @@ function bar(string $str): void
             (\w*)        # extra description (UNSIGNED, CHARACTER SET, ...) [3]
         $/x';
 	if (preg_match($regexp, $str, $matches)) {
-		assertType('array{string, non-empty-string, string, string}', $matches);
+		assertType('array{non-falsy-string, non-empty-string, string, string}', $matches);
 	}
 }
 

tests/PHPStan/Analyser/nsrt/preg_match_shapes_php80.php

@@ -7,15 +7,15 @@
 function doOffsetCaptureWithUnmatchedNull(string $s): void {
 	// see https://3v4l.org/07rBO#v8.2.9
 	if (preg_match('/(foo)(bar)(baz)/', $s, $matches, PREG_OFFSET_CAPTURE|PREG_UNMATCHED_AS_NULL)) {
-		assertType("array{array{string|null, int<-1, max>}, array{'foo'|null, int<-1, max>}, array{'bar'|null, int<-1, max>}, array{'baz'|null, int<-1, max>}}", $matches);
+		assertType("array{array{non-falsy-string|null, int<-1, max>}, array{'foo'|null, int<-1, max>}, array{'bar'|null, int<-1, max>}, array{'baz'|null, int<-1, max>}}", $matches);
 	}
-	assertType("array{}|array{array{string|null, int<-1, max>}, array{'foo'|null, int<-1, max>}, array{'bar'|null, int<-1, max>}, array{'baz'|null, int<-1, max>}}", $matches);
+	assertType("array{}|array{array{non-falsy-string|null, int<-1, max>}, array{'foo'|null, int<-1, max>}, array{'bar'|null, int<-1, max>}, array{'baz'|null, int<-1, max>}}", $matches);
 }
 
 function doNonAutoCapturingModifier(string $s): void {
 	if (preg_match('/(?n)(\d+)/', $s, $matches)) {
 		// should be assertType('array{string}', $matches);
-		assertType('array{string, numeric-string}', $matches);
+		assertType('array{non-falsy-string, numeric-string}', $matches);
 	}
-	assertType('array{}|array{string, numeric-string}', $matches);
+	assertType('array{}|array{non-falsy-string, numeric-string}', $matches);
 }