fix expectations

Author: staabm

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

@@ -22,15 +22,15 @@ function testIsArrayOnCallable(callable $value): void {
 	if (is_array($value)) {
 		assertType('array<mixed, mixed>&callable(): mixed', $value);
 		assertType('class-string|object', $value[0]);
-		assertType('string', $value[1]);
+		assertType('non-falsy-string', $value[1]);
 	}
 }
 
 /** @param callable-array $value */
 function testCallableArrayPhpDoc(array $value): void {
 	assertType('array&callable(): mixed', $value);
 	assertType('class-string|object', $value[0]);
-	assertType('string', $value[1]);
+	assertType('non-falsy-string', $value[1]);
 }
 
 function testIsStringOnCallable(callable $value): void {
@@ -50,7 +50,7 @@ function checkClassString(array $values): void {
 /** @param 0|1 $offset */
 function testCallableArrayUnionOffset(callable $value, int $offset): void {
 	if (is_array($value)) {
-		assertType('object|string', $value[$offset]);
+		assertType('object|non-falsy-string', $value[$offset]);
 	}
 }
 

tests/PHPStan/Rules/Methods/data/bug-14549.php

@@ -13,10 +13,10 @@ public function doFoo(array $task): void
 	{
 		foreach($task as $k => $v) {
 			assertType('0|1', $k);
-			assertType('object|non-empty-string', $v);
+			assertType('object|non-falsy-string', $v);
 		}
 		assertType('class-string|object', $task[0]);
-		assertType('string', $task[1]);
+		assertType('non-falsy-string', $task[1]);
 	}
 
 	/**
@@ -30,11 +30,11 @@ public function doBar(array $list): void
 			if (is_callable($list)) {
 				assertType('non-empty-list<string>&callable(): mixed&hasOffsetValue(0, non-empty-string)', $list);
 				assertType('non-empty-string', $list[0]);
-				assertType('string', $list[1]);
+				assertType('non-falsy-string', $list[1]);
 
 				foreach($list as $k => $v) {
 					assertType('0|1', $k);
-					assertType('non-empty-string', $v);
+					assertType('non-falsy-string', $v);
 				}
 			}
 		}

tests/PHPStan/Type/Constant/ConstantStringTypeTest.php

@@ -190,7 +190,7 @@ public function testIsCallable(TrinaryLogic $trinaryLogic, string $constantValue
 	{
 		$this->assertSame(
 			$trinaryLogic,
-			(new ConstantStringType($constantValue))->isCallable()
+			(new ConstantStringType($constantValue))->isCallable(),
 		);
 	}
 
@@ -199,7 +199,8 @@ public static function dataIsCallable(): iterable
 		yield [TrinaryLogic::createNo(), ''];
 		yield [TrinaryLogic::createNo(), '0'];
 		yield [TrinaryLogic::createYes(), 'substr'];
-		yield [TrinaryLogic::createYes(), self::class.'::dataIsCallable'];
-		yield [TrinaryLogic::createMaybe(), self::class.'::methodDoesNotExist'];
+		yield [TrinaryLogic::createYes(), self::class . '::dataIsCallable'];
+		yield [TrinaryLogic::createMaybe(), self::class . '::methodDoesNotExist'];
 	}
+
 }