Stop using scope_condition in findVariableScopeExceptArrowFunctions

sirbrillig · sirbrillig · commit d072fa7e22b2 · 2020-07-06T20:23:48.000-04:00
diff --git a/VariableAnalysis/Lib/Helpers.php b/VariableAnalysis/Lib/Helpers.php
@@ -380,8 +380,7 @@ public static function findVariableScopeExceptArrowFunctions(File $phpcsFile, $s
       if (! is_int($functionPtr)) {
         throw new \Exception("Function index not found for function argument index {$stackPtr}");
       }
-      $functionToken = $tokens[$functionPtr];
-      return $functionToken['scope_condition'];
+      return $functionPtr;
     }
 
     self::debug('Cannot find function scope for variable at', $stackPtr);

Original file line number	Diff line number	Diff line change
`@@ -380,8 +380,7 @@ public static function findVariableScopeExceptArrowFunctions(File $phpcsFile, $s`
`380`	`380`	`if (! is_int($functionPtr)) {`
`381`	`381`	`throw new \Exception("Function index not found for function argument index {$stackPtr}");`
`382`	`382`	`}`
`383`		`- $functionToken = $tokens[$functionPtr];`
`384`		`- return $functionToken['scope_condition'];`
	`383`	`+ return $functionPtr;`
`385`	`384`	`}`
`386`	`385`
`387`	`386`	`self::debug('Cannot find function scope for variable at', $stackPtr);`