Merge pull request #366 from cakephp/5.x-fn-spacing

Add spacing check for arrow function closures.
cakephp · Nov 8, 2022 · 6cbe404 · 6cbe404
2 parents 947b2ac + 90baca0
commit 6cbe404
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/CakePHP/Sniffs/Functions/ClosureDeclarationSniff.php b/CakePHP/Sniffs/Functions/ClosureDeclarationSniff.php
@@ -27,7 +27,7 @@ class ClosureDeclarationSniff implements Sniff
      */
     public function register()
     {
-        return [T_CLOSURE];
+        return [T_CLOSURE, T_FN];
     }
 
     /**
@@ -43,7 +43,8 @@ public function process(File $phpcsFile, $stackPtr)
         }
 
         if ($spaces !== 1) {
-            $error = 'Expected 1 space after closure\'s function keyword; %s found';
+            $keyword = $tokens[$stackPtr]['code'] === T_FN ? 'fn' : 'function';
+            $error = "Expected 1 space after closure's $keyword keyword; %s found";
             $data = [$spaces];
             $phpcsFile->addError($error, $stackPtr, 'SpaceAfterFunction', $data);
         }

diff --git a/CakePHP/Tests/Functions/ClosureDeclarationUnitTest.inc b/CakePHP/Tests/Functions/ClosureDeclarationUnitTest.inc
@@ -21,6 +21,9 @@ class TraitUser
             echo 'It works';
         };
         $visitor($this);
+
+        $visitor = fn($expression) => echo 'It Fails';
+        $visitor = fn ($expression) => echo 'It works';
     }
 }
 
@@ -33,4 +36,4 @@ $zum = function()use ($foo, $bar) {
 
 $zum = function ()use ($foo, $bar) {
     return $foo;
-};
+};
diff --git a/CakePHP/Tests/Functions/ClosureDeclarationUnitTest.php b/CakePHP/Tests/Functions/ClosureDeclarationUnitTest.php
@@ -13,7 +13,8 @@ public function getErrorList()
     {
         return [
             17 => 1,
-            30 => 1,
+            25 => 1,
+            33 => 1,
         ];
     }