fix - invalid visibility - kokororin/vscode-phpfmt#197

Author: driade

fmt.stub.php

@@ -7214,16 +7214,22 @@ public function format($source)
                         $this->appendCode($text);
                         break;
                     case T_STATIC:
-                        if (! $this->leftTokenIs(T_DOUBLE_COLON)) {
+                        // `static` can be used as a type (e.g. `instanceof static`, `function f(): static`).
+                        // Do not treat it as a member modifier in those contexts.
+                        if ($this->leftUsefulTokenIs([T_INSTANCEOF, ST_COLON])) {
+                            $this->appendCode($text);
+                            break;
+                        }
+                        if (! $this->leftUsefulTokenIs(T_DOUBLE_COLON)) {
                             if (! is_null($visibility)) {
                                 $static          = $text;
                                 $skipWhitespaces = true;
                                 break;
-                            } elseif ($this->leftTokenIs([T_FINAL])) {
+                            } elseif ($this->leftUsefulTokenIs([T_FINAL])) {
                                 $static     = $text;
                                 $visibility = 'public';
                                 break;
-                            } elseif (! $this->rightTokenIs([T_VARIABLE, T_DOUBLE_COLON]) && ! $this->leftTokenIs([T_NEW, ST_COMMA])) {
+                            } elseif (! $this->rightTokenIs([T_VARIABLE, T_DOUBLE_COLON]) && ! $this->leftUsefulTokenIs([T_NEW, ST_COMMA])) {
                                 $static          = $text;
                                 $skipWhitespaces = true;
                                 break;

tests/Original/540-instanceof-static.in

@@ -0,0 +1,10 @@
+<?php
+//passes:PSR2ModifierVisibilityStaticOrder
+
+class Example {
+    public function check(object $object) {
+        return $object instanceof static;
+    }
+}
+
+$example = new Example();

tests/Original/540-instanceof-static.out

@@ -0,0 +1,10 @@
+<?php
+//passes:PSR2ModifierVisibilityStaticOrder
+
+class Example {
+	public function check(object $object) {
+		return $object instanceof static;
+	}
+}
+
+$example = new Example();

tests/Original/541-new-static.in

@@ -0,0 +1,8 @@
+<?php
+//passes:PSR2ModifierVisibilityStaticOrder
+
+class Example {
+    public function make() {
+        return new static();
+    }
+}

tests/Original/541-new-static.out

@@ -0,0 +1,8 @@
+<?php
+//passes:PSR2ModifierVisibilityStaticOrder
+
+class Example {
+	public function make() {
+		return new static();
+	}
+}

tests/Original/542-return-type-static.in

@@ -0,0 +1,9 @@
+<?php
+//version:8.0
+//passes:PSR2ModifierVisibilityStaticOrder
+
+class Example {
+    public function me(): static {
+        return $this;
+    }
+}

tests/Original/542-return-type-static.out

@@ -0,0 +1,9 @@
+<?php
+//version:8.0
+//passes:PSR2ModifierVisibilityStaticOrder
+
+class Example {
+	public function me(): static {
+		return $this;
+	}
+}