fix

staabm · staabm · commit eb79c5c14f34 · 2025-03-22T12:45:53.000+01:00
diff --git a/tests/PHPStan/Analyser/nsrt/bug-11293.php b/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);
 	}
 }
diff --git a/tests/PHPStan/Analyser/nsrt/bug-11580.php b/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);
 		}
 	}
 
diff --git a/tests/PHPStan/Analyser/nsrt/bug-12210.php b/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);
 }
diff --git a/tests/PHPStan/Analyser/nsrt/bug-12242.php b/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);
 	}
 }
 
diff --git a/tests/PHPStan/Analyser/nsrt/preg_match_shapes_php80.php b/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);
 }

Original file line number	Diff line number	Diff line change
`@@ -9,21 +9,21 @@ class HelloWorld`
`9`	`9`	`public function sayHello(string $s): void`
`10`	`10`	`{`
`11`	`11`	`if (preg_match('/data-(\d{6})\.json$/', $s, $matches) > 0) {`
`12`		`- assertType('array{string, non-falsy-string&numeric-string}', $matches);`
	`12`	`+ assertType('array{non-falsy-string, non-falsy-string&numeric-string}', $matches);`
`13`	`13`	`}`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`public function sayHello2(string $s): void`
`17`	`17`	`{`
`18`	`18`	`if (preg_match('/data-(\d{6})\.json$/', $s, $matches) === 1) {`
`19`		`- assertType('array{string, non-falsy-string&numeric-string}', $matches);`
	`19`	`+ assertType('array{non-falsy-string, non-falsy-string&numeric-string}', $matches);`
`20`	`20`	`}`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`public function sayHello3(string $s): void`
`24`	`24`	`{`
`25`	`25`	`if (preg_match('/data-(\d{6})\.json$/', $s, $matches) >= 1) {`
`26`		`- assertType('array{string, non-falsy-string&numeric-string}', $matches);`
	`26`	`+ assertType('array{non-falsy-string, non-falsy-string&numeric-string}', $matches);`
`27`	`27`	`}`
`28`	`28`	`}`
`29`	`29`
`@@ -35,7 +35,7 @@ public function sayHello4(string $s): void`
`35`	`35`	`return;`
`36`	`36`	`}`
`37`	`37`
`38`		`- assertType('array{string, non-falsy-string&numeric-string}', $matches);`
	`38`	`+ assertType('array{non-falsy-string, non-falsy-string&numeric-string}', $matches);`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`public function sayHello5(string $s): void`
`@@ -46,7 +46,7 @@ public function sayHello5(string $s): void`
`46`	`46`	`return;`
`47`	`47`	`}`
`48`	`48`
`49`		`- assertType('array{string, non-falsy-string&numeric-string}', $matches);`
	`49`	`+ assertType('array{non-falsy-string, non-falsy-string&numeric-string}', $matches);`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`public function sayHello6(string $s): void`
`@@ -57,6 +57,6 @@ public function sayHello6(string $s): void`
`57`	`57`	`return;`
`58`	`58`	`}`
`59`	`59`
`60`		`- assertType('array{string, non-falsy-string&numeric-string}', $matches);`
	`60`	`+ assertType('array{non-falsy-string, non-falsy-string&numeric-string}', $matches);`
`61`	`61`	`}`
`62`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ public function bad(string $in): void`
`10`	`10`	`{`
`11`	`11`	`$matches = [];`
`12`	`12`	`if (preg_match('~^/xxx/([\w\-]+)/?([\w\-]+)?/?$~', $in, $matches)) {`
`13`		`- assertType('array{0: string, 1: non-empty-string, 2?: non-empty-string}', $matches);`
	`13`	`+ assertType('array{0: non-falsy-string, 1: non-empty-string, 2?: non-empty-string}', $matches);`
`14`	`14`	`}`
`15`	`15`	`}`
`16`	`16`
`@@ -19,7 +19,7 @@ public function bad2(string $in): void`
`19`	`19`	`$matches = [];`
`20`	`20`	`$result = preg_match('~^/xxx/([\w\-]+)/?([\w\-]+)?/?$~', $in, $matches);`
`21`	`21`	`if ($result) {`
`22`		`- assertType('array{0: string, 1: non-empty-string, 2?: non-empty-string}', $matches);`
	`22`	`+ assertType('array{0: non-falsy-string, 1: non-empty-string, 2?: non-empty-string}', $matches);`
`23`	`23`	`}`
`24`	`24`	`}`
`25`	`25`
`@@ -28,7 +28,7 @@ public function bad3(string $in): void`
`28`	`28`	`$result = preg_match('~^/xxx/([\w\-]+)/?([\w\-]+)?/?$~', $in, $matches);`
`29`	`29`	`assertType('array{0?: string, 1?: non-empty-string, 2?: non-empty-string}', $matches);`
`30`	`30`	`if ($result) {`
`31`		`- assertType('array{0: string, 1: non-empty-string, 2?: non-empty-string}', $matches);`
	`31`	`+ assertType('array{0: non-falsy-string, 1: non-empty-string, 2?: non-empty-string}', $matches);`
`32`	`32`	`}`
`33`	`33`	`}`
`34`	`34`
Original file line number	Diff line number	Diff line change
`@@ -8,20 +8,20 @@`
`8`	`8`
`9`	`9`	`function bug12210a(string $text): void {`
`10`	`10`	`assert(preg_match('(((sum\|min\|max)))', $text, $match) === 1);`
`11`		`- assertType("array{string, 'max'\|'min'\|'sum', 'max'\|'min'\|'sum'}", $match);`
	`11`	`+ assertType("array{non-empty-string, 'max'\|'min'\|'sum', 'max'\|'min'\|'sum'}", $match);`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`function bug12210b(string $text): void {`
`15`	`15`	`assert(preg_match('(((sum\|min\|ma.)))', $text, $match) === 1);`
`16`		`- assertType("array{string, non-empty-string, non-falsy-string}", $match);`
	`16`	`+ assertType("array{non-empty-string, non-empty-string, non-falsy-string}", $match);`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`function bug12210c(string $text): void {`
`20`	`20`	`assert(preg_match('(((su.\|min\|max)))', $text, $match) === 1);`
`21`		`- assertType("array{string, non-empty-string, non-falsy-string}", $match);`
	`21`	`+ assertType("array{non-empty-string, non-empty-string, non-falsy-string}", $match);`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`function bug12210d(string $text): void {`
`25`	`25`	`assert(preg_match('(((sum\|mi.\|max)))', $text, $match) === 1);`
`26`		`- assertType("array{string, non-empty-string, non-falsy-string}", $match);`
	`26`	`+ assertType("array{non-empty-string, non-empty-string, non-falsy-string}", $match);`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ function bar(string $str): void`
`27`	`27`	`(\w*) # extra description (UNSIGNED, CHARACTER SET, ...) [3]`
`28`	`28`	`$/x';`
`29`	`29`	`if (preg_match($regexp, $str, $matches)) {`
`30`		`- assertType('array{string, non-empty-string, string, string}', $matches);`
	`30`	`+ assertType('array{non-falsy-string, non-empty-string, string, string}', $matches);`
`31`	`31`	`}`
`32`	`32`	`}`
`33`	`33`
Original file line number	Diff line number	Diff line change
`@@ -7,15 +7,15 @@`
`7`	`7`	`function doOffsetCaptureWithUnmatchedNull(string $s): void {`
`8`	`8`	`// see https://3v4l.org/07rBO#v8.2.9`
`9`	`9`	`if (preg_match('/(foo)(bar)(baz)/', $s, $matches, PREG_OFFSET_CAPTURE\|PREG_UNMATCHED_AS_NULL)) {`
`10`		`- 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);`
	`10`	`+ 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);`
`11`	`11`	`}`
`12`		`- 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);`
	`12`	`+ 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);`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`function doNonAutoCapturingModifier(string $s): void {`
`16`	`16`	`if (preg_match('/(?n)(\d+)/', $s, $matches)) {`
`17`	`17`	`// should be assertType('array{string}', $matches);`
`18`		`- assertType('array{string, numeric-string}', $matches);`
	`18`	`+ assertType('array{non-falsy-string, numeric-string}', $matches);`
`19`	`19`	`}`
`20`		`- assertType('array{}\|array{string, numeric-string}', $matches);`
	`20`	`+ assertType('array{}\|array{non-falsy-string, numeric-string}', $matches);`
`21`	`21`	`}`