Optional types in ExpressionResult

Author: ondrejmirtes

src/Analyser/ExpressionResult.php

@@ -2,6 +2,8 @@
 
 namespace PHPStan\Analyser;
 
+use PHPStan\Type\Type;
+
 final class ExpressionResult
 {
 
@@ -29,12 +31,24 @@ public function __construct(
 		private array $impurePoints,
 		?callable $truthyScopeCallback = null,
 		?callable $falseyScopeCallback = null,
+		private ?Type $type = null,
+		private ?Type $nativeType = null,
 	)
 	{
 		$this->truthyScopeCallback = $truthyScopeCallback;
 		$this->falseyScopeCallback = $falseyScopeCallback;
 	}
 
+	public function getType(): ?Type
+	{
+		return $this->type;
+	}
+
+	public function getNativeType(): ?Type
+	{
+		return $this->nativeType;
+	}
+
 	public function getScope(): MutatingScope
 	{
 		return $this->scope;

src/Analyser/NodeScopeResolver.php

@@ -2561,6 +2561,9 @@ public function processExprNode(
 
 		$this->callNodeCallbackWithExpression($nodeCallback, $expr, $scope, $context);
 
+		$expressionType = null;
+		$expressionNativeType = null;
+
 		if ($expr instanceof Variable) {
 			$hasYield = false;
 			$throwPoints = [];
@@ -2619,7 +2622,7 @@ function (MutatingScope $scope) use ($stmt, $expr, $nodeCallback, $context, $sto
 						$scope = $scope->exitExpressionAssign($expr->expr);
 					}
 
-					$result = new ExpressionResult($scope, $hasYield, $isAlwaysTerminating, $throwPoints, $impurePoints);
+					$result = new ExpressionResult($scope, $hasYield, $isAlwaysTerminating, $throwPoints, $impurePoints, type: $result->getType(), nativeType: $result->getNativeType());
 					$storage->storeResult($expr, $result);
 
 					return $result;
@@ -4381,6 +4384,8 @@ function (MutatingScope $scope) use ($stmt, $expr, $nodeCallback, $context, $sto
 			$throwPoints = [];
 			$impurePoints = [];
 			$isAlwaysTerminating = false;
+			$expressionType = $this->initializerExprTypeResolver->getType($expr, InitializerExprContext::fromScope($scope));
+			$expressionNativeType = $expressionType;
 		} elseif ($expr instanceof ConstFetch) {
 			$hasYield = false;
 			$throwPoints = [];
@@ -4402,6 +4407,8 @@ function (MutatingScope $scope) use ($stmt, $expr, $nodeCallback, $context, $sto
 			$impurePoints,
 			static fn (): MutatingScope => $scope->filterByTruthyValue($expr),
 			static fn (): MutatingScope => $scope->filterByFalseyValue($expr),
+			$expressionType,
+			$expressionNativeType,
 		);
 		$storage->storeResult($expr, $result);
 		return $result;
@@ -5872,12 +5879,16 @@ private function processAssignVar(
 		$impurePoints = [];
 		$isAlwaysTerminating = false;
 		$isAssignOp = $assignedExpr instanceof Expr\AssignOp && !$enterExpressionAssign;
+		$expressionType = null;
+		$expressionNativeType = null;
 		if ($var instanceof Variable && is_string($var->name)) {
 			$result = $processExprCallback($scope);
 			$hasYield = $result->hasYield();
 			$throwPoints = $result->getThrowPoints();
 			$impurePoints = $result->getImpurePoints();
 			$isAlwaysTerminating = $result->isAlwaysTerminating();
+			$expressionType = $result->getType();
+			$expressionNativeType = $result->getNativeType();
 			if (in_array($var->name, Scope::SUPERGLOBAL_VARIABLES, true)) {
 				$impurePoints[] = new ImpurePoint($scope, $var, 'superglobal', 'assign to superglobal variable', true);
 			}
@@ -6399,7 +6410,7 @@ private function processAssignVar(
 		}
 
 		// stored where processAssignVar is called
-		return new ExpressionResult($scope, $hasYield, $isAlwaysTerminating, $throwPoints, $impurePoints);
+		return new ExpressionResult($scope, $hasYield, $isAlwaysTerminating, $throwPoints, $impurePoints, type: $expressionType, nativeType: $expressionNativeType);
 	}
 
 	/**