Immediate unwrap AlwaysRememberedExpr after used on NodeScopeResolver

Author: samsonasik

src/Analyser/NodeScopeResolver.php

@@ -4367,13 +4367,19 @@ function (MutatingScope $scope) use ($stmt, $expr, $nodeCallback, $context, $sto
 			ksort($armNodes, SORT_NUMERIC);
 
 			$this->callNodeCallback($nodeCallback, new MatchExpressionNode($expr->cond, array_values($armNodes), $expr, $matchScope), $scope, $storage);
+
+			if ($expr->cond instanceof AlwaysRememberedExpr) {
+				$expr->cond = $expr->cond->getExpr();
+			}
 		} 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 Expr\Throw_) {
 			$hasYield = false;
 			$result = $this->processExprNode($stmt, $expr->expr, $scope, $storage, $nodeCallback, ExpressionContext::createDeep());

src/Analyser/RuleErrorTransformer.php

@@ -14,7 +14,6 @@
 use PHPStan\Fixable\PhpPrinter;
 use PHPStan\Fixable\PhpPrinterIndentationDetectorVisitor;
 use PHPStan\Fixable\ReplacingNodeVisitor;
-use PHPStan\Fixable\UnwrapVirtualNodesVisitor;
 use PHPStan\Node\VirtualNode;
 use PHPStan\Rules\FileRuleError;
 use PHPStan\Rules\FixableNodeRuleError;
@@ -124,7 +123,6 @@ public function transform(
 			$indentTraverser->traverse($fileNodes);
 
 			$cloningTraverser = new NodeTraverser();
-			$cloningTraverser->addVisitor(new UnwrapVirtualNodesVisitor());
 			$cloningTraverser->addVisitor(new CloningVisitor());
 
 			/** @var Stmt[] $newStmts */