Add rules for ReturnTypeDeclaration

Author: antonioeatgoat

Inpsyde/PhpcsHelpers.php

@@ -288,7 +288,7 @@ public static function isHookClosure(
         /** @var array<int, array<string, mixed>> $tokens */
         $tokens = $file->getTokens();
 
-        if (($tokens[$position]['code'] ?? '') !== T_CLOSURE) {
+        if (!in_array(($tokens[$position]['code'] ?? ''), [T_CLOSURE, T_FN], true)) {
             return false;
         }
 
@@ -486,7 +486,7 @@ public static function functionBoundaries(File $file, int $position): array
         /** @var array<int, array<string, mixed>> $tokens */
         $tokens = $file->getTokens();
 
-        if (!in_array(($tokens[$position]['code'] ?? null), [T_FUNCTION, T_CLOSURE], true)) {
+        if (!in_array(($tokens[$position]['code'] ?? null), [T_FUNCTION, T_CLOSURE, T_FN], true)) {
             return [-1, -1];
         }
 
@@ -539,6 +539,15 @@ public static function returnsCountInfo(File $file, int $position): array
         /** @var array<int, array<string, mixed>> $tokens */
         $tokens = $file->getTokens();
 
+        if (T_FN === $tokens[$position]['code'] ?? null) {
+            return [
+                'nonEmpty' => 1,
+                'void' => 0,
+                'null' => 0,
+                'total' => 1,
+            ];
+        }
+
         $pos = $start + 1;
         while ($pos < $end) {
             list(, $innerFunctionEnd) = self::functionBoundaries($file, $pos);

Inpsyde/Sniffs/CodeQuality/ReturnTypeDeclarationSniff.php

@@ -38,7 +38,7 @@ public function register()
     {
         // phpcs:enable Inpsyde.CodeQuality
 
-        return [T_FUNCTION, T_CLOSURE];
+        return [T_FUNCTION, T_CLOSURE, T_FN];
     }
 
     /**
@@ -170,7 +170,9 @@ private function maybeErrors(
             return;
         }
 
-        $name = (string)$file->getDeclarationName($position);
+        $tokenCode = $file->getTokens()[$position]['code'] ?? '';
+        // TODO Remove check on T_FN if getDeclarationName() will support T_FN out of the box
+        $name = $tokenCode !== T_FN ? (string)$file->getDeclarationName($position) : '';
         if (
             PhpcsHelpers::functionIsMethod($file, $position)
             && (in_array($name, self::METHODS_WHITELIST, true) || strpos($name, '__') === 0)

tests/fixtures/return-type-declaration.php

@@ -218,6 +218,11 @@ function filter_wrapper(): bool
     return true;
 }
 
+// @phpcsWarningCodeOnNextLine NoReturnType
+fn() => true;
+
+fn(): bool => true;
+
 /**
  * @return string
  * @wp-hook Meh
@@ -266,6 +271,8 @@ public function filterWrapper(string $x, int $y): bool
             return "$x, $y";
         });
 
+        add_filter('x', fn($x, $y) => "$x, $y");
+
         return true;
     }
 
@@ -283,6 +290,8 @@ function ($x, $y) {
             10,
             2
         );
+
+        add_action('x', fn($x, $y) => "$x, $y");
     }
 
     // @phpcsWarningCodeOnNextLine NoReturnType