Merge pull request #23 from sirbrillig/add/unused-constant-test

Support trailing commas in group imports

Author: sirbrillig

ImportDetection/SniffHelpers.php

@@ -94,22 +94,20 @@ private function getImportedSymbolsFromGroupStatement(File $phpcsFile, int $stac
 		// Get the namespace for the import first, so we can attach it to each Symbol
 		$importNamespace = $this->getFullSymbol($phpcsFile, $startBracketPtr - 1);
 
-		$lastImportPtr = $stackPtr;
 		$collectedSymbols = [];
-		$isLastImport = false;
-		while (! $isLastImport) {
-			$nextEndOfImportPtr = $phpcsFile->findNext([T_COMMA], $lastImportPtr + 1, $endBracketPtr);
-			if (! $nextEndOfImportPtr) {
-				$isLastImport = true;
-				$nextEndOfImportPtr = $endBracketPtr;
-			}
-			$lastStringPtr = $phpcsFile->findPrevious([T_STRING], $nextEndOfImportPtr - 1, $stackPtr);
-			if (! $lastStringPtr || ! isset($tokens[$lastStringPtr])) {
+		$lastStringPtr = $startBracketPtr;
+		while ($lastStringPtr < $endBracketPtr) {
+			$nextStringPtr = $phpcsFile->findNext([T_STRING], $lastStringPtr + 1, $endBracketPtr);
+			if (! $nextStringPtr || ! isset($tokens[$nextStringPtr])) {
 				break;
 			}
-			$fullSymbolParts = array_merge($importNamespace->getTokens(), [Symbol::getTokenWithPosition($tokens[$lastStringPtr], $lastStringPtr)]);
-			$collectedSymbols[] = new Symbol($fullSymbolParts);
-			$lastImportPtr = $nextEndOfImportPtr;
+			$nextCommaPtr = $phpcsFile->findNext([T_COMMA], $nextStringPtr + 1, $endBracketPtr) ?: $endBracketPtr;
+			$nextAliasPtr = $phpcsFile->findNext([T_AS], $nextStringPtr + 1, $nextCommaPtr);
+			if (! $nextAliasPtr) {
+				$fullSymbolParts = array_merge($importNamespace->getTokens(), [Symbol::getTokenWithPosition($tokens[$nextStringPtr], $nextStringPtr)]);
+				$collectedSymbols[] = new Symbol($fullSymbolParts);
+			}
+			$lastStringPtr = $nextStringPtr;
 		}
 		return $collectedSymbols;
 	}

tests/Sniffs/Imports/ConstantsFixure.php

@@ -0,0 +1,14 @@
+<?php
+use const NamespaceName\{B, C};
+use const NamespaceName\{D, E};
+use const NamespaceName\{
+	K,
+	P,
+};
+
+echo C;
+echo B;
+echo E;
+echo F;
+echo K;
+echo P;

tests/Sniffs/Imports/RequireImportsSniffTest.php

@@ -322,4 +322,18 @@ public function testRequireImportsFindsUnimportedNamespaceIdenticalToClass() {
 		];
 		$this->assertEquals($expectedLines, $lines);
 	}
+
+	public function testRequireImportsNoticesUnusedConstants() {
+		$fixtureFile = __DIR__ . '/ConstantsFixure.php';
+		$sniffFile = __DIR__ . '/../../../ImportDetection/Sniffs/Imports/RequireImportsSniff.php';
+		$helper = new SniffTestHelper();
+		$phpcsFile = $helper->prepareLocalFileForSniffs($sniffFile, $fixtureFile);
+		$phpcsFile->process();
+		$lines = $helper->getWarningLineNumbersFromFile($phpcsFile);
+		$expectedLines = [
+			3,
+			12,
+		];
+		$this->assertEquals($expectedLines, $lines);
+	}
 }