Replace scope_opener/closer with getArrowFunctionOpenClose

Author: sirbrillig

VariableAnalysis/Lib/Helpers.php

@@ -467,14 +467,16 @@ public static function isTokenInsideArrowFunctionBody(File $phpcsFile, $stackPtr
    * @return ?int
    */
   public static function getContainingArrowFunctionIndex(File $phpcsFile, $stackPtr) {
-    $tokens = $phpcsFile->getTokens();
     $arrowFunctionIndex = self::getPreviousArrowFunctionIndex($phpcsFile, $stackPtr);
     if (! is_int($arrowFunctionIndex)) {
       return null;
     }
-    $arrowFunctionToken = $tokens[$arrowFunctionIndex];
-    $arrowFunctionScopeStart = $arrowFunctionToken['scope_opener'];
-    $arrowFunctionScopeEnd = $arrowFunctionToken['scope_closer'];
+    $arrowFunctionInfo = FunctionDeclarations::getArrowFunctionOpenClose($phpcsFile, $arrowFunctionIndex);
+    if (! $arrowFunctionInfo) {
+      return null;
+    }
+    $arrowFunctionScopeStart = $arrowFunctionInfo['scope_opener'];
+    $arrowFunctionScopeEnd = $arrowFunctionInfo['scope_closer'];
     if ($stackPtr > $arrowFunctionScopeStart && $stackPtr < $arrowFunctionScopeEnd) {
       return $arrowFunctionIndex;
     }

VariableAnalysis/Sniffs/CodeAnalysis/VariableAnalysisSniff.php

@@ -171,8 +171,12 @@ public function process(File $phpcsFile, $stackPtr) {
       T_CLOSURE,
     ];
 
-    $scopeIndexThisCloses = array_reduce($this->scopeStartIndices, function ($found, $index) use ($stackPtr, $tokens) {
+    $scopeIndexThisCloses = array_reduce($this->scopeStartIndices, function ($found, $index) use ($phpcsFile, $stackPtr, $tokens) {
       $scopeCloserIndex = isset($tokens[$index]['scope_closer']) ? $tokens[$index]['scope_closer'] : null;
+      if (FunctionDeclarations::isArrowFunction($phpcsFile, $index)) {
+        $arrowFunctionInfo = FunctionDeclarations::getArrowFunctionOpenClose($phpcsFile, $index);
+        $scopeCloserIndex = $arrowFunctionInfo ? $arrowFunctionInfo['scope_closer'] : $scopeCloserIndex;
+      }
       if (!$scopeCloserIndex) {
         Helpers::debug('No scope closer found for scope start', $index);
       }