Refactor enterRightSideAssign to only use Expr, not Type

Author: ondrejmirtes

src/Analyser/ExpressionContext.php

@@ -2,28 +2,27 @@
 
 namespace PHPStan\Analyser;
 
-use PHPStan\Type\Type;
+use PhpParser\Node\Expr;
 
 final class ExpressionContext
 {
 
 	private function __construct(
 		private bool $isDeep,
 		private ?string $inAssignRightSideVariableName,
-		private ?Type $inAssignRightSideType,
-		private ?Type $inAssignRightSideNativeType,
+		private ?Expr $inAssignRightSideExpr,
 	)
 	{
 	}
 
 	public static function createTopLevel(): self
 	{
-		return new self(false, null, null, null);
+		return new self(false, null, null);
 	}
 
 	public static function createDeep(): self
 	{
-		return new self(true, null, null, null);
+		return new self(true, null, null);
 	}
 
 	public function enterDeep(): self
@@ -32,32 +31,27 @@ public function enterDeep(): self
 			return $this;
 		}
 
-		return new self(true, $this->inAssignRightSideVariableName, $this->inAssignRightSideType, $this->inAssignRightSideNativeType);
+		return new self(true, $this->inAssignRightSideVariableName, $this->inAssignRightSideExpr);
 	}
 
 	public function isDeep(): bool
 	{
 		return $this->isDeep;
 	}
 
-	public function enterRightSideAssign(string $variableName, Type $type, Type $nativeType): self
+	public function enterRightSideAssign(string $variableName, Expr $expr): self
 	{
-		return new self($this->isDeep, $variableName, $type, $nativeType);
+		return new self($this->isDeep, $variableName, $expr);
 	}
 
 	public function getInAssignRightSideVariableName(): ?string
 	{
 		return $this->inAssignRightSideVariableName;
 	}
 
-	public function getInAssignRightSideType(): ?Type
+	public function getInAssignRightSideExpr(): ?Expr
 	{
-		return $this->inAssignRightSideType;
-	}
-
-	public function getInAssignRightSideNativeType(): ?Type
-	{
-		return $this->inAssignRightSideNativeType;
+		return $this->inAssignRightSideExpr;
 	}
 
 }

src/Analyser/NodeScopeResolver.php

@@ -2582,8 +2582,7 @@ function (MutatingScope $scope) use ($stmt, $expr, $nodeCallback, $context): Exp
 					if ($expr->var instanceof Variable && is_string($expr->var->name)) {
 						$context = $context->enterRightSideAssign(
 							$expr->var->name,
-							$scope->getType($expr->expr),
-							$scope->getNativeType($expr->expr),
+							$expr->expr,
 						);
 					}
 
@@ -4828,13 +4827,12 @@ private function processClosureNode(
 				$useScope = $useScope->enterExpressionAssign($use->var);
 
 				$inAssignRightSideVariableName = $context->getInAssignRightSideVariableName();
-				$inAssignRightSideType = $context->getInAssignRightSideType();
-				$inAssignRightSideNativeType = $context->getInAssignRightSideNativeType();
+				$inAssignRightSideExpr = $context->getInAssignRightSideExpr();
 				if (
 					$inAssignRightSideVariableName === $use->var->name
-					&& $inAssignRightSideType !== null
-					&& $inAssignRightSideNativeType !== null
+					&& $inAssignRightSideExpr !== null
 				) {
+					$inAssignRightSideType = $scope->getType($inAssignRightSideExpr);
 					if ($inAssignRightSideType instanceof ClosureType) {
 						$variableType = $inAssignRightSideType;
 					} else {
@@ -4845,6 +4843,7 @@ private function processClosureNode(
 							$variableType = TypeCombinator::union($scope->getVariableType($inAssignRightSideVariableName), $inAssignRightSideType);
 						}
 					}
+					$inAssignRightSideNativeType = $scope->getNativeType($inAssignRightSideExpr);
 					if ($inAssignRightSideNativeType instanceof ClosureType) {
 						$variableNativeType = $inAssignRightSideNativeType;
 					} else {