Update function name searches to handle T_NAME... tokens

Author: sirbrillig

VariableAnalysis/Lib/Helpers.php

@@ -319,8 +319,22 @@ public static function findFunctionCall(File $phpcsFile, $stackPtr)
 		if (is_int($openPtr)) {
 			// First non-whitespace thing and see if it's a T_STRING function name
 			$functionPtr = $phpcsFile->findPrevious(self::getEmptyTokens(), $openPtr - 1, null, true, null, true);
-			if (is_int($functionPtr) && $tokens[$functionPtr]['code'] === T_STRING) {
-				return $functionPtr;
+			if (is_int($functionPtr)) {
+				$functionTokenCode = $tokens[$functionPtr]['code'];
+				// In PHPCS 4.x, function names can be T_NAME_FULLY_QUALIFIED, T_NAME_QUALIFIED, or T_NAME_RELATIVE
+				$validFunctionTokens = [T_STRING];
+				if (defined('T_NAME_FULLY_QUALIFIED')) {
+					$validFunctionTokens[] = T_NAME_FULLY_QUALIFIED;
+				}
+				if (defined('T_NAME_QUALIFIED')) {
+					$validFunctionTokens[] = T_NAME_QUALIFIED;
+				}
+				if (defined('T_NAME_RELATIVE')) {
+					$validFunctionTokens[] = T_NAME_RELATIVE;
+				}
+				if (in_array($functionTokenCode, $validFunctionTokens, true)) {
+					return $functionPtr;
+				}
 			}
 		}
 		return null;
@@ -634,6 +648,16 @@ public static function findVariableScopeExceptArrowFunctions(File $phpcsFile, $s
 			T_HEREDOC,
 			T_STRING,
 		];
+		// In PHPCS 4.x, function names can be T_NAME_FULLY_QUALIFIED, T_NAME_QUALIFIED, or T_NAME_RELATIVE
+		if (defined('T_NAME_FULLY_QUALIFIED')) {
+			$allowedTypes[] = T_NAME_FULLY_QUALIFIED;
+		}
+		if (defined('T_NAME_QUALIFIED')) {
+			$allowedTypes[] = T_NAME_QUALIFIED;
+		}
+		if (defined('T_NAME_RELATIVE')) {
+			$allowedTypes[] = T_NAME_RELATIVE;
+		}
 		if (! in_array($tokens[$stackPtr]['code'], $allowedTypes, true)) {
 			throw new \Exception("Cannot find variable scope for non-variable {$tokens[$stackPtr]['type']}");
 		}
@@ -1766,6 +1790,18 @@ public static function getFunctionNameWithNamespace(File $phpcsFile, $stackPtr)
 		$startOfScope = self::findVariableScope($phpcsFile, $stackPtr);
 		$functionName = $tokens[$stackPtr]['content'];
 
+		// In PHPCS 4.x, T_NAME_FULLY_QUALIFIED, T_NAME_QUALIFIED, and T_NAME_RELATIVE
+		// tokens already contain the full namespaced name, so we can return early.
+		if (defined('T_NAME_FULLY_QUALIFIED') && $tokens[$stackPtr]['code'] === T_NAME_FULLY_QUALIFIED) {
+			return $functionName;
+		}
+		if (defined('T_NAME_QUALIFIED') && $tokens[$stackPtr]['code'] === T_NAME_QUALIFIED) {
+			return $functionName;
+		}
+		if (defined('T_NAME_RELATIVE') && $tokens[$stackPtr]['code'] === T_NAME_RELATIVE) {
+			return $functionName;
+		}
+
 		// Move backwards from the token, collecting namespace separators and
 		// strings, until we encounter whitespace or something else.
 		$partOfNamespace = [T_NS_SEPARATOR, T_STRING];

VariableAnalysis/Sniffs/CodeAnalysis/VariableAnalysisSniff.php

@@ -1503,7 +1503,20 @@ protected function processVariableAsPassByReferenceFunctionCall(File $phpcsFile,
 
 		// Is our function a known pass-by-reference function?
 		$functionName = $tokens[$functionPtr]['content'];
-		$refArgs = $this->getPassByReferenceFunction($functionName);
+
+		// In PHPCS 4.x, T_NAME_FULLY_QUALIFIED, T_NAME_QUALIFIED, and T_NAME_RELATIVE
+		// tokens contain the full namespaced name. Extract just the base name for the
+		// first check so that 'my_function' in the config can match '\My\Namespace\my_function'.
+		$functionBaseName = $functionName;
+		if (defined('T_NAME_FULLY_QUALIFIED') && $tokens[$functionPtr]['code'] === T_NAME_FULLY_QUALIFIED) {
+			$functionBaseName = substr($functionName, strrpos($functionName, '\\') + 1);
+		} elseif (defined('T_NAME_QUALIFIED') && $tokens[$functionPtr]['code'] === T_NAME_QUALIFIED) {
+			$functionBaseName = substr($functionName, strrpos($functionName, '\\') + 1);
+		} elseif (defined('T_NAME_RELATIVE') && $tokens[$functionPtr]['code'] === T_NAME_RELATIVE) {
+			$functionBaseName = substr($functionName, strrpos($functionName, '\\') + 1);
+		}
+
+		$refArgs = $this->getPassByReferenceFunction($functionBaseName);
 		if (! $refArgs) {
 			// Check again with the fully namespaced function name.
 			$functionName = Helpers::getFunctionNameWithNamespace($phpcsFile, $functionPtr);