Add hasScopeOpener

Author: sirbrillig

VariableAnalysis/Lib/Helpers.php

@@ -382,6 +382,23 @@ public static function findFunctionCallArguments(File $phpcsFile, $stackPtr)
 		return $argPtrs;
 	}
 
+	/**
+	 * Compatibility handler for phpcs 3.x/4.x
+	 * @param array $tokens
+	 * @param int   $tokenIndex
+	 * @return bool
+	 */
+	private static function hasScopeOpener($tokens, $tokenIndex)
+	{
+		if (defined('Tokens::SCOPE_OPENERS') && isset(Tokens::SCOPE_OPENERS[$tokens[$tokenIndex]['code']])) {
+			return true;
+		}
+		if (isset(Tokens::$scopeOpeners) && isset(Tokens::$scopeOpeners[$tokens[$tokenIndex]['code']])) {
+			return true;
+		}
+		return false;
+	}
+
 	/**
 	 * Compatibility handler for phpcs 3.x/4.x
 	 * @param array $tokens
@@ -919,7 +936,7 @@ private static function isListAssignment(File $phpcsFile, $listOpenerIndex)
 				isset($tokens[$previousTokenPtr])
 				&& $tokens[$previousTokenPtr]['code'] === T_CLOSE_PARENTHESIS
 				&& isset($tokens[$previousTokenPtr]['parenthesis_owner'])
-				&& isset(Tokens::$scopeOpeners[$tokens[$tokens[$previousTokenPtr]['parenthesis_owner']]['code']])
+				&& self::hasScopeOpener($tokens, $tokens[$previousTokenPtr]['parenthesis_owner'])
 			) {
 				return true;
 			}