Fixed ReferencedNameHelper to return underscored names from annotatio…

…ns (fixes #10)

SlevomatCodingStandard/Helpers/ReferencedNameHelper.php

@@ -65,7 +65,7 @@ private static function createAllReferencedNames(PHP_CodeSniffer_File $phpcsFile
 
 		$matchTypesInAnnotation = function ($annotation, $nameStartPointer) use (&$types) {
 			$annotation = trim($annotation, '@ ');
-			if (preg_match('#([a-zA-Z0-9|\[\]\\\]+)#', $annotation, $matches) > 0) {
+			if (preg_match('#([a-zA-Z0-9_|\[\]\\\]+)#', $annotation, $matches) > 0) {
 				$referencedNames = array_filter(array_map(function ($name) {
 					return trim($name, '[]');
 				}, explode('|', $matches[1])), function ($match) {

tests/Helpers/ReferencedNameHelperTest.php

@@ -37,6 +37,7 @@ public function dataGetAllReferencedNames()
 					'\Foo\BarBaz',
 					'TypehintedName',
 					'AnotherTypehintedName',
+					'Returned_Typehinted_Underscored_Name',
 					'ClassInstance',
 					'StaticClass',
 					'\Foo\Bar\SpecificException',

tests/Helpers/data/lotsOfReferencedNames.php

@@ -26,6 +26,7 @@ class FooClass extends \ExtendedClass implements \ImplementedInterface
 	/**
 	 * @param TypehintedName $foo
 	 * @param AnotherTypehintedName[] $bar
+	 * @return Returned_Typehinted_Underscored_Name
 	 */
 	public function fooMethod(TypehintedName $foo, array $bar)
 	{

tests/Sniffs/Namespaces/UnusedUsesSniffTest.php

@@ -78,4 +78,12 @@ public function testUsedTrait()
 		$this->assertNoSniffError($report, 5);
 	}
 
+	public function testTypeWithUnderscoresInAnnotation()
+	{
+		$report = $this->checkFile(__DIR__ . '/data/unusedUsesAnnotationUnderscores.php', [
+			'searchAnnotations' => true,
+		]);
+		$this->assertNoSniffError($report, 5);
+	}
+
 }

tests/Sniffs/Namespaces/data/unusedUsesAnnotationUnderscores.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace Foo;
+
+use Test_Invalid;
+
+abstract class TestInvalidClass
+{
+
+	/**
+	 * @return Test_Invalid
+	 */
+	protected function getCell()
+	{
+		return NULL;
+	}
+
+}