Allow functions to be called fn for backwards compatibility (ref #2523)

squizlabs · Nov 7, 2019 · 37dda44 · 37dda44
1 parent 24b898c
commit 37dda44
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/src/Files/File.php b/src/Files/File.php
@@ -1254,7 +1254,9 @@ public function getDeclarationName($stackPtr)
 
         $content = null;
         for ($i = $stackPtr; $i < $this->numTokens; $i++) {
-            if ($this->tokens[$i]['code'] === T_STRING) {
+            if ($this->tokens[$i]['code'] === T_STRING
+                || $this->tokens[$i]['code'] === T_FN
+            ) {
                 $content = $this->tokens[$i]['content'];
                 break;
             }

diff --git a/src/Sniffs/AbstractPatternSniff.php b/src/Sniffs/AbstractPatternSniff.php
@@ -614,7 +614,9 @@ protected function processPattern($patternInfo, File $phpcsFile, $stackPtr)
                     $stackPtr = ($tokens[$next][$pattern[$i]['to']] + 1);
                 }//end if
             } else if ($pattern[$i]['type'] === 'string') {
-                if ($tokens[$stackPtr]['code'] !== T_STRING) {
+                if ($tokens[$stackPtr]['code'] !== T_STRING
+                    && $tokens[$stackPtr]['code'] !== T_FN
+                ) {
                     $hasError = true;
                 }
 

diff --git a/src/Standards/Squiz/Tests/Functions/FunctionDeclarationUnitTest.inc b/src/Standards/Squiz/Tests/Functions/FunctionDeclarationUnitTest.inc
@@ -72,3 +72,4 @@ function self() {}
 function false() {}
 function true() {}
 function null() {}
+function fn() {}