Merge branch refs/heads/2.1.x into 2.2.x

Author: phpstan-bot

src/Analyser/ExprHandler/Virtual/AlwaysRememberedExprHandler.php

@@ -0,0 +1,59 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Analyser\ExprHandler\Virtual;
+
+use PhpParser\Node\Expr;
+use PhpParser\Node\Stmt;
+use PHPStan\Analyser\ExpressionContext;
+use PHPStan\Analyser\ExpressionResult;
+use PHPStan\Analyser\ExpressionResultStorage;
+use PHPStan\Analyser\ExprHandler;
+use PHPStan\Analyser\MutatingScope;
+use PHPStan\Analyser\NodeScopeResolver;
+use PHPStan\DependencyInjection\AutowiredService;
+use PHPStan\Node\Expr\AlwaysRememberedExpr;
+use PHPStan\Type\Type;
+
+/**
+ * @implements ExprHandler<AlwaysRememberedExpr>
+ */
+#[AutowiredService]
+final class AlwaysRememberedExprHandler implements ExprHandler
+{
+
+	public function supports(Expr $expr): bool
+	{
+		return $expr instanceof AlwaysRememberedExpr;
+	}
+
+	public function processExpr(
+		NodeScopeResolver $nodeScopeResolver,
+		Stmt $stmt,
+		Expr $expr,
+		MutatingScope $scope,
+		ExpressionResultStorage $storage,
+		callable $nodeCallback,
+		ExpressionContext $context,
+	): ExpressionResult
+	{
+		$innerExpr = $expr->getExpr();
+		$result = $nodeScopeResolver->processExprNode($stmt, $innerExpr, $scope, $storage, $nodeCallback, $context);
+		$scope = $result->getScope();
+
+		return new ExpressionResult(
+			$scope,
+			hasYield: $result->hasYield(),
+			isAlwaysTerminating: $result->isAlwaysTerminating(),
+			throwPoints: $result->getThrowPoints(),
+			impurePoints: $result->getImpurePoints(),
+			truthyScopeCallback: static fn (): MutatingScope => $scope->filterByTruthyValue($innerExpr),
+			falseyScopeCallback: static fn (): MutatingScope => $scope->filterByFalseyValue($innerExpr),
+		);
+	}
+
+	public function resolveType(MutatingScope $scope, Expr $expr): Type
+	{
+		return $scope->nativeTypesPromoted ? $expr->getNativeExprType() : $expr->getExprType();
+	}
+
+}

src/Analyser/MutatingScope.php

@@ -1055,10 +1055,6 @@ private function resolveType(string $exprString, Expr $node): Type
 			return $exprHandler->resolveType($this, $node);
 		}
 
-		if ($node instanceof AlwaysRememberedExpr) {
-			return $this->nativeTypesPromoted ? $node->getNativeExprType() : $node->getExprType();
-		}
-
 		return new MixedType();
 	}
 

src/Analyser/NodeScopeResolver.php

@@ -73,7 +73,6 @@
 use PHPStan\Node\DeepNodeCloner;
 use PHPStan\Node\DoWhileLoopConditionNode;
 use PHPStan\Node\ExecutionEndNode;
-use PHPStan\Node\Expr\AlwaysRememberedExpr;
 use PHPStan\Node\Expr\ExistingArrayDimFetch;
 use PHPStan\Node\Expr\ForeachValueByRefExpr;
 use PHPStan\Node\Expr\GetIterableKeyTypeExpr;
@@ -2511,14 +2510,6 @@ public function processExprNode(
 		if ($expr instanceof List_) {
 			// only in assign and foreach, processed elsewhere
 			return new ExpressionResult($scope, hasYield: false, isAlwaysTerminating: false, throwPoints: [], impurePoints: []);
-		} elseif ($expr instanceof AlwaysRememberedExpr) {
-			$result = $this->processExprNode($stmt, $expr->getExpr(), $scope, $storage, $nodeCallback, $context);
-			$hasYield = $result->hasYield();
-			$throwPoints = $result->getThrowPoints();
-			$impurePoints = $result->getImpurePoints();
-			$isAlwaysTerminating = $result->isAlwaysTerminating();
-			$scope = $result->getScope();
-			$expr = $expr->getExpr();
 		} elseif ($expr instanceof FunctionCallableNode) {
 			$throwPoints = [];
 			$impurePoints = [];