fix - PSR visibility reordering for intersection and DNF property types - kokororin/vscode-phpfmt#199

Author: driade

fmt.stub.php

@@ -7102,8 +7102,17 @@ public function format($source)
                         break;
                     case ST_PARENTHESES_OPEN:
                     case ST_PARENTHESES_CLOSE:
-                        $this->appendCode($text);
-                        $touchedClassInterfaceTrait = false;
+                        if (
+                            null !== $visibility ||
+                            null !== $finalOrAbstract ||
+                            null !== $static ||
+                            null !== $type
+                        ) {
+                            $type .= $text;
+                        } else {
+                            $this->appendCode($text);
+                            $touchedClassInterfaceTrait = false;
+                        }
                         break;
                     case T_WHITESPACE:
                         if (! $skipWhitespaces) {
@@ -7124,6 +7133,7 @@ public function format($source)
                         $this->appendCode($text);
                         break;
                     case '|':
+                    case T_AMPERSAND_NOT_FOLLOWED_BY_VAR_OR_VARARG:
                     case T_NAME_RELATIVE:
                     case T_NAME_QUALIFIED:
                     case T_NAME_FULLY_QUALIFIED:

tests/PSR/057-issue-199-intersection-types.in

@@ -0,0 +1,15 @@
+<?php
+//version:8.1.0
+
+class A
+{
+
+}
+class B
+{
+
+}
+class C
+{
+    public A&B $test;
+}

tests/PSR/057-issue-199-intersection-types.out

@@ -0,0 +1,15 @@
+<?php
+//version:8.1.0
+
+class A
+{
+
+}
+class B
+{
+
+}
+class C
+{
+    public A&B $test;
+}

tests/PSR/058-issue-199-intersection-modifiers-and-promotion.in

@@ -0,0 +1,18 @@
+<?php
+//version:8.1.0
+
+class A
+{}
+interface B
+{}
+
+class Example
+{
+    public A&B $plain;
+    private readonly A&B $readonlyProp;
+    protected static A&B $shared;
+
+    public function __construct(public A&B $promoted, private readonly A&B $promotedReadonly)
+    {
+    }
+}

tests/PSR/058-issue-199-intersection-modifiers-and-promotion.out

@@ -0,0 +1,18 @@
+<?php
+//version:8.1.0
+
+class A
+{}
+interface B
+{}
+
+class Example
+{
+    public A&B $plain;
+    private readonly A&B $readonlyProp;
+    protected static A&B $shared;
+
+    public function __construct(public A&B $promoted, private readonly A&B $promotedReadonly)
+    {
+    }
+}

tests/PSR/059-issue-199-dnf-types.in

@@ -0,0 +1,19 @@
+<?php
+//version:8.2.0
+
+class A
+{}
+interface B
+{}
+interface C
+{}
+
+class Example
+{
+    public (A&B)|C $choice;
+    private C|(A&B) $choice2;
+
+    public function __construct(public (A&B)|C $promoted)
+    {
+    }
+}

tests/PSR/059-issue-199-dnf-types.out

@@ -0,0 +1,19 @@
+<?php
+//version:8.2.0
+
+class A
+{}
+interface B
+{}
+interface C
+{}
+
+class Example
+{
+    public (A&B)|C $choice;
+    private C|(A&B) $choice2;
+
+    public function __construct(public (A&B) | C $promoted)
+    {
+    }
+}