specifiedNullTypes

ondrejmirtes · ondrejmirtes · commit 1a8a65748ffe · 2025-11-25T17:38:50.000+01:00
diff --git a/src/Analyser/Generator/ExprAnalysisResult.php b/src/Analyser/Generator/ExprAnalysisResult.php
@@ -25,6 +25,7 @@ public function __construct(
 		public readonly array $impurePoints,
 		public readonly SpecifiedTypes $specifiedTruthyTypes,
 		public readonly SpecifiedTypes $specifiedFalseyTypes,
+		public readonly SpecifiedTypes $specifiedNullTypes,
 		?Type $keepVoidType = null,
 	)
 	{
diff --git a/src/Analyser/Generator/ExprHandler/ArrowFunctionHandler.php b/src/Analyser/Generator/ExprHandler/ArrowFunctionHandler.php
@@ -74,6 +74,7 @@ public function analyseExpr(
 			impurePoints: [],
 			specifiedTruthyTypes: new SpecifiedTypes(),
 			specifiedFalseyTypes: new SpecifiedTypes(),
+			specifiedNullTypes: new SpecifiedTypes(),
 		);
 	}
 
@@ -115,6 +116,7 @@ public function processArrowFunctionNode(
 			impurePoints: $exprResult->impurePoints,
 			specifiedTruthyTypes: new SpecifiedTypes(),
 			specifiedFalseyTypes: new SpecifiedTypes(),
+			specifiedNullTypes: new SpecifiedTypes(),
 		);
 	}
 
diff --git a/src/Analyser/Generator/ExprHandler/AssignHandler.php b/src/Analyser/Generator/ExprHandler/AssignHandler.php
@@ -158,6 +158,7 @@ static function (GeneratorScope $scope) use ($stmt, $expr, $context, $alternativ
 					impurePoints: array_merge($impurePoints, $result->impurePoints),
 					specifiedTruthyTypes: new SpecifiedTypes(),
 					specifiedFalseyTypes: new SpecifiedTypes(),
+					specifiedNullTypes: new SpecifiedTypes(),
 				);
 			},
 			true,
@@ -189,6 +190,7 @@ static function (GeneratorScope $scope) use ($stmt, $expr, $context, $alternativ
 			impurePoints: $result->impurePoints,
 			specifiedTruthyTypes: new SpecifiedTypes(),
 			specifiedFalseyTypes: new SpecifiedTypes(),
+			specifiedNullTypes: new SpecifiedTypes(),
 		);
 	}
 
@@ -332,6 +334,7 @@ public function processAssignVar(
 				impurePoints: $impurePoints,
 				specifiedTruthyTypes: new SpecifiedTypes(),
 				specifiedFalseyTypes: new SpecifiedTypes(),
+				specifiedNullTypes: new SpecifiedTypes(),
 			);
 		} elseif ($var instanceof ArrayDimFetch) {
 			$dimFetchStack = [];
@@ -544,6 +547,7 @@ public function processAssignVar(
 				impurePoints: $impurePoints,
 				specifiedTruthyTypes: new SpecifiedTypes(),
 				specifiedFalseyTypes: new SpecifiedTypes(),
+				specifiedNullTypes: new SpecifiedTypes(),
 			);
 		} elseif ($var instanceof PropertyFetch) {
 			$objectResult = yield new ExprAnalysisRequest($stmt, $var->var, $scope, $context, $alternativeNodeCallback);
@@ -661,6 +665,7 @@ public function processAssignVar(
 				impurePoints: $impurePoints,
 				specifiedTruthyTypes: new SpecifiedTypes(),
 				specifiedFalseyTypes: new SpecifiedTypes(),
+				specifiedNullTypes: new SpecifiedTypes(),
 			);
 		} elseif ($var instanceof Expr\StaticPropertyFetch) {
 			if ($var->class instanceof Node\Name) {
@@ -753,6 +758,7 @@ public function processAssignVar(
 				impurePoints: $impurePoints,
 				specifiedTruthyTypes: new SpecifiedTypes(),
 				specifiedFalseyTypes: new SpecifiedTypes(),
+				specifiedNullTypes: new SpecifiedTypes(),
 			);
 		} elseif ($var instanceof List_) {
 			$exprGen = $processExprCallback($scope);
@@ -813,6 +819,7 @@ static function (GeneratorScope $scope): Generator {
 							impurePoints: [],
 							specifiedTruthyTypes: new SpecifiedTypes(),
 							specifiedFalseyTypes: new SpecifiedTypes(),
+							specifiedNullTypes: new SpecifiedTypes(),
 						);
 					},
 					$enterExpressionAssign,
@@ -836,6 +843,7 @@ static function (GeneratorScope $scope): Generator {
 				impurePoints: $impurePoints,
 				specifiedTruthyTypes: new SpecifiedTypes(),
 				specifiedFalseyTypes: new SpecifiedTypes(),
+				specifiedNullTypes: new SpecifiedTypes(),
 			);
 		} elseif ($var instanceof ExistingArrayDimFetch) {
 			$dimFetchStack = [];
@@ -940,6 +948,7 @@ static function (GeneratorScope $scope): Generator {
 				impurePoints: $impurePoints,
 				specifiedTruthyTypes: new SpecifiedTypes(),
 				specifiedFalseyTypes: new SpecifiedTypes(),
+				specifiedNullTypes: new SpecifiedTypes(),
 			);
 		}
 
@@ -957,6 +966,7 @@ static function (GeneratorScope $scope): Generator {
 			impurePoints: $result->impurePoints,
 			specifiedTruthyTypes: new SpecifiedTypes(),
 			specifiedFalseyTypes: new SpecifiedTypes(),
+			specifiedNullTypes: new SpecifiedTypes(),
 		);
 	}
 
diff --git a/src/Analyser/Generator/ExprHandler/BinaryPlusHandler.php b/src/Analyser/Generator/ExprHandler/BinaryPlusHandler.php
@@ -47,6 +47,7 @@ public function analyseExpr(Stmt $stmt, Expr $expr, GeneratorScope $scope, Expre
 			impurePoints: array_merge($leftResult->impurePoints, $rightResult->impurePoints),
 			specifiedTruthyTypes: new SpecifiedTypes(),
 			specifiedFalseyTypes: new SpecifiedTypes(),
+			specifiedNullTypes: new SpecifiedTypes(),
 		);
 	}
 
diff --git a/src/Analyser/Generator/ExprHandler/CastIntHandler.php b/src/Analyser/Generator/ExprHandler/CastIntHandler.php
@@ -46,6 +46,7 @@ public function analyseExpr(
 			impurePoints: [],
 			specifiedTruthyTypes: new SpecifiedTypes(),
 			specifiedFalseyTypes: new SpecifiedTypes(),
+			specifiedNullTypes: new SpecifiedTypes(),
 		);
 	}
 
diff --git a/src/Analyser/Generator/ExprHandler/ClassConstFetchHandler.php b/src/Analyser/Generator/ExprHandler/ClassConstFetchHandler.php
@@ -54,6 +54,7 @@ public function analyseExpr(
 				impurePoints: [],
 				specifiedTruthyTypes: new SpecifiedTypes(),
 				specifiedFalseyTypes: new SpecifiedTypes(),
+				specifiedNullTypes: new SpecifiedTypes(),
 			);
 		}
 
diff --git a/src/Analyser/Generator/ExprHandler/ClosureHandler.php b/src/Analyser/Generator/ExprHandler/ClosureHandler.php
@@ -96,6 +96,7 @@ public function analyseExpr(
 			impurePoints: [],
 			specifiedTruthyTypes: new SpecifiedTypes(),
 			specifiedFalseyTypes: new SpecifiedTypes(),
+			specifiedNullTypes: new SpecifiedTypes(),
 		);
 	}
 
@@ -459,6 +460,7 @@ private function processClosureStatementResult(
 				impurePoints: $closureStatementResult->impurePoints,
 				specifiedTruthyTypes: new SpecifiedTypes(),
 				specifiedFalseyTypes: new SpecifiedTypes(),
+				specifiedNullTypes: new SpecifiedTypes(),
 			),
 			$closureScope,
 		];
diff --git a/src/Analyser/Generator/ExprHandler/FuncCallHandler.php b/src/Analyser/Generator/ExprHandler/FuncCallHandler.php
@@ -80,6 +80,7 @@ public function analyseExpr(
 					impurePoints: $impurePoints,
 					specifiedTruthyTypes: new SpecifiedTypes(),
 					specifiedFalseyTypes: new SpecifiedTypes(),
+					specifiedNullTypes: new SpecifiedTypes(),
 				);
 			}
 		}
diff --git a/src/Analyser/Generator/ExprHandler/LiteralArrayHandler.php b/src/Analyser/Generator/ExprHandler/LiteralArrayHandler.php
@@ -109,6 +109,7 @@ public function analyseExpr(
 			impurePoints: $impurePoints,
 			specifiedTruthyTypes: new SpecifiedTypes(),
 			specifiedFalseyTypes: new SpecifiedTypes(),
+			specifiedNullTypes: new SpecifiedTypes(),
 		);
 	}
 
diff --git a/src/Analyser/Generator/ExprHandler/MethodCallHandler.php b/src/Analyser/Generator/ExprHandler/MethodCallHandler.php
@@ -71,6 +71,7 @@ public function analyseExpr(
 				impurePoints: $impurePoints,
 				specifiedTruthyTypes: new SpecifiedTypes(),
 				specifiedFalseyTypes: new SpecifiedTypes(),
+				specifiedNullTypes: new SpecifiedTypes(),
 			);
 		}
 
diff --git a/src/Analyser/Generator/ExprHandler/NewHandler.php b/src/Analyser/Generator/ExprHandler/NewHandler.php
@@ -206,6 +206,7 @@ public function analyseExpr(
 			isAlwaysTerminating: $isAlwaysTerminating || $argsResult->isAlwaysTerminating,
 			specifiedTruthyTypes: new SpecifiedTypes(),
 			specifiedFalseyTypes: new SpecifiedTypes(),
+			specifiedNullTypes: new SpecifiedTypes(),
 		);
 	}
 
@@ -307,6 +308,7 @@ private function processAnonymousClass(
 			isAlwaysTerminating: $argsResult->isAlwaysTerminating,
 			specifiedTruthyTypes: new SpecifiedTypes(),
 			specifiedFalseyTypes: new SpecifiedTypes(),
+			specifiedNullTypes: new SpecifiedTypes(),
 		);
 	}
 
diff --git a/src/Analyser/Generator/ExprHandler/ScalarIntHandler.php b/src/Analyser/Generator/ExprHandler/ScalarIntHandler.php
@@ -46,6 +46,7 @@ public function analyseExpr(
 			impurePoints: [],
 			specifiedTruthyTypes: new SpecifiedTypes(),
 			specifiedFalseyTypes: new SpecifiedTypes(),
+			specifiedNullTypes: new SpecifiedTypes(),
 		);
 	}
 
diff --git a/src/Analyser/Generator/ExprHandler/ScalarStringHandler.php b/src/Analyser/Generator/ExprHandler/ScalarStringHandler.php
@@ -46,6 +46,7 @@ public function analyseExpr(
 			impurePoints: [],
 			specifiedTruthyTypes: new SpecifiedTypes(),
 			specifiedFalseyTypes: new SpecifiedTypes(),
+			specifiedNullTypes: new SpecifiedTypes(),
 		);
 	}
 
diff --git a/src/Analyser/Generator/ExprHandler/StaticCallHandler.php b/src/Analyser/Generator/ExprHandler/StaticCallHandler.php
@@ -273,6 +273,7 @@ public function analyseExpr(Stmt $stmt, Expr $expr, GeneratorScope $scope, Expre
 			impurePoints: array_merge($impurePoints, $argsResult->impurePoints),
 			specifiedTruthyTypes: new SpecifiedTypes(),
 			specifiedFalseyTypes: new SpecifiedTypes(),
+			specifiedNullTypes: new SpecifiedTypes(),
 		);
 	}
 
@@ -404,6 +405,7 @@ private function processClassExpr(Stmt $stmt, StaticCall $expr, Expr $class, Gen
 			impurePoints: array_merge($impurePoints, $argsResult->impurePoints),
 			specifiedTruthyTypes: new SpecifiedTypes(),
 			specifiedFalseyTypes: new SpecifiedTypes(),
+			specifiedNullTypes: new SpecifiedTypes(),
 		);
 	}
 
diff --git a/src/Analyser/Generator/ExprHandler/VariableHandler.php b/src/Analyser/Generator/ExprHandler/VariableHandler.php
@@ -11,6 +11,7 @@
 use PHPStan\Analyser\Generator\ExprHandler;
 use PHPStan\Analyser\Generator\GeneratorScope;
 use PHPStan\Analyser\Generator\SpecifiedTypesHelper;
+use PHPStan\Analyser\SpecifiedTypes;
 use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\ShouldNotHappenException;
 use PHPStan\Type\ErrorType;
@@ -59,6 +60,7 @@ public function analyseExpr(
 				impurePoints: [],
 				specifiedTruthyTypes: $this->specifiedTypesHelper->createDefaultSpecifiedTruthyTypes($expr),
 				specifiedFalseyTypes: $this->specifiedTypesHelper->createDefaultSpecifiedFalseyTypes($expr),
+				specifiedNullTypes: new SpecifiedTypes(),
 			);
 		}
 
@@ -73,6 +75,7 @@ public function analyseExpr(
 			impurePoints: [],
 			specifiedTruthyTypes: $this->specifiedTypesHelper->createDefaultSpecifiedTruthyTypes($expr),
 			specifiedFalseyTypes: $this->specifiedTypesHelper->createDefaultSpecifiedFalseyTypes($expr),
+			specifiedNullTypes: new SpecifiedTypes(),
 		);
 	}
 
diff --git a/src/Analyser/Generator/StmtHandler/ExpressionHandler.php b/src/Analyser/Generator/StmtHandler/ExpressionHandler.php
@@ -103,11 +103,9 @@ public function analyseStmt(Stmt $stmt, GeneratorScope $scope, StatementContext
 			yield new NodeCallbackRequest(new NoopExpressionNode($stmt->expr, $hasAssign), $scope, $alternativeNodeCallback);
 		}
 		$scope = $result->scope;
-		/*$scope = $scope->filterBySpecifiedTypes($this->typeSpecifier->specifyTypesInCondition(
-			$scope,
-			$stmt->expr,
-			TypeSpecifierContext::createNull(),
-		));*/
+		$applyTypesGen = $scope->applySpecifiedTypes($result->specifiedNullTypes);
+		yield from $applyTypesGen;
+		$scope = $applyTypesGen->getReturn();
 
 		$earlyTerminationExprGen = $this->findEarlyTerminatingExpr($stmt->expr, $scope);
 		yield from $earlyTerminationExprGen;
diff --git a/src/Analyser/Generator/VirtualAssignHelper.php b/src/Analyser/Generator/VirtualAssignHelper.php
@@ -64,6 +64,7 @@ static function (GeneratorScope $scope): Generator {
 					impurePoints: [],
 					specifiedTruthyTypes: new SpecifiedTypes(),
 					specifiedFalseyTypes: new SpecifiedTypes(),
+					specifiedNullTypes: new SpecifiedTypes(),
 				);
 			},
 			false,

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@ public function __construct(`
`25`	`25`	`public readonly array $impurePoints,`
`26`	`26`	`public readonly SpecifiedTypes $specifiedTruthyTypes,`
`27`	`27`	`public readonly SpecifiedTypes $specifiedFalseyTypes,`
	`28`	`+ public readonly SpecifiedTypes $specifiedNullTypes,`
`28`	`29`	`?Type $keepVoidType = null,`
`29`	`30`	`)`
`30`	`31`	`{`
Original file line number	Diff line number	Diff line change
`@@ -74,6 +74,7 @@ public function analyseExpr(`
`74`	`74`	`impurePoints: [],`
`75`	`75`	`specifiedTruthyTypes: new SpecifiedTypes(),`
`76`	`76`	`specifiedFalseyTypes: new SpecifiedTypes(),`
	`77`	`+ specifiedNullTypes: new SpecifiedTypes(),`
`77`	`78`	`);`
`78`	`79`	`}`
`79`	`80`
`@@ -115,6 +116,7 @@ public function processArrowFunctionNode(`
`115`	`116`	`impurePoints: $exprResult->impurePoints,`
`116`	`117`	`specifiedTruthyTypes: new SpecifiedTypes(),`
`117`	`118`	`specifiedFalseyTypes: new SpecifiedTypes(),`
	`119`	`+ specifiedNullTypes: new SpecifiedTypes(),`
`118`	`120`	`);`
`119`	`121`	`}`
`120`	`122`
Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,7 @@ public function analyseExpr(Stmt $stmt, Expr $expr, GeneratorScope $scope, Expre`
`47`	`47`	`impurePoints: array_merge($leftResult->impurePoints, $rightResult->impurePoints),`
`48`	`48`	`specifiedTruthyTypes: new SpecifiedTypes(),`
`49`	`49`	`specifiedFalseyTypes: new SpecifiedTypes(),`
	`50`	`+ specifiedNullTypes: new SpecifiedTypes(),`
`50`	`51`	`);`
`51`	`52`	`}`
`52`	`53`
Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,7 @@ public function analyseExpr(`
`46`	`46`	`impurePoints: [],`
`47`	`47`	`specifiedTruthyTypes: new SpecifiedTypes(),`
`48`	`48`	`specifiedFalseyTypes: new SpecifiedTypes(),`
	`49`	`+ specifiedNullTypes: new SpecifiedTypes(),`
`49`	`50`	`);`
`50`	`51`	`}`
`51`	`52`
Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,7 @@ public function analyseExpr(`
`54`	`54`	`impurePoints: [],`
`55`	`55`	`specifiedTruthyTypes: new SpecifiedTypes(),`
`56`	`56`	`specifiedFalseyTypes: new SpecifiedTypes(),`
	`57`	`+ specifiedNullTypes: new SpecifiedTypes(),`
`57`	`58`	`);`
`58`	`59`	`}`
`59`	`60`
Original file line number	Diff line number	Diff line change
`@@ -80,6 +80,7 @@ public function analyseExpr(`
`80`	`80`	`impurePoints: $impurePoints,`
`81`	`81`	`specifiedTruthyTypes: new SpecifiedTypes(),`
`82`	`82`	`specifiedFalseyTypes: new SpecifiedTypes(),`
	`83`	`+ specifiedNullTypes: new SpecifiedTypes(),`
`83`	`84`	`);`
`84`	`85`	`}`
`85`	`86`	`}`
Original file line number	Diff line number	Diff line change
`@@ -109,6 +109,7 @@ public function analyseExpr(`
`109`	`109`	`impurePoints: $impurePoints,`
`110`	`110`	`specifiedTruthyTypes: new SpecifiedTypes(),`
`111`	`111`	`specifiedFalseyTypes: new SpecifiedTypes(),`
	`112`	`+ specifiedNullTypes: new SpecifiedTypes(),`
`112`	`113`	`);`
`113`	`114`	`}`
`114`	`115`
Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,7 @@ public function analyseExpr(`
`71`	`71`	`impurePoints: $impurePoints,`
`72`	`72`	`specifiedTruthyTypes: new SpecifiedTypes(),`
`73`	`73`	`specifiedFalseyTypes: new SpecifiedTypes(),`
	`74`	`+ specifiedNullTypes: new SpecifiedTypes(),`
`74`	`75`	`);`
`75`	`76`	`}`
`76`	`77`