Make findPreviousFunctionPtr check token type

Author: sirbrillig

VariableAnalysis/Lib/Helpers.php

@@ -112,6 +112,12 @@ public static function areConditionsWithinFunctionBeforeClass(array $conditions)
   }
 
   /**
+   * Find the token index of the function keyword for an open brace
+   *
+   * Given the token index of an open curly brace, return the index of the
+   * function keyword for that brace, or null if the brace is not for a
+   * function.
+   *
    * @param File $phpcsFile
    * @param int $openPtr
    *
@@ -122,11 +128,24 @@ public static function findPreviousFunctionPtr(File $phpcsFile, $openPtr) {
     // so we look backwards from the opening bracket for the first thing that
     // isn't a function name, reference sigil or whitespace and check if it's a
     // function keyword.
-    $functionPtrTypes                = Tokens::$emptyTokens;
-    $functionPtrTypes[T_STRING]      = T_STRING;
-    $functionPtrTypes[T_BITWISE_AND] = T_BITWISE_AND;
+    $nonFunctionTokenTypes = Tokens::$emptyTokens;
+    $nonFunctionTokenTypes[T_STRING] = T_STRING;
+    $nonFunctionTokenTypes[T_BITWISE_AND] = T_BITWISE_AND;
+
+    $functionPtr = self::getIntOrNull($phpcsFile->findPrevious($nonFunctionTokenTypes, $openPtr - 1, null, true, null, true));
+    if (! is_int($functionPtr)) {
+      return null;
+    }
 
-    return self::getIntOrNull($phpcsFile->findPrevious($functionPtrTypes, $openPtr - 1, null, true, null, true));
+    $functionTokenTypes = [
+      T_FUNCTION,
+      T_CLOSURE,
+    ];
+    $tokens = $phpcsFile->getTokens();
+    if (in_array($tokens[$functionPtr]['code'], $functionTokenTypes, true)) {
+      return $functionPtr;
+    }
+    return null;
   }
 
   /**
@@ -275,11 +294,7 @@ public static function findFunctionDefinition(File $phpcsFile, $stackPtr) {
     if (! is_int($openPtr)) {
       return null;
     }
-    $functionPtr = Helpers::findPreviousFunctionPtr($phpcsFile, $openPtr);
-    if (($functionPtr !== null) && ($tokens[$functionPtr]['code'] === T_FUNCTION)) {
-      return $functionPtr;
-    }
-    return null;
+    return Helpers::findPreviousFunctionPtr($phpcsFile, $openPtr);
   }
 
   /**

VariableAnalysis/Sniffs/CodeAnalysis/VariableAnalysisSniff.php

@@ -491,14 +491,7 @@ protected function isVariableAFunctionDefinition(File $phpcsFile, $stackPtr, $va
     }
 
     $functionPtr = Helpers::findPreviousFunctionPtr($phpcsFile, $openPtr);
-    if (// phpcs:ignore PSR2.ControlStructures.ControlStructureSpacing.SpacingAfterOpenBrace
-      (is_int($functionPtr))
-      && (
-        ($tokens[$functionPtr]['code'] === T_FUNCTION)
-        || (FunctionDeclarations::isArrowFunction($phpcsFile, $functionPtr))
-        || ($tokens[$functionPtr]['code'] === T_CLOSURE)
-      )
-    ) {
+    if (is_int($functionPtr)) {
       $this->markVariableDeclaration($varName, ScopeType::PARAM, null, $stackPtr, $functionPtr);
       // Are we pass-by-reference?
       $referencePtr = $phpcsFile->findPrevious(Tokens::$emptyTokens, $stackPtr - 1, null, true, null, true);