Add support for static short closures

inpsyde · Aug 25, 2023 · 8c92e99 · 8c92e99
1 parent 2ec02f5
commit 8c92e99
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 19 deletions.
diff --git a/Inpsyde/PhpcsHelpers.php b/Inpsyde/PhpcsHelpers.php
@@ -342,7 +342,7 @@ public static function functionDocBlockTags(
 
         if (
             !array_key_exists($position, $tokens)
-            || !in_array($tokens[$position]['code'], [T_FUNCTION, T_CLOSURE], true)
+            || !in_array($tokens[$position]['code'], [T_FUNCTION, T_CLOSURE, T_FN], true)
         ) {
             return [];
         }
@@ -480,7 +480,7 @@ public static function functionBody(File $file, int $position): string
     /**
      * @param File $file
      * @param int $position
-     * @return array{int, int}
+     * @return list{int, int}
      */
     public static function functionBoundaries(File $file, int $position): array
     {
@@ -491,19 +491,13 @@ public static function functionBoundaries(File $file, int $position): array
             return [-1, -1];
         }
 
-        $functionStart = (int)($tokens[$position]['scope_opener'] ?? 0);
-        $functionEnd = (int)($tokens[$position]['scope_closer'] ?? 0);
-        if ($functionStart <= 0 || $functionEnd <= 0 || $functionStart >= ($functionEnd - 1)) {
-            return [-1, -1];
-        }
-
-        return [$functionStart, $functionEnd];
+        return static::boundaries($tokens, $position);
     }
 
     /**
      * @param File $file
      * @param int $position
-     * @return array{int, int}
+     * @return list{int, int}
      */
     public static function classBoundaries(File $file, int $position): array
     {
@@ -514,13 +508,7 @@ public static function classBoundaries(File $file, int $position): array
             return [-1, -1];
         }
 
-        $start = (int)($tokens[$position]['scope_opener'] ?? 0);
-        $end = (int)($tokens[$position]['scope_closer'] ?? 0);
-        if ($start <= 0 || $end <= 0 || $start >= ($end - 1)) {
-            return [-1, -1];
-        }
-
-        return [$start, $end];
+        return static::boundaries($tokens, $position);
     }
 
     /**
@@ -728,4 +716,20 @@ public static function isUntypedPsrMethod(File $file, int $position): bool
 
         return false;
     }
+
+    /**
+     * @param array<int, array<string, mixed>> $tokens
+     * @param int $position
+     * @return list{int, int}
+     */
+    private static function boundaries(array $tokens, int $position): array
+    {
+        $start = (int)($tokens[$position]['scope_opener'] ?? 0);
+        $end = (int)($tokens[$position]['scope_closer'] ?? 0);
+        if ($start <= 0 || $end <= 0 || $start >= ($end - 1)) {
+            return [-1, -1];
+        }
+
+        return [$start, $end];
+    }
 }
diff --git a/Inpsyde/Sniffs/CodeQuality/StaticClosureSniff.php b/Inpsyde/Sniffs/CodeQuality/StaticClosureSniff.php
@@ -11,11 +11,11 @@
 class StaticClosureSniff implements Sniff
 {
     /**
-     * @return list<string>
+     * @return list<int|string>
      */
     public function register(): array
     {
-        return [T_CLOSURE];
+        return [T_CLOSURE, T_FN];
     }
 
     /**

diff --git a/tests/fixtures/static-closure.php b/tests/fixtures/static-closure.php
@@ -32,6 +32,10 @@ function () {
     return $foo;
 };
 
+fn() => $this;
+
+static fn() => 'Foo';
+
 static function () {
     return 'Foo';
 };
@@ -60,6 +64,8 @@ public function b()
             return 'Foo';
         };
 
+        $a = fn () => 'x'; // @phpcsWarningOnThisLine
+
         return $a;
     }
 
@@ -80,5 +86,13 @@ function () {
         function () {
             return 'Foo';
         };
+
+        /** @bound */
+        fn() => 'Foo';
+
+        fn() => $this;
     }
 }
+
+add_filter('x', fn() => 'y'); // @phpcsWarningOnThisLine
+add_filter('x', static fn() => 'y');