UnusedPrivateElementsSniff - fixed handling always-used property anno…

…tations
slevomat · Dec 22, 2015 · 172a023 · 172a023
1 parent d93b9d4
commit 172a023
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/SlevomatCodingStandard/Sniffs/Classes/UnusedPrivateElementsSniff.php b/SlevomatCodingStandard/Sniffs/Classes/UnusedPrivateElementsSniff.php
@@ -179,7 +179,8 @@ private function getProperties(PHP_CodeSniffer_File $phpcsFile, array $tokens, a
 			$findPropertiesStartTokenPointer = $propertyTokenPointer + 1;
 			$phpDocTags = $this->getPhpDocTags($phpcsFile, $tokens, $visibilityModifiedTokenPointer);
 			foreach ($phpDocTags as $tag) {
-				if (in_array(substr($tag, 0, 4), $this->alwaysUsedPropertiesAnnotations, true)) {
+				preg_match('#([@a-zA-Z\\\]+)#', $tag, $matches);
+				if (in_array($matches[1], $this->alwaysUsedPropertiesAnnotations, true)) {
 					continue 2;
 				}
 			}

diff --git a/tests/Sniffs/Classes/UnusedPrivateElementsSniffTest.php b/tests/Sniffs/Classes/UnusedPrivateElementsSniffTest.php
@@ -11,6 +11,7 @@ public function testCheckFile()
 			'alwaysUsedPropertiesAnnotations' => [
 				'@get',
 				'@set',
+				'@ORM\Column',
 			],
 			'alwaysUsedPropertiesSuffixes' => [
 				'Value',
@@ -42,22 +43,23 @@ public function testCheckFile()
 			UnusedPrivateElementsSniff::CODE_WRITE_ONLY_PROPERTY,
 			'Class ClassWithSomeUnusedProperties contains write-only property: $writeOnlyProperty'
 		);
+		$this->assertNoSniffError($resultFile, 33);
 		$this->assertSniffError(
 			$resultFile,
-			45,
+			48,
 			UnusedPrivateElementsSniff::CODE_UNUSED_METHOD,
 			'Class ClassWithSomeUnusedProperties contains unused private method: unusedPrivateMethod'
 		);
-		$this->assertNoSniffError($resultFile, 50);
-		$this->assertNoSniffError($resultFile, 55);
-		$this->assertNoSniffError($resultFile, 60);
+		$this->assertNoSniffError($resultFile, 51);
+		$this->assertNoSniffError($resultFile, 58);
+		$this->assertNoSniffError($resultFile, 63);
 		$this->assertSniffError(
 			$resultFile,
-			65,
+			68,
 			UnusedPrivateElementsSniff::CODE_UNUSED_METHOD,
 			'Class ClassWithSomeUnusedProperties contains unused private method: unusedStaticPrivateMethod'
 		);
-		$this->assertNoSniffError($resultFile, 70);
+		$this->assertNoSniffError($resultFile, 73);
 	}
 
 }
diff --git a/tests/Sniffs/Classes/data/ClassWithSomeUnusedProperties.php b/tests/Sniffs/Classes/data/ClassWithSomeUnusedProperties.php
@@ -29,6 +29,9 @@ class ClassWithSomeUnusedProperties extends \Consistence\Object
 
 	private $writeOnlyProperty;
 
+	/** @ORM\Column(name="foo") */
+	private $doctrineProperty;
+
 	public function foo()
 	{
 		$this->usedProperty->foo();