Merge pull request #26 from sirbrillig/fix-file-import

Move predefined check after imported symbol check

Author: sirbrillig

ImportDetection/Sniffs/Imports/RequireImportsSniff.php

@@ -78,6 +78,13 @@ public function process(File $phpcsFile, $stackPtr) {
 			$this->debug('found symbol inside an import: ' . $symbol->getName());
 			return;
 		}
+		// If the symbol's namespace is imported or defined, ignore it
+		// If the symbol has no namespace and is itself is imported or defined, ignore it
+		if ($this->isSymbolDefined($phpcsFile, $symbol)) {
+			$this->debug('found defined symbol: ' . $symbol->getName());
+			$this->markSymbolUsed($phpcsFile, $symbol);
+			return;
+		}
 		// If the symbol is predefined, ignore it
 		if ($helper->isPredefinedConstant($phpcsFile, $stackPtr) || $helper->isBuiltInFunction($phpcsFile, $stackPtr)) {
 			$this->debug('found predefined symbol: ' . $symbol->getName());
@@ -88,13 +95,6 @@ public function process(File $phpcsFile, $stackPtr) {
 			$this->debug('found typehint symbol: ' . $symbol->getName());
 			return;
 		}
-		// If the symbol's namespace is imported or defined, ignore it
-		// If the symbol has no namespace and is itself is imported or defined, ignore it
-		if ($this->isSymbolDefined($phpcsFile, $symbol)) {
-			$this->debug('found defined symbol: ' . $symbol->getName());
-			$this->markSymbolUsed($phpcsFile, $symbol);
-			return;
-		}
 		// If the symbol is global, we are in the global namespace, and
 		// configured to ignore global symbols in the global namespace,
 		// ignore it

tests/Sniffs/Imports/FileKeywordFixture.php

@@ -0,0 +1,7 @@
+<?php
+
+use Foo\Bar\File;
+
+function doSomething(File $myFile) {
+  echo $myFile;
+}

tests/Sniffs/Imports/RequireImportsSniffTest.php

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