Merge 1718ce5 into a230516

slevomat · Mar 24, 2020 · 26a1a36 · 26a1a36
2 parents a230516 + 1718ce5
commit 26a1a36
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 16 deletions.
diff --git a/SlevomatCodingStandard/Sniffs/Namespaces/UnusedUsesSniff.php b/SlevomatCodingStandard/Sniffs/Namespaces/UnusedUsesSniff.php
@@ -91,24 +91,17 @@ public function process(File $phpcsFile, $openTagPointer): void
 		if ($pointersBeforeUseStatements === []) {
 			$pointersBeforeUseStatements = [$startPointer];
 		}
-		$pointersBeforeUseStatementsCount = count($pointersBeforeUseStatements);
 
 		$allUsedNames = [];
 
 		foreach ($referencedNames as $referencedName) {
 			$pointer = $referencedName->getStartPointer();
 
-			if ($pointersBeforeUseStatementsCount === 1) {
-				$pointerBeforeUseStatements = $pointersBeforeUseStatements[0];
-			} else {
-				$pointerBeforeUseStatements = $startPointer;
-				foreach ($pointersBeforeUseStatements as $currentPointerBeforeUseStatements) {
-					if ($currentPointerBeforeUseStatements < $pointer) {
-						$pointerBeforeUseStatements = $currentPointerBeforeUseStatements;
-						break;
-					}
-				}
-			}
+			$pointerBeforeUseStatements = $this->firstPointerBefore(
+				$pointer,
+				$pointersBeforeUseStatements,
+				$startPointer
+			);
 
 			$name = $referencedName->getNameAsReferencedInFile();
 			$nameParts = NamespaceHelper::getNameParts($name);
@@ -156,10 +149,11 @@ public function process(File $phpcsFile, $openTagPointer): void
 					continue;
 				}
 
-				$pointerBeforeUseStatements = TokenHelper::findPrevious($phpcsFile, T_NAMESPACE, $docCommentOpenPointer - 1);
-				if ($pointerBeforeUseStatements === null) {
-					$pointerBeforeUseStatements = $startPointer;
-				}
+				$pointerBeforeUseStatements = $this->firstPointerBefore(
+					$docCommentOpenPointer - 1,
+					$pointersBeforeUseStatements,
+					$startPointer
+				);
 
 				if (!array_key_exists($pointerBeforeUseStatements, $fileUnusedNames)) {
 					$searchAnnotationsPointer = $tokens[$docCommentOpenPointer]['comment_closer'] + 1;
@@ -350,4 +344,21 @@ private function getIgnoredAnnotations(): array
 		return $this->normalizedIgnoredAnnotations;
 	}
 
+	/**
+	 * @param int   $pointer
+	 * @param int[] $pointers
+	 * @param int   $startPointer
+	 * @return int
+	 */
+	private function firstPointerBefore(int $pointer, array $pointers, int $startPointer): int
+	{
+		foreach ($pointers as $currentPointerBeforeUseStatements) {
+			if ($currentPointerBeforeUseStatements < $pointer) {
+				return $currentPointerBeforeUseStatements;
+			}
+		}
+
+		return $startPointer;
+	}
+
 }
diff --git a/tests/Sniffs/Namespaces/UnusedUsesSniffTest.php b/tests/Sniffs/Namespaces/UnusedUsesSniffTest.php
@@ -10,12 +10,19 @@ class UnusedUsesSniffTest extends TestCase
 
 	public function testUnusedUse(): void
 	{
+		self::assertEquals(5, $this->getFileReport()->getErrorCount());
 		self::assertSniffError(
 			$this->getFileReport(),
 			5,
 			UnusedUsesSniff::CODE_UNUSED_USE,
 			'First\ObjectPrototype'
 		);
+		self::assertSniffError(
+			$this->getFileReport(),
+			8,
+			UnusedUsesSniff::CODE_UNUSED_USE,
+			'My\ObjectPrototype (as MyObject)'
+		);
 		self::assertSniffError(
 			$this->getFileReport(),
 			12,
@@ -28,6 +35,12 @@ public function testUnusedUse(): void
 			UnusedUsesSniff::CODE_UNUSED_USE,
 			'FooBar\UNUSED_CONSTANT'
 		);
+		self::assertSniffError(
+			$this->getFileReport(),
+			16,
+			UnusedUsesSniff::CODE_UNUSED_USE,
+			'X'
+		);
 	}
 
 	public function testUnusedUseWithMultipleNamespaces(): void