Update phpstan tests to latest phpstan features

Author: Seldaek

phpstan-baseline.neon

@@ -6,6 +6,12 @@ parameters:
 			count: 1
 			path: src/PHPStan/PregReplaceCallbackClosureTypeExtension.php
 
+		-
+			message: '#^Method Composer\\Pcre\\Preg\:\:split\(\) should return list\<string\> but returns list\<array\{string, int\<0, max\>\}\|string\>\.$#'
+			identifier: return.type
+			count: 1
+			path: src/Preg.php
+
 		-
 			message: '#^Parameter \#2 \$callback of function preg_replace_callback expects callable\(array\<string\>\)\: string, \(callable\(array\<int\|string, array\{string\|null, int\<\-1, max\>\}\>\)\: string\)\|\(callable\(array\<int\|string, string\|null\>\)\: string\) given\.$#'
 			identifier: argument.type

tests/PHPStanTests/nsrt/preg-match.php

@@ -9,71 +9,71 @@
 function doMatch(string $s): void
 {
     if (Preg::match('/Price: /i', $s, $matches)) {
-        assertType('array{string}', $matches);
+        assertType('array{non-falsy-string}', $matches);
     } else {
         assertType('array{}', $matches);
     }
-    assertType('array{}|array{string}', $matches);
+    assertType('array{}|array{non-falsy-string}', $matches);
 
     if (Preg::match('/Price: (£|€)\d+/', $s, $matches)) {
-        assertType('array{string, \'£\'|\'€\'}', $matches);
+        assertType('array{non-falsy-string, \'£\'|\'€\'}', $matches);
     } else {
         assertType('array{}', $matches);
     }
-    assertType('array{}|array{string, \'£\'|\'€\'}', $matches);
+    assertType('array{}|array{non-falsy-string, \'£\'|\'€\'}', $matches);
 
     if (Preg::match('/Price: (£|€)?\d+/', $s, $matches)) {
-        assertType('array{string, \'£\'|\'€\'|null}', $matches);
+        assertType('array{non-falsy-string, \'£\'|\'€\'|null}', $matches);
     } else {
         assertType('array{}', $matches);
     }
-    assertType('array{}|array{string, \'£\'|\'€\'|null}', $matches);
+    assertType('array{}|array{non-falsy-string, \'£\'|\'€\'|null}', $matches);
 
     // passing the PREG_UNMATCHED_AS_NULL should change nothing compared to above as it is always set
     if (Preg::match('/Price: (£|€)?\d+/', $s, $matches, PREG_UNMATCHED_AS_NULL)) {
-        assertType('array{string, \'£\'|\'€\'|null}', $matches);
+        assertType('array{non-falsy-string, \'£\'|\'€\'|null}', $matches);
     } else {
         assertType('array{}', $matches);
     }
-    assertType('array{}|array{string, \'£\'|\'€\'|null}', $matches);
+    assertType('array{}|array{non-falsy-string, \'£\'|\'€\'|null}', $matches);
 
     if (Preg::isMatch('/Price: (?<currency>£|€)\d+/', $s, $matches)) {
-        assertType('array{0: string, currency: \'£\'|\'€\', 1: \'£\'|\'€\'}', $matches);
+        assertType('array{0: non-falsy-string, currency: \'£\'|\'€\', 1: \'£\'|\'€\'}', $matches);
     } else {
         assertType('array{}', $matches);
     }
-    assertType('array{}|array{0: string, currency: \'£\'|\'€\', 1: \'£\'|\'€\'}', $matches);
+    assertType('array{}|array{0: non-falsy-string, currency: \'£\'|\'€\', 1: \'£\'|\'€\'}', $matches);
 }
 
 function doMatchStrictGroups(string $s): void
 {
     if (Preg::matchStrictGroups('/Price: /i', $s, $matches)) {
-        assertType('array{string}', $matches);
+        assertType('array{non-falsy-string}', $matches);
     } else {
         assertType('array{}', $matches);
     }
-    assertType('array{}|array{string}', $matches);
+    assertType('array{}|array{non-falsy-string}', $matches);
 
     if (Preg::matchStrictGroups('/Price: (£|€)\d+/', $s, $matches)) {
-        assertType('array{string, \'£\'|\'€\'}', $matches);
+        assertType('array{non-falsy-string, \'£\'|\'€\'}', $matches);
     } else {
         assertType('array{}', $matches);
     }
-    assertType('array{}|array{string, \'£\'|\'€\'}', $matches);
+    assertType('array{}|array{non-falsy-string, \'£\'|\'€\'}', $matches);
 
     if (Preg::isMatchStrictGroups('/Price: (?<test>£|€)\d+/', $s, $matches)) {
-        assertType('array{0: string, test: \'£\'|\'€\', 1: \'£\'|\'€\'}', $matches);
+        assertType('array{0: non-falsy-string, test: \'£\'|\'€\', 1: \'£\'|\'€\'}', $matches);
     } else {
         assertType('array{}', $matches);
     }
-    assertType('array{}|array{0: string, test: \'£\'|\'€\', 1: \'£\'|\'€\'}', $matches);
+    assertType('array{}|array{0: non-falsy-string, test: \'£\'|\'€\', 1: \'£\'|\'€\'}', $matches);
 }
 
 function doMatchStrictGroupsUnsafe(string $s): void
 {
     if (Preg::isMatchStrictGroups('{Configure Command(?: *</td><td class="v">| *=> *)(.*)(?:</td>|$)}m', $s, $matches)) {
         // does not error because the match group might be empty but is not optional
-        assertType('array{string, string}', $matches);
+        assertType('array{non-falsy-string, string}', $matches);
     }
 
     // should error as it is unsafe due to the optional group 1

tests/PHPStanTests/nsrt/preg-replace-callback.php

@@ -30,7 +30,7 @@ function (string $s): void {
     Preg::replaceCallback(
         '|<p>(\s*)\w|',
         function ($matches) {
-            assertType('array{string, string}', $matches);
+            assertType('array{non-falsy-string, string}', $matches);
             return '';
         },
         $s