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

Author: kukulich

SlevomatCodingStandard/Sniffs/Namespaces/ReferenceUsedNamesOnlySniff.php

@@ -248,6 +248,15 @@ public function process(File $phpcsFile, $openTagPointer): void
 					if (array_key_exists($unqualifiedName, $definedConstantsIndex)) {
 						continue;
 					}
+
+					if (
+						array_key_exists($collidingUseStatementUniqueId, $useStatements)
+						&& $canonicalName !== NamespaceHelper::normalizeToCanonicalName(
+							$useStatements[$collidingUseStatementUniqueId]->getFullyQualifiedTypeName()
+						)
+					) {
+						continue;
+					}
 				}
 			}
 

tests/Sniffs/Namespaces/ReferenceUsedNamesOnlySniffTest.php

@@ -667,8 +667,20 @@ public function testCollidingFullyQualifiedConstantNameDisallowed(): void
 			['allowFullyQualifiedNameForCollidingConstants' => false]
 		);
 
-		self::assertSame(1, $report->getErrorCount());
-		self::assertSniffError($report, 12, ReferenceUsedNamesOnlySniff::CODE_REFERENCE_VIA_FULLY_QUALIFIED_NAME);
+		self::assertSame(2, $report->getErrorCount());
+
+		self::assertSniffError(
+			$report,
+			14,
+			ReferenceUsedNamesOnlySniff::CODE_REFERENCE_VIA_FULLY_QUALIFIED_NAME,
+			'Constant \PHP_VERSION should not be referenced via a fully qualified name, but via a use statement.'
+		);
+		self::assertSniffError(
+			$report,
+			14,
+			ReferenceUsedNamesOnlySniff::CODE_REFERENCE_VIA_FULLY_QUALIFIED_NAME,
+			'Constant \A\SOMETHING should not be referenced via a fully qualified name, but via a use statement.'
+		);
 	}
 
 	public function testReferencingGlobalFunctionViaFallbackErrorsWithMoreComplexSettings(): void

tests/Sniffs/Namespaces/data/collidingFullyQualifiedConstantNames.php

@@ -2,14 +2,16 @@
 
 namespace FooNamespace;
 
+use const SOMETHING;
+
 const PHP_VERSION = '6.0.0';
 
 class Foo
 {
 
 	public function boo()
 	{
-		echo \PHP_VERSION;
+		echo \PHP_VERSION .  SOMETHING . \A\SOMETHING;
 	}
 
 }