SlevomatCodingStandard.Namespaces.ReferenceUsedNamesOnly: Fixed false positives for colliding functions

Author: kukulich

SlevomatCodingStandard/Sniffs/Namespaces/ReferenceUsedNamesOnlySniff.php

@@ -184,6 +184,8 @@ public function process(File $phpcsFile, $openTagPointer): void
 			$canonicalName = NamespaceHelper::normalizeToCanonicalName($name);
 			$unqualifiedName = NamespaceHelper::getUnqualifiedNameFromFullyQualifiedName($name);
 
+			$collidingUseStatementUniqueId = UseStatement::getUniqueId($reference->type, $unqualifiedName);
+
 			$isFullyQualified = NamespaceHelper::isFullyQualifiedName($name);
 			$isGlobalFallback = !$isFullyQualified
 				&& !NamespaceHelper::hasNamespace($name)
@@ -221,9 +223,9 @@ public function process(File $phpcsFile, $openTagPointer): void
 					}
 
 					if (
-						array_key_exists($lowerCasedUnqualifiedClassName, $useStatements)
+						array_key_exists($collidingUseStatementUniqueId, $useStatements)
 						&& $canonicalName !== NamespaceHelper::normalizeToCanonicalName(
-							$useStatements[$lowerCasedUnqualifiedClassName]->getFullyQualifiedTypeName()
+							$useStatements[$collidingUseStatementUniqueId]->getFullyQualifiedTypeName()
 						)
 					) {
 						continue;
@@ -233,6 +235,15 @@ public function process(File $phpcsFile, $openTagPointer): void
 					if (array_key_exists($lowerCasedUnqualifiedFunctionName, $definedFunctionsIndex)) {
 						continue;
 					}
+
+					if (
+						array_key_exists($collidingUseStatementUniqueId, $useStatements)
+						&& $canonicalName !== NamespaceHelper::normalizeToCanonicalName(
+							$useStatements[$collidingUseStatementUniqueId]->getFullyQualifiedTypeName()
+						)
+					) {
+						continue;
+					}
 				} elseif ($reference->isConstant && $this->allowFullyQualifiedNameForCollidingConstants) {
 					if (array_key_exists($unqualifiedName, $definedConstantsIndex)) {
 						continue;

tests/Sniffs/Namespaces/ReferenceUsedNamesOnlySniffTest.php

@@ -645,8 +645,10 @@ public function testCollidingFullyQualifiedFunctionNameDisallowed(): void
 			['allowFullyQualifiedNameForCollidingFunctions' => false]
 		);
 
-		self::assertSame(1, $report->getErrorCount());
-		self::assertSniffError($report, 15, ReferenceUsedNamesOnlySniff::CODE_REFERENCE_VIA_FULLY_QUALIFIED_NAME);
+		self::assertSame(2, $report->getErrorCount());
+
+		self::assertSniffError($report, 17, ReferenceUsedNamesOnlySniff::CODE_REFERENCE_VIA_FULLY_QUALIFIED_NAME);
+		self::assertSniffError($report, 22, ReferenceUsedNamesOnlySniff::CODE_REFERENCE_VIA_FULLY_QUALIFIED_NAME);
 	}
 
 	public function testCollidingFullyQualifiedConstantNameAllowed(): void

tests/Sniffs/Namespaces/data/collidingFullyQualifiedFunctionNames.php

@@ -2,6 +2,8 @@
 
 namespace FooNamespace;
 
+use function B\decode;
+
 function phpversion()
 {
 	return '6.0.0';
@@ -16,3 +18,5 @@ public function boo()
 	}
 
 }
+
+decode(\A\decode(''));