Do not add extra parentheses when changing the return type of callable

phpstan · May 29, 2023 · a8094fa · a8094fa
1 parent b0ea9f4
commit a8094fa
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 0 deletions.
diff --git a/src/Printer/Printer.php b/src/Printer/Printer.php
@@ -778,6 +778,12 @@ private function printNodeFormatPreserving(Node $node, TokenIterator $originalTo
 			$mapKey = get_class($node) . '->' . $subNodeName;
 			$parenthesesNeeded = isset($this->parenthesesMap[$mapKey])
 				&& in_array(get_class($subNode), $this->parenthesesMap[$mapKey], true);
+
+			if ($subNode->getAttribute(Attribute::ORIGINAL_NODE) !== null) {
+				$parenthesesNeeded = $parenthesesNeeded
+					&& !in_array(get_class($subNode->getAttribute(Attribute::ORIGINAL_NODE)), $this->parenthesesMap[$mapKey], true);
+			}
+
 			$addParentheses = $parenthesesNeeded && !$originalTokens->hasParentheses($subStartPos, $subEndPos);
 			if ($addParentheses) {
 				$result .= '(';

diff --git a/tests/PHPStan/Printer/PrinterTest.php b/tests/PHPStan/Printer/PrinterTest.php
@@ -1406,6 +1406,26 @@ public function enterNode(Node $node)
 
 			},
 		];
+
+		yield [
+			'/** @return callable(): (null|null) */',
+			'/** @return callable(): (int|null) */',
+			new class extends AbstractNodeVisitor {
+
+				public function enterNode(Node $node)
+				{
+					if ($node instanceof UnionTypeNode) {
+						$node->types = [
+							new IdentifierTypeNode('int'),
+							new IdentifierTypeNode('null'),
+						];
+					}
+
+					return $node;
+				}
+
+			},
+		];
 	}
 
 	/**