Improved FullyQualifiedClassNameAfterKeywordSniff for T_USE

Author: kukulich

SlevomatCodingStandard/Sniffs/Namespaces/FullyQualifiedClassNameAfterKeywordSniff.php

@@ -56,12 +56,16 @@ public function register(): array
 	 */
 	public function process(\PHP_CodeSniffer_File $phpcsFile, $keywordPointer)
 	{
+		$tokens = $phpcsFile->getTokens();
+
 		$nameStartPointer = TokenHelper::findNextEffective($phpcsFile, $keywordPointer + 1);
-		$this->checkReferencedName($phpcsFile, $keywordPointer, $nameStartPointer);
+		if (!in_array($tokens[$nameStartPointer]['code'], TokenHelper::$nameTokenCodes, true)) {
+			return;
+		}
 
-		$tokens = $phpcsFile->getTokens();
-		if ($tokens[$keywordPointer]['code'] === T_IMPLEMENTS) {
-			$possibleCommaPointer = $keywordPointer + 1;
+		$possibleCommaPointer = $this->checkReferencedName($phpcsFile, $keywordPointer, $nameStartPointer);
+
+		if (in_array($tokens[$keywordPointer]['code'], [T_IMPLEMENTS, T_USE], true)) {
 			while (true) {
 				$possibleCommaPointer = TokenHelper::findNextExcluding($phpcsFile, array_merge(TokenHelper::$nameTokenCodes, [T_WHITESPACE]), $possibleCommaPointer);
 				if ($possibleCommaPointer !== null) {
@@ -81,6 +85,20 @@ public function process(\PHP_CodeSniffer_File $phpcsFile, $keywordPointer)
 	private function checkReferencedName(\PHP_CodeSniffer_File $phpcsFile, int $keywordPointer, int $nameStartPointer): int
 	{
 		$tokens = $phpcsFile->getTokens();
+
+		if ($tokens[$keywordPointer]['code'] === T_USE) {
+			$conditions = $tokens[$keywordPointer]['conditions'];
+
+			if (count($conditions) === 0) {
+				return $nameStartPointer + 1;
+			}
+
+			$lastCondition = array_values($conditions)[count($conditions) - 1];
+			if ($lastCondition === T_NAMESPACE) {
+				return $nameStartPointer + 1;
+			}
+		}
+
 		$nameStartToken = $tokens[$nameStartPointer];
 		$endPointer = ReferencedNameHelper::getReferencedNameEndPointer($phpcsFile, $nameStartPointer);
 		if ($nameStartToken['code'] !== T_NS_SEPARATOR) {

tests/Sniffs/Namespaces/FullyQualifiedClassNameAfterKeywordSniffUseTest.php

@@ -0,0 +1,86 @@
+<?php declare(strict_types = 1);
+
+namespace SlevomatCodingStandard\Sniffs\Namespaces;
+
+class FullyQualifiedClassNameAfterKeywordSniffUseTest extends \SlevomatCodingStandard\Sniffs\TestCase
+{
+
+	protected function getSniffClassName(): string
+	{
+		return FullyQualifiedClassNameAfterKeywordSniff::class;
+	}
+
+	private function getFileReport(): \PHP_CodeSniffer_File
+	{
+		return $this->checkFile(
+			__DIR__ . '/data/fullyQualifiedUse.php',
+			['keywordsToCheck' => ['T_USE']]
+		);
+	}
+
+	public function testIgnoreUseInClosure()
+	{
+		$this->assertNoSniffError($this->getFileReport(), 34);
+	}
+
+	public function testIgnoreUseInNamespace()
+	{
+		$this->assertNoSniffError($this->getFileReport(), 5);
+	}
+
+	public function testIgnoreUseInNamespaceWithParenthesis()
+	{
+		$this->assertNoSniffErrorInFile($this->checkFile(
+			__DIR__ . '/data/fullyQualifiedUseNamespaceWithParenthesis.php',
+			['keywordsToCheck' => ['T_USE']]
+		));
+	}
+
+	public function testNonFullyQualifiedUse()
+	{
+		$this->assertSniffError(
+			$this->getFileReport(),
+			14,
+			FullyQualifiedClassNameAfterKeywordSniff::getErrorCode('use'),
+			'Dolor in use'
+		);
+	}
+
+	public function testFullyQualifiedUse()
+	{
+		$this->assertNoSniffError($this->getFileReport(), 9);
+	}
+
+	public function testMultipleFullyQualifiedUse()
+	{
+		$this->assertNoSniffError($this->getFileReport(), 19);
+	}
+
+	public function testMultipleUseWithFirstWrong()
+	{
+		$this->assertSniffError(
+			$this->getFileReport(),
+			24,
+			FullyQualifiedClassNameAfterKeywordSniff::getErrorCode('use'),
+			'Dolor in use'
+		);
+	}
+
+	public function testMultipleUseWithSecondAndThirdWrong()
+	{
+		$report = $this->getFileReport();
+		$this->assertSniffError(
+			$report,
+			29,
+			FullyQualifiedClassNameAfterKeywordSniff::getErrorCode('use'),
+			'Amet in use'
+		);
+		$this->assertSniffError(
+			$report,
+			29,
+			FullyQualifiedClassNameAfterKeywordSniff::getErrorCode('use'),
+			'Omega in use'
+		);
+	}
+
+}

tests/Sniffs/Namespaces/data/fullyQualifiedUse.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace Foo;
+
+use Dolor;
+
+class Foo
+{
+	use \SomeClass, \Some\OtherClass;
+}
+
+class Ipsum
+{
+	use /*\Omega, */ Dolor;
+}
+
+class Lorem
+{
+	use \Dolor, \Amet;
+}
+
+class LoremConsecteur
+{
+	use Dolor, \Amet;
+}
+
+class Bar
+{
+	use \Dolor, Amet, Omega;
+}
+
+$foo = null;
+
+$boo = function () use ($foo) {
+
+};

tests/Sniffs/Namespaces/data/fullyQualifiedUseNamespaceWithParenthesis.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace Foo
+{
+
+	use Dolor;
+
+}