Remove handling null from findVariableScopeExceptArrowFunctions

Author: sirbrillig

VariableAnalysis/Lib/Helpers.php

@@ -430,19 +430,17 @@ public static function findVariableScope(File $phpcsFile, $stackPtr, $varName =
 
 		$enclosingScopeIndex = self::findVariableScopeExceptArrowFunctions($phpcsFile, $stackPtr);
 
-		if (!is_null($enclosingScopeIndex)) {
-			$arrowFunctionIndex = self::getContainingArrowFunctionIndex($phpcsFile, $stackPtr, $enclosingScopeIndex);
-			$isTokenInsideArrowFunctionBody = is_int($arrowFunctionIndex);
-			if ($isTokenInsideArrowFunctionBody) {
-				// Get the list of variables defined by the arrow function
-				// If this matches any of them, the scope is the arrow function,
-				// otherwise, it uses the enclosing scope.
-				if ($arrowFunctionIndex) {
-					$variableNames = self::getVariablesDefinedByArrowFunction($phpcsFile, $arrowFunctionIndex);
-					self::debug('findVariableScope: looking for', $varName, 'in arrow function variables', $variableNames);
-					if (in_array($varName, $variableNames, true)) {
-						return $arrowFunctionIndex;
-					}
+		$arrowFunctionIndex = self::getContainingArrowFunctionIndex($phpcsFile, $stackPtr, $enclosingScopeIndex);
+		$isTokenInsideArrowFunctionBody = is_int($arrowFunctionIndex);
+		if ($isTokenInsideArrowFunctionBody) {
+			// Get the list of variables defined by the arrow function
+			// If this matches any of them, the scope is the arrow function,
+			// otherwise, it uses the enclosing scope.
+			if ($arrowFunctionIndex) {
+				$variableNames = self::getVariablesDefinedByArrowFunction($phpcsFile, $arrowFunctionIndex);
+				self::debug('findVariableScope: looking for', $varName, 'in arrow function variables', $variableNames);
+				if (in_array($varName, $variableNames, true)) {
+					return $arrowFunctionIndex;
 				}
 			}
 		}