FIXUP fixed tests

Author: thg2k

tests/PHPStan/Analyser/TypeSpecifierTest.php

@@ -477,8 +477,8 @@ public function dataCondition(): iterable
 					new Variable('foo'),
 					new Expr\ConstFetch(new Name('null')),
 				),
-				['$foo' => self::SURE_NOT_TRUTHY],
-				['$foo' => self::SURE_NOT_FALSEY],
+				['$foo' => '0|0.0|\'\'|array{}|false|null'],
+				['$foo' => '~0|0.0|\'\'|array{}|false|null'],
 			],
 			[
 				new Expr\BinaryOp\Identical(

tests/PHPStan/Analyser/nsrt/equal-narrow.php

@@ -37,7 +37,7 @@ function doNull($x, $y, $z): void
 	if ($z == null) {
 		assertType("0|0.0|''|array{}|false|null", $z);
 	} else {
-		assertType("mixed~0|0.0|''|array{}|false|null", $z);
+		assertType("mixed~(0|0.0|''|array{}|false|null)", $z);
 	}
 }
 
@@ -74,7 +74,7 @@ function doFalse($x, $y, $z): void
 	if ($z == false) {
 		assertType("0|0.0|''|'0'|array{}|false|null", $z);
 	} else {
-		assertType("mixed~0|0.0|''|'0'|array{}|false|null", $z);
+		assertType("mixed~(0|0.0|''|'0'|array{}|false|null)", $z);
 	}
 }
 
@@ -109,7 +109,7 @@ function doTrue($x, $y, $z): void
 	}
 
 	if ($z == true) {
-		assertType("mixed~0|0.0|''|'0'|array{}|false|null", $z);
+		assertType("mixed~(0|0.0|''|'0'|array{}|false|null)", $z);
 	} else {
 		assertType("0|0.0|''|'0'|array{}|false|null", $z);
 	}
@@ -143,6 +143,6 @@ function doEmptyString($x, $y, $z): void
 	if ($z == '') {
 		assertType("0|0.0|''|false|null", $z);
 	} else {
-		assertType("mixed~''|false|null", $z);
+		assertType("mixed~(''|false|null)", $z);
 	}
 }

tests/PHPStan/Analyser/nsrt/narrow-cast.php

@@ -33,7 +33,7 @@ function castString($x, string $s, bool $b) {
 	if ((string) $x) {
 		assertType('int<-5, 5>', $x);
 	} else {
-		assertType('int<-5, 5>', $x);
+		assertType('0', $x);
 	}
 
 	if ((string) $b) {

tests/PHPStan/Analyser/nsrt/non-empty-string.php

@@ -422,8 +422,8 @@ function subtract($m) {
 			assertType('non-falsy-string', (string) $m);
 		}
 		if ($m != '') {
-			assertType("mixed", $m);
-			assertType('string', (string) $m);
+			assertType("mixed~(''|false|null)", $m);
+			assertType('non-empty-string', (string) $m);
 		}
 		if ($m !== '') {
 			assertType("mixed~''", $m);