FullyQualifiedGlobalConstantsSniff and FullyQualifiedGlobalFunctionsSniff fixes

Author: kukulich

SlevomatCodingStandard/Sniffs/Namespaces/AbstractFullyQualifiedGlobalReference.php

@@ -44,8 +44,7 @@ public function process(\PHP_CodeSniffer\Files\File $phpcsFile, $openTagPointer)
 
 		foreach ($referencedNames as $referencedName) {
 			$name = $referencedName->getNameAsReferencedInFile();
-			$canonicalName = $this->isCaseSensitive() ? $name : strtolower($name);
-			$referenceNamePointer = $referencedName->getStartPointer();
+			$namePointer = $referencedName->getStartPointer();
 
 			if (!$this->isValidType($referencedName)) {
 				continue;
@@ -59,18 +58,23 @@ public function process(\PHP_CodeSniffer\Files\File $phpcsFile, $openTagPointer)
 				continue;
 			}
 
+			$canonicalName = $this->isCaseSensitive() ? $name : strtolower($name);
+
 			if (array_key_exists($canonicalName, $useStatements)) {
-				continue;
+				$fullyQualifiedName = NamespaceHelper::resolveName($phpcsFile, $name, $referencedName->getType(), $useStatements, $namePointer);
+				if (NamespaceHelper::hasNamespace($fullyQualifiedName)) {
+					continue;
+				}
 			}
 
 			if (array_key_exists($canonicalName, $exclude)) {
 				continue;
 			}
 
-			$fix = $phpcsFile->addFixableError(sprintf($this->getNotFullyQualifiedMessage(), $tokens[$referenceNamePointer]['content']), $referenceNamePointer, self::CODE_NON_FULLY_QUALIFIED);
+			$fix = $phpcsFile->addFixableError(sprintf($this->getNotFullyQualifiedMessage(), $tokens[$namePointer]['content']), $namePointer, self::CODE_NON_FULLY_QUALIFIED);
 			if ($fix) {
 				$phpcsFile->fixer->beginChangeset();
-				$phpcsFile->fixer->addContentBefore($referenceNamePointer, NamespaceHelper::NAMESPACE_SEPARATOR);
+				$phpcsFile->fixer->addContentBefore($namePointer, NamespaceHelper::NAMESPACE_SEPARATOR);
 				$phpcsFile->fixer->endChangeset();
 			}
 		}

SlevomatCodingStandard/Sniffs/Namespaces/FullyQualifiedGlobalFunctionsSniff.php

@@ -15,7 +15,7 @@ protected function getNotFullyQualifiedMessage(): string
 
 	protected function isCaseSensitive(): bool
 	{
-		return true;
+		return false;
 	}
 
 	protected function isValidType(ReferencedName $name): bool

tests/Sniffs/Namespaces/FullyQualifiedGlobalConstantsSniffTest.php

@@ -18,7 +18,7 @@ public function testErrors(): void
 		$this->assertSame(2, $report->getErrorCount());
 
 		$this->assertSniffError($report, 17, FullyQualifiedGlobalConstantsSniff::CODE_NON_FULLY_QUALIFIED, 'Constant PHP_VERSION should be referenced via a fully qualified name.');
-		$this->assertSniffError($report, 28, FullyQualifiedGlobalConstantsSniff::CODE_NON_FULLY_QUALIFIED, 'Constant PHP_OS should be referenced via a fully qualified name.');
+		$this->assertSniffError($report, 31, FullyQualifiedGlobalConstantsSniff::CODE_NON_FULLY_QUALIFIED, 'Constant PHP_OS should be referenced via a fully qualified name.');
 
 		$this->assertAllFixedInFile($report);
 	}

tests/Sniffs/Namespaces/FullyQualifiedGlobalFunctionsSniffTest.php

@@ -18,7 +18,7 @@ public function testErrors(): void
 		$this->assertSame(2, $report->getErrorCount());
 
 		$this->assertSniffError($report, 17, FullyQualifiedGlobalFunctionsSniff::CODE_NON_FULLY_QUALIFIED, 'Function min() should be referenced via a fully qualified name.');
-		$this->assertSniffError($report, 28, FullyQualifiedGlobalFunctionsSniff::CODE_NON_FULLY_QUALIFIED, 'Function max() should be referenced via a fully qualified name.');
+		$this->assertSniffError($report, 31, FullyQualifiedGlobalFunctionsSniff::CODE_NON_FULLY_QUALIFIED, 'Function MaX() should be referenced via a fully qualified name.');
 
 		$this->assertAllFixedInFile($report);
 	}

tests/Sniffs/Namespaces/data/fullyQualifiedGlobalConstantsErrors.fixed.php

@@ -23,7 +23,10 @@ public function __construct()
 
 }
 
-namespace {
+namespace
+{
+
+	use const PHP_OS;
 
 	\PHP_OS;
 

tests/Sniffs/Namespaces/data/fullyQualifiedGlobalConstantsErrors.php

@@ -23,7 +23,10 @@ public function __construct()
 
 }
 
-namespace {
+namespace
+{
+
+	use const PHP_OS;
 
 	PHP_OS;
 

tests/Sniffs/Namespaces/data/fullyQualifiedGlobalFunctionsErrors.fixed.php

@@ -23,8 +23,11 @@ public function __construct()
 
 }
 
-namespace {
+namespace
+{
+
+	use function MAX;
 
-	\max(10, 100);
+	\MaX(10, 100);
 
 }

tests/Sniffs/Namespaces/data/fullyQualifiedGlobalFunctionsErrors.php

@@ -23,8 +23,11 @@ public function __construct()
 
 }
 
-namespace {
+namespace
+{
+
+	use function MAX;
 
-	max(10, 100);
+	MaX(10, 100);
 
 }

tests/Sniffs/Namespaces/data/fullyQualifiedGlobalFunctionsExcludeErrors.fixed.php

@@ -14,7 +14,7 @@ class Boo implements Doo
 	{
 		public function __construct()
 		{
-			min(10, 100);
+			mIn(10, 100);
 			\FullyQualified\hehe();
 			Qualified\haha();
 			hihi();

tests/Sniffs/Namespaces/data/fullyQualifiedGlobalFunctionsExcludeErrors.php

@@ -14,7 +14,7 @@ class Boo implements Doo
 	{
 		public function __construct()
 		{
-			min(10, 100);
+			mIn(10, 100);
 			\FullyQualified\hehe();
 			Qualified\haha();
 			hihi();