fix - kokororin/vscode-phpfmt#196

Author: driade

fmt.stub.php

@@ -1709,6 +1709,11 @@ function tabwriter(array $lines)
         define('T_NAME_RELATIVE', 'namespace');
     }
 
+    // PHP 7.4
+    if (! defined("T_FN")) {
+        define("T_FN", "fn");
+    }
+
     // PHP 8
     if (! defined("T_READONLY")) {
         define("T_READONLY", "readonly");
@@ -7248,6 +7253,18 @@ public function format($source)
                         $this->appendCode($text);
                         break;
 
+                    case T_FN:
+                        if (null !== $static) {
+                            $this->appendCode($static . $this->getSpace());
+                            $static          = null;
+                            $skipWhitespaces = false;
+                        }
+                        $this->appendCode($text);
+                        $visibility      = null;
+                        $readonly        = null;
+                        $finalOrAbstract = null;
+                        $type            = null;
+                        break;
                     case T_CONST:
                     case T_FUNCTION:
                         if (empty($classCurlyDepthStack)) {

tests/Original/053-wrong-alignment.in

@@ -1,4 +1,5 @@
 <?php
+//version:5.6.0
 $obj = new StdClass();
 !$obj->LL || $obj->LL->l(__CLASS__, sprintf("Msg [%d] : %s", $obj2->gs(), $obj2->ge()));
 !$llll_ttt || $obj->ssss_ttttt($obj3->gv(), $ttttt_ppppppp, ConstantBAG::CONSTANT, $obj2, $dddd_rrr);

tests/Original/053-wrong-alignment.out

@@ -1,4 +1,5 @@
 <?php
+//version:5.6.0
 $obj = new StdClass();
 !$obj->LL || $obj->LL->l(__CLASS__, sprintf("Msg [%d] : %s", $obj2->gs(), $obj2->ge()));
 !$llll_ttt || $obj->ssss_ttttt($obj3->gv(), $ttttt_ppppppp, ConstantBAG::CONSTANT, $obj2, $dddd_rrr);

tests/PSR/053-issue-196-static-arrow.in

@@ -0,0 +1,10 @@
+<?php
+//version:7.4.0
+
+class Example {
+    public Closure $fn;
+    public function __construct()
+    {
+        $this->fn = static fn() => 'fn';
+    }
+}

tests/PSR/053-issue-196-static-arrow.out

@@ -0,0 +1,11 @@
+<?php
+//version:7.4.0
+
+class Example
+{
+    public Closure $fn;
+    public function __construct()
+    {
+        $this->fn = static fn() => 'fn';
+    }
+}

tests/PSR/054-issue-196-static-arrow-nested.in

@@ -0,0 +1,11 @@
+<?php
+//version:7.4.0
+
+class Example {
+    public function build()
+    {
+        $factory = static fn(int $x): int => $x + 1;
+        $wrapper = static fn() => static fn() => 'ok';
+        return $factory(1) . $wrapper()();
+    }
+}

tests/PSR/054-issue-196-static-arrow-nested.out

@@ -0,0 +1,12 @@
+<?php
+//version:7.4.0
+
+class Example
+{
+    public function build()
+    {
+        $factory = static fn(int $x): int => $x + 1;
+        $wrapper = static fn()            => static fn()            => 'ok';
+        return $factory(1) . $wrapper()();
+    }
+}

tests/PSR/055-issue-196-static-arrow-global.in

@@ -0,0 +1,17 @@
+<?php
+//version:7.4.0
+
+$fn = static fn() => 'root';
+
+class Example {
+    public function __construct()
+    {
+        $local = static fn() => 'local';
+        $this->run($local);
+    }
+
+    private function run(Closure $fn)
+    {
+        $fn();
+    }
+}

tests/PSR/055-issue-196-static-arrow-global.out

@@ -0,0 +1,18 @@
+<?php
+//version:7.4.0
+
+$fn = static fn() => 'root';
+
+class Example
+{
+    public function __construct()
+    {
+        $local = static fn() => 'local';
+        $this->run($local);
+    }
+
+    private function run(Closure $fn)
+    {
+        $fn();
+    }
+}

tests/PSR/056-issue-196-static-arrow-attributes.in

@@ -0,0 +1,10 @@
+<?php
+//version:8.0.0
+
+class Example {
+    #[SomeAttr]
+    public function build()
+    {
+        return static fn() => 'attr';
+    }
+}