add tests

Author: staabm

src/Analyser/Generator/ExprHandler/CastBoolHandler.php

@@ -4,13 +4,14 @@
 
 use Generator;
 use PhpParser\Node\Expr;
+use PhpParser\Node\Name\FullyQualified;
 use PhpParser\Node\Stmt;
 use PHPStan\Analyser\ExpressionContext;
 use PHPStan\Analyser\Generator\ExprAnalysisRequest;
 use PHPStan\Analyser\Generator\ExprAnalysisResult;
 use PHPStan\Analyser\Generator\ExprHandler;
 use PHPStan\Analyser\Generator\GeneratorScope;
-use PHPStan\Analyser\SpecifiedTypes;
+use PHPStan\Analyser\Generator\NoopNodeCallback;
 use PHPStan\DependencyInjection\AutowiredService;
 
 /**
@@ -34,6 +35,7 @@ public function analyseExpr(
 	): Generator
 	{
 		$exprResult = yield new ExprAnalysisRequest($stmt, $expr->expr, $scope, $context->enterDeep(), $alternativeNodeCallback);
+		$specifiedExprResult = yield new ExprAnalysisRequest($stmt, new Expr\BinaryOp\Equal($expr->expr, new Expr\ConstFetch(new FullyQualified('true'))), $scope, $context->enterDeep(), new NoopNodeCallback());
 
 		return new ExprAnalysisResult(
 			$exprResult->type->toBoolean(),
@@ -43,9 +45,9 @@ public function analyseExpr(
 			isAlwaysTerminating: false,
 			throwPoints: [],
 			impurePoints: [],
-			specifiedTruthyTypes: new SpecifiedTypes(),
-			specifiedFalseyTypes: new SpecifiedTypes(),
-			specifiedNullTypes: new SpecifiedTypes(),
+			specifiedTruthyTypes: $specifiedExprResult->specifiedTruthyTypes,
+			specifiedFalseyTypes: $specifiedExprResult->specifiedFalseyTypes,
+			specifiedNullTypes: $specifiedExprResult->specifiedNullTypes,
 		);
 	}
 

tests/PHPStan/Analyser/Generator/data/gnsr.php

@@ -9,6 +9,7 @@
 use function PHPStan\Testing\assertNativeType;
 use function PHPStan\Testing\assertType;
 use const PHP_VERSION_ID;
+use function PHPUnit\Framework\assertNull;
 
 class Foo
 {
@@ -278,16 +279,15 @@ function doCast() {
 	/**
 	 * @param '1' $b
 	 */
-	function doInterpolatedString(string $b) {
+	function doInterpolatedString(string $b)
+	{
 		$a = '1';
 
 		assertType("'1'", "$a");
 		assertNativeType("'1'", "$a");
 		assertType("'1'", "$b");
 		assertNativeType("string", "$b");
 	}
-
-
 }
 
 function (): void {
@@ -555,3 +555,43 @@ function (array $a): void {
 
 	assertType("array", $a);
 };
+
+class CastNarrowing {
+	/**
+	 * @param int $i2
+	 * @param mixed $m2
+	 */
+	public function doCastNarrowing(
+		int $i, mixed $m,
+			$i2, $m2
+	): void
+	{
+		if ((bool) $i) {
+			assertNativeType('int<min, -1>|int<1, max>', $i);
+		} else {
+			assertNativeType('0', $i);
+		}
+		assertNativeType('int', $i);
+
+		if ((bool) $i2) {
+			assertType('int<min, -1>|int<1, max>', $i2);
+		} else {
+			assertType('0', $i2);
+		}
+		assertType('int', $i2);
+
+		if ((bool) $m) {
+			assertNativeType("mixed~(0|0.0|''|'0'|array{}|false|null)", $m);
+		} else {
+			assertNativeType("0|0.0|''|'0'|array{}|false|null", $m);
+		}
+		assertNativeType('mixed', $m);
+
+		if ((bool) $m2) {
+			assertType("mixed~(0|0.0|''|'0'|array{}|false|null)", $m2);
+		} else {
+			assertType("0|0.0|''|'0'|array{}|false|null", $m2);
+		}
+		assertType('mixed', $m2);
+	}
+}