test: array tests

Author: dkarlovi

lib/PhpParser/Node/Expr/Array_.php

@@ -9,6 +9,7 @@ class Array_ extends Expr {
     // For use in "kind" attribute
     public const KIND_LONG = 1;  // array() syntax
     public const KIND_SHORT = 2; // [] syntax
+    public const KIND_MULTILINE = 4; // force multiline formatting
 
     /** @var ArrayItem[] Items */
     public array $items;

lib/PhpParser/PrettyPrinter/Standard.php

@@ -592,12 +592,16 @@ protected function pExpr_Variable(Expr\Variable $node): string {
     }
 
     protected function pExpr_Array(Expr\Array_ $node): string {
-        $syntax = $node->getAttribute('kind',
+        $kind = $node->getAttribute('kind',
             $this->shortArraySyntax ? Expr\Array_::KIND_SHORT : Expr\Array_::KIND_LONG);
+
+        $forceMultiline = ($kind & Expr\Array_::KIND_MULTILINE) === Expr\Array_::KIND_MULTILINE;
+        $syntax = $kind & ~Expr\Array_::KIND_MULTILINE;
+        
         if ($syntax === Expr\Array_::KIND_SHORT) {
-            return '[' . $this->pMaybeMultiline($node->items, true) . ']';
+            return '[' . $this->pMaybeMultiline($node->items, true, $forceMultiline) . ']';
         } else {
-            return 'array(' . $this->pMaybeMultiline($node->items, true) . ')';
+            return 'array(' . $this->pMaybeMultiline($node->items, true, $forceMultiline) . ')';
         }
     }
 
@@ -1171,12 +1175,12 @@ protected function hasNodeWithComments(array $nodes): bool {
     }
 
     /** @param Node[] $nodes */
-    protected function pMaybeMultiline(array $nodes, bool $trailingComma = false): string {
-        if (!$this->hasNodeWithComments($nodes)) {
-            return $this->pCommaSeparated($nodes);
-        } else {
+    protected function pMaybeMultiline(array $nodes, bool $trailingComma = false, bool $forceMultiline = false): string {
+        if ($forceMultiline || $this->hasNodeWithComments($nodes)) {
             return $this->pCommaSeparatedMultiline($nodes, $trailingComma) . $this->nl;
         }
+
+        return $this->pCommaSeparated($nodes);
     }
 
     /** @param Node\AttributeGroup[] $nodes */

test/code/prettyPrinter/stmt/arrays.test

@@ -0,0 +1,22 @@
+Arrays
+-----
+<?php
+
+$short = [1, 2, 3];
+$shortMultiline = [
+    1,
+    2,
+    3
+];
+
+$long = array(1, 2, 3);
+$longMultiline = array(
+    1,
+    2,
+    3
+);
+-----
+$short = [1, 2, 3];
+$shortMultiline = [1, 2, 3];
+$long = array(1, 2, 3);
+$longMultiline = array(1, 2, 3);