fixup! Update sniff to handle T_NAME... tokens for functions

Author: sirbrillig

VariableAnalysis/Sniffs/CodeAnalysis/VariableAnalysisSniff.php

@@ -1511,29 +1511,25 @@ protected function processVariableAsPassByReferenceFunctionCall(File $phpcsFile,
 		if (defined('T_NAME_FULLY_QUALIFIED') && $tokens[$functionPtr]['code'] === T_NAME_FULLY_QUALIFIED) {
 			$lastBackslashPos = strrpos($functionName, '\\');
 			if ($lastBackslashPos !== false) {
-				$baseName = substr($functionName, $lastBackslashPos + 1);
-				if ($baseName !== false) {
-					$functionBaseName = $baseName;
-				}
+				$functionBaseName = substr($functionName, $lastBackslashPos + 1);
 			}
 		} elseif (defined('T_NAME_QUALIFIED') && $tokens[$functionPtr]['code'] === T_NAME_QUALIFIED) {
 			$lastBackslashPos = strrpos($functionName, '\\');
 			if ($lastBackslashPos !== false) {
-				$baseName = substr($functionName, $lastBackslashPos + 1);
-				if ($baseName !== false) {
-					$functionBaseName = $baseName;
-				}
+				$functionBaseName = substr($functionName, $lastBackslashPos + 1);
 			}
 		} elseif (defined('T_NAME_RELATIVE') && $tokens[$functionPtr]['code'] === T_NAME_RELATIVE) {
 			$lastBackslashPos = strrpos($functionName, '\\');
 			if ($lastBackslashPos !== false) {
-				$baseName = substr($functionName, $lastBackslashPos + 1);
-				if ($baseName !== false) {
-					$functionBaseName = $baseName;
-				}
+				$functionBaseName = substr($functionName, $lastBackslashPos + 1);
 			}
 		}
 
+		// Ensure we have a string (should always be true, but helps static analyzers).
+		if (! is_string($functionBaseName) || $functionBaseName === '') {
+			return false;
+		}
+
 		$refArgs = $this->getPassByReferenceFunction($functionBaseName);
 		if (! $refArgs) {
 			// Check again with the fully namespaced function name.