IfHandler + applySpecifiedTypes

Author: ondrejmirtes

phpstan-baseline.neon

@@ -21,7 +21,7 @@ parameters:
 		-
 			rawMessage: Casting to string something that's already string.
 			identifier: cast.useless
-			count: 2
+			count: 4
 			path: src/Analyser/Generator/GeneratorScope.php
 
 		-

src/Analyser/Generator/ExprAnalysisRequest.php

@@ -33,4 +33,9 @@ public function __construct(
 		$this->originLine = $trace[0]['line'] ?? null;
 	}
 
+	public static function createNoopRequest(Expr $expr, GeneratorScope $scope): self
+	{
+		return new ExprAnalysisRequest(new Node\Stmt\Expression($expr), $expr, $scope, ExpressionContext::createTopLevel(), new NoopNodeCallback());
+	}
+
 }

src/Analyser/Generator/ExprHandler/VariableHandler.php

@@ -10,7 +10,7 @@
 use PHPStan\Analyser\Generator\ExprAnalysisResult;
 use PHPStan\Analyser\Generator\ExprHandler;
 use PHPStan\Analyser\Generator\GeneratorScope;
-use PHPStan\Analyser\SpecifiedTypes;
+use PHPStan\Analyser\Generator\SpecifiedTypesHelper;
 use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\ShouldNotHappenException;
 use PHPStan\Type\ErrorType;
@@ -24,6 +24,12 @@
 final class VariableHandler implements ExprHandler
 {
 
+	public function __construct(
+		private SpecifiedTypesHelper $specifiedTypesHelper,
+	)
+	{
+	}
+
 	public function supports(Expr $expr): bool
 	{
 		return $expr instanceof Variable;
@@ -51,8 +57,8 @@ public function analyseExpr(
 				isAlwaysTerminating: false,
 				throwPoints: [],
 				impurePoints: [],
-				specifiedTruthyTypes: new SpecifiedTypes(),
-				specifiedFalseyTypes: new SpecifiedTypes(),
+				specifiedTruthyTypes: $this->specifiedTypesHelper->createDefaultSpecifiedTruthyTypes($expr),
+				specifiedFalseyTypes: $this->specifiedTypesHelper->createDefaultSpecifiedFalseyTypes($expr),
 			);
 		}
 
@@ -65,8 +71,8 @@ public function analyseExpr(
 			isAlwaysTerminating: false,
 			throwPoints: [],
 			impurePoints: [],
-			specifiedTruthyTypes: new SpecifiedTypes(),
-			specifiedFalseyTypes: new SpecifiedTypes(),
+			specifiedTruthyTypes: $this->specifiedTypesHelper->createDefaultSpecifiedTruthyTypes($expr),
+			specifiedFalseyTypes: $this->specifiedTypesHelper->createDefaultSpecifiedFalseyTypes($expr),
 		);
 	}