Unwrap virtual nodes in AST when fixing code

Author: ondrejmirtes

src/Analyser/RuleErrorTransformer.php

@@ -12,6 +12,7 @@
 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;
@@ -118,6 +119,7 @@ public function transform(
 			$indentTraverser->traverse($fileNodes);
 
 			$cloningTraverser = new NodeTraverser();
+			$cloningTraverser->addVisitor(new UnwrapVirtualNodesVisitor());
 			$cloningTraverser->addVisitor(new CloningVisitor());
 
 			/** @var Stmt[] $newStmts */

src/Fixable/UnwrapVirtualNodesVisitor.php

@@ -0,0 +1,27 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Fixable;
+
+use PhpParser\Node;
+use PhpParser\NodeVisitorAbstract;
+use PHPStan\Node\Expr\AlwaysRememberedExpr;
+
+final class UnwrapVirtualNodesVisitor extends NodeVisitorAbstract
+{
+
+	public function enterNode(Node $node): ?Node
+	{
+		if (!$node instanceof Node\Expr\Match_) {
+			return null;
+		}
+
+		if (!$node->cond instanceof AlwaysRememberedExpr) {
+			return null;
+		}
+
+		$node->cond = $node->cond->expr;
+
+		return $node;
+	}
+
+}

tests/PHPStan/Build/NamedArgumentsRuleTest.php

@@ -64,4 +64,16 @@ public function testFix(): void
 		);
 	}
 
+	public function testFixFileWithMatch(): void
+	{
+		if (PHP_VERSION_ID < 80000) {
+			$this->markTestSkipped('Test requires PHP 8.0.');
+		}
+
+		$this->fix(
+			__DIR__ . '/data/named-arguments-match.php',
+			__DIR__ . '/data/named-arguments-match.php.fixed',
+		);
+	}
+
 }

tests/PHPStan/Build/data/named-arguments-match.php

@@ -0,0 +1,16 @@
+<?php // lint >= 8.0
+
+namespace NamedArgumentsMatchRule;
+
+use Exception;
+
+function (bool $a, bool $b): void {
+	foreach ([1, 2, 3] as $v) {
+		match (true) {
+			$a => 1,
+			$b => 2,
+			default => 3,
+		};
+		new Exception('foo', 0, new Exception('prev'));
+	}
+};

tests/PHPStan/Build/data/named-arguments-match.php.fixed

@@ -0,0 +1,16 @@
+<?php // lint >= 8.0
+
+namespace NamedArgumentsMatchRule;
+
+use Exception;
+
+function (bool $a, bool $b): void {
+	foreach ([1, 2, 3] as $v) {
+		match (true) {
+			$a => 1,
+			$b => 2,
+			default => 3,
+		};
+		new Exception('foo', previous: new Exception('prev'));
+	}
+};