Symfony: don't suppress newlines in parameter lists with trailing commas

lkrms · Jan 8, 2025 · e17d24d · e17d24d
1 parent 262de6c
commit e17d24d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/docs/Rules.md b/docs/Rules.md
diff --git a/src/Contract/ListRule.php b/src/Contract/ListRule.php
@@ -25,6 +25,8 @@ interface ListRule extends Rule
      * Each token in `$items` is the first code token after `$parent` or a
      * delimiter.
      *
+     * `$lastChild` is the last code token in the list. It may be a delimiter.
+     *
      * This method is not called for empty lists.
      */
     public function processList(Token $parent, TokenCollection $items, Token $lastChild): void;

diff --git a/src/Rule/Preset/Symfony.php b/src/Rule/Preset/Symfony.php
@@ -98,12 +98,15 @@ public function processTokens(array $tokens): void
     /**
      * Apply the rule to a token and the list of items associated with it
      *
-     * Newlines are suppressed between parameters in function declarations that
-     * have no promoted constructor parameters.
+     * Newlines are suppressed in parameter lists with no promoted constructor
+     * parameters and no trailing comma.
      */
     public function processList(Token $parent, TokenCollection $items, Token $lastChild): void
     {
-        if (!$parent->isParameterList()) {
+        if (
+            !$parent->isParameterList()
+            || $lastChild->id === \T_COMMA
+        ) {
             return;
         }