ReferencedNameHelper - result contains traits used in a class

Author: ondrejmirtes

SlevomatCodingStandard/Helpers/ReferencedNameHelper.php

@@ -157,13 +157,23 @@ private static function isReferencedName(PHP_CodeSniffer_File $phpcsFile, $start
 
 		$skipTokenCodes = [
 			T_FUNCTION,
-			T_USE,
 			T_AS,
 			T_DOUBLE_COLON,
 			T_OBJECT_OPERATOR,
 			T_NAMESPACE,
 		];
 
+		if ($previousToken['code'] === T_USE) {
+			$classPointer = $phpcsFile->findPrevious(T_CLASS, $startPointer - 1);
+			if ($classPointer !== false) {
+				$tokens = $phpcsFile->getTokens();
+				$classToken = $tokens[$classPointer];
+				return $startPointer > $classToken['scope_opener'] && $startPointer < $classToken['scope_closer'];
+			}
+
+			return false;
+		}
+
 		return !in_array(
 			$previousToken['code'],
 			array_merge($skipTokenCodes, TokenHelper::$typeKeywordTokenCodes),

tests/Helpers/ReferencedNameHelperTest.php

@@ -12,6 +12,8 @@ public function dataGetAllReferencedNames()
 				[
 					'\ExtendedClass',
 					'\ImplementedInterface',
+					'\FullyQualified\SomeOtherTrait',
+					'SomeTrait',
 					'TypehintedName',
 					'ClassInstance',
 					'StaticClass',
@@ -24,6 +26,8 @@ public function dataGetAllReferencedNames()
 				[
 					'\ExtendedClass',
 					'\ImplementedInterface',
+					'\FullyQualified\SomeOtherTrait',
+					'SomeTrait',
 					'ORM\Column',
 					'Bar',
 					'Lorem',

tests/Helpers/data/lotsOfReferencedNames.php

@@ -8,6 +8,9 @@
 class FooClass extends \ExtendedClass implements \ImplementedInterface
 {
 
+	use \FullyQualified\SomeOtherTrait;
+	use SomeTrait;
+
 	/** @ORM\Column(name="foo") */
 	private $foo;
 

tests/Sniffs/Namespaces/UnusedUsesSniffTest.php

@@ -72,4 +72,10 @@ public function testReportCaseInsensitiveUse()
 		);
 	}
 
+	public function testUsedTrait()
+	{
+		$report = $this->checkFile(__DIR__ . '/data/usedTrait.php');
+		$this->assertNoSniffError($report, 5);
+	}
+
 }

tests/Sniffs/Namespaces/data/usedTrait.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace BarNamespace;
+
+use SomeTrait;
+
+class Foo
+{
+
+	use SomeTrait;
+
+}