Use multi-line attributes for params when targeting PHP <8.0

When the pretty printer targets a version older than PHP 8,
print the attributes for parameters on a separate line, so that
they are interpreted as comments.

Fixes #1081.

Author: nikic

lib/PhpParser/PhpVersion.php

@@ -161,4 +161,11 @@ public function supportsYieldWithoutParentheses(): bool {
     public function supportsUnicodeEscapes(): bool {
         return $this->id >= 70000;
     }
+
+    /*
+     * Whether this version supports attributes.
+     */
+    public function supportsAttributes(): bool {
+        return $this->id >= 80000;
+    }
 }

lib/PhpParser/PrettyPrinter/Standard.php

@@ -17,7 +17,7 @@ class Standard extends PrettyPrinterAbstract {
     // Special nodes
 
     protected function pParam(Node\Param $node): string {
-        return $this->pAttrGroups($node->attrGroups, true)
+        return $this->pAttrGroups($node->attrGroups, $this->phpVersion->supportsAttributes())
              . $this->pModifiers($node->flags)
              . ($node->type ? $this->p($node->type) . ' ' : '')
              . ($node->byRef ? '&' : '')
@@ -656,7 +656,7 @@ protected function pExpr_Closure(Expr\Closure $node): string {
         return $this->pAttrGroups($node->attrGroups, true)
              . $this->pStatic($node->static)
              . 'function ' . ($node->byRef ? '&' : '')
-             . '(' . $this->pMaybeMultiline($node->params, $this->phpVersion->supportsTrailingCommaInParamList()) . ')'
+             . '(' . $this->pParams($node->params) . ')'
              . (!empty($node->uses) ? ' use (' . $this->pCommaSeparated($node->uses) . ')' : '')
              . (null !== $node->returnType ? ': ' . $this->p($node->returnType) : '')
              . ' {' . $this->pStmts($node->stmts) . $this->nl . '}';
@@ -688,7 +688,7 @@ protected function pExpr_ArrowFunction(Expr\ArrowFunction $node, int $precedence
             $this->pAttrGroups($node->attrGroups, true)
             . $this->pStatic($node->static)
             . 'fn' . ($node->byRef ? '&' : '')
-            . '(' . $this->pMaybeMultiline($node->params, $this->phpVersion->supportsTrailingCommaInParamList()) . ')'
+            . '(' . $this->pParams($node->params) . ')'
             . (null !== $node->returnType ? ': ' . $this->p($node->returnType) : '')
             . ' => ',
             $node->expr, $precedence, $lhsPrecedence);
@@ -845,7 +845,7 @@ protected function pPropertyHook(Node\PropertyHook $node): string {
         return $this->pAttrGroups($node->attrGroups)
              . $this->pModifiers($node->flags)
              . ($node->byRef ? '&' : '') . $node->name
-             . ($node->params ? '(' . $this->pMaybeMultiline($node->params, $this->phpVersion->supportsTrailingCommaInParamList()) . ')' : '')
+             . ($node->params ? '(' . $this->pParams($node->params) . ')' : '')
              . (\is_array($node->body) ? ' {' . $this->pStmts($node->body) . $this->nl . '}'
                 : ($node->body !== null ? ' => ' . $this->p($node->body) : '') . ';');
     }
@@ -854,7 +854,7 @@ protected function pStmt_ClassMethod(Stmt\ClassMethod $node): string {
         return $this->pAttrGroups($node->attrGroups)
              . $this->pModifiers($node->flags)
              . 'function ' . ($node->byRef ? '&' : '') . $node->name
-             . '(' . $this->pMaybeMultiline($node->params, $this->phpVersion->supportsTrailingCommaInParamList()) . ')'
+             . '(' . $this->pParams($node->params) . ')'
              . (null !== $node->returnType ? ': ' . $this->p($node->returnType) : '')
              . (null !== $node->stmts
                 ? $this->nl . '{' . $this->pStmts($node->stmts) . $this->nl . '}'
@@ -872,7 +872,7 @@ protected function pStmt_ClassConst(Stmt\ClassConst $node): string {
     protected function pStmt_Function(Stmt\Function_ $node): string {
         return $this->pAttrGroups($node->attrGroups)
              . 'function ' . ($node->byRef ? '&' : '') . $node->name
-             . '(' . $this->pMaybeMultiline($node->params, $this->phpVersion->supportsTrailingCommaInParamList()) . ')'
+             . '(' . $this->pParams($node->params) . ')'
              . (null !== $node->returnType ? ': ' . $this->p($node->returnType) : '')
              . $this->nl . '{' . $this->pStmts($node->stmts) . $this->nl . '}';
     }
@@ -1179,6 +1179,27 @@ protected function pMaybeMultiline(array $nodes, bool $trailingComma = false): s
         }
     }
 
+    /** @param Node\Param[] $params
+     */
+    private function hasParamWithAttributes(array $params): bool {
+        foreach ($params as $param) {
+            if ($param->attrGroups) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /** @param Node\Param[] $params */
+    protected function pParams(array $params): string {
+        if ($this->hasNodeWithComments($params) ||
+            ($this->hasParamWithAttributes($params) && !$this->phpVersion->supportsAttributes())
+        ) {
+            return $this->pCommaSeparatedMultiline($params, $this->phpVersion->supportsTrailingCommaInParamList()) . $this->nl;
+        }
+        return $this->pCommaSeparated($params);
+    }
+
     /** @param Node\AttributeGroup[] $nodes */
     protected function pAttrGroups(array $nodes, bool $inline = false): string {
         $result = '';

test/PhpParser/BuilderFactoryTest.php

@@ -365,7 +365,10 @@ function firstMethod()
      * @param SomeClass And takes a parameter
      */
     abstract public function someMethod(SomeClass $someParam);
-    protected function anotherMethod(#[TaggedIterator('app.handlers')] $someParam = 'test')
+    protected function anotherMethod(
+        #[TaggedIterator('app.handlers')]
+        $someParam = 'test'
+    )
     {
         print $someParam;
     }

test/PhpParser/NodeVisitor/NameResolverTest.php

@@ -283,12 +283,18 @@ class A extends \NS\B implements \NS\C, \NS\D
     public const \X\Foo C = \X\Foo::Bar;
     public \NS\Foo $foo {
         #[\NS\X]
-        set(#[\NS\X] \NS\Bar $v) {
+        set(
+            #[\NS\X]
+            \NS\Bar $v
+        ) {
         }
     }
     public function __construct(public \NS\Foo $bar {
         #[\NS\X]
-        set(#[\NS\X] \NS\Bar $v) {
+        set(
+            #[\NS\X]
+            \NS\Bar $v
+        ) {
         }
     })
     {
@@ -312,7 +318,10 @@ trait A
 {
 }
 #[\NS\X]
-function f(#[\NS\X] \NS\A $a): \NS\A
+function f(
+    #[\NS\X]
+    \NS\A $a
+): \NS\A
 {
 }
 function f2(array $a): array

test/code/prettyPrinter/stmt/attributes.test

@@ -38,7 +38,10 @@ function a()
 class C
 {
     #[A6]
-    public function m(#[A7] $param)
+    public function m(
+        #[A7]
+        $param
+    )
     {
     }
     #[A12]
@@ -57,4 +60,12 @@ $x = #[A10] function () {
 $y = #[A11] fn() => 0;
 new #[A13] class
 {
-};
+};
+-----
+<?php
+function test(#[A] $b) {}
+-----
+!!version=8.0
+function test(#[A] $b)
+{
+}