fix - invalid visibility - another way to solve commit 1163b31 with better results - kokororin/vscode-phpfmt#172

Author: driade

fmt.stub.php

@@ -6589,21 +6589,8 @@ public function format($source) {
 					}
 					break;
                 case '?':
-                    $peek = null;
-                    $i = $this->ptr + 1;
-                    $futile_tokens = array_merge($this->ignoreFutileTokens, [T_STRING, T_ARRAY, T_NAME_RELATIVE, T_NAME_QUALIFIED, T_NAME_FULLY_QUALIFIED]);
-                    while (1) {
-                        if (count($this->tkns) <= ++$i) {
-                            break;
-                        }
-                        $mpeek = $this->tkns[$i];
-                        if (isset($mpeek[0]) && ! in_array($mpeek[0], $futile_tokens)) {
-                            $peek = $mpeek[0];
-                            break;
-                        }
-                    }
-                    if ($this->rightTokenIs([T_STRING, T_ARRAY, T_NAME_RELATIVE, T_NAME_QUALIFIED, T_NAME_FULLY_QUALIFIED]) && $peek === T_VARIABLE) {
-                        $type = '?';
+                    if ($this->rightUsefulTokenIs([T_STRING, T_ARRAY, T_NAME_RELATIVE, T_NAME_QUALIFIED, T_NAME_FULLY_QUALIFIED])) {
+                        $this->tkns[$this->ptr + 1][1] = $text . $this->tkns[$this->ptr + 1][1];
                     } else {
                         $this->appendCode($text);
                     }

tests/Original/510-invalid-visibility-order.in

@@ -0,0 +1,12 @@
+<?php
+//passes:PSR2ModifierVisibilityStaticOrder
+//version:8
+function foo(?string $bar): void {
+}
+class Foo {
+    static public function bar(?string $baz) {
+    }
+}
+
+function faa(?string $bar): void {
+}

tests/Original/510-invalid-visibility-order.out

@@ -0,0 +1,12 @@
+<?php
+//passes:PSR2ModifierVisibilityStaticOrder
+//version:8
+function foo(?string $bar): void {
+}
+class Foo {
+	public static function bar(?string $baz) {
+	}
+}
+
+function faa(?string $bar): void {
+}