Fix

Author: ondrejmirtes

src/Analyser/RuleErrorTransformer.php

@@ -9,9 +9,9 @@
 use PhpParser\NodeVisitor\CloningVisitor;
 use PhpParser\Parser;
 use PHPStan\File\FileReader;
+use PHPStan\Fixable\PhpPrinter;
 use PHPStan\Fixable\PhpPrinterIndentationDetectorVisitor;
 use PHPStan\Fixable\ReplacingNodeVisitor;
-use PHPStan\Node\Printer\Printer;
 use PHPStan\Node\VirtualNode;
 use PHPStan\Rules\FileRuleError;
 use PHPStan\Rules\FixableNodeRuleError;
@@ -126,7 +126,7 @@ public function transform(
 			/** @var Stmt[] $newStmts */
 			$newStmts = $traverser->traverse($newStmts);
 
-			$printer = new Printer(['indent' => str_repeat($indentDetector->indentCharacter, $indentDetector->indentSize)]);
+			$printer = new PhpPrinter(['indent' => str_repeat($indentDetector->indentCharacter, $indentDetector->indentSize)]);
 			$newCode = $printer->printFormatPreserving($newStmts, $fileNodes, $oldTokens);
 			$differ = new Differ();
 

src/Fixable/PhpPrinter.php

@@ -0,0 +1,35 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Fixable;
+
+use PhpParser\Node;
+use PhpParser\PrettyPrinter\Standard;
+use function count;
+use function rtrim;
+
+final class PhpPrinter extends Standard
+{
+
+	public const TAB_WIDTH = 4;
+	public const FUNC_ARGS_TRAILING_COMMA_ATTRIBUTE = 'trailing_comma';
+
+	/**
+	 * @param Node[] $nodes
+	 */
+	protected function pCommaSeparated(array $nodes): string
+	{
+		$result = parent::pCommaSeparated($nodes);
+		if (count($nodes) === 0) {
+			return $result;
+		}
+		$last = $nodes[count($nodes) - 1];
+
+		$trailingComma = $last->getAttribute(self::FUNC_ARGS_TRAILING_COMMA_ATTRIBUTE);
+		if ($trailingComma === false) {
+			$result = rtrim($result, ',');
+		}
+
+		return $result;
+	}
+
+}