Fixed ReferencedNameHelper

slevomat · Aug 25, 2017 · ae42c30 · ae42c30
1 parent 2b1568e
commit ae42c30
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/SlevomatCodingStandard/Helpers/ReferencedNameHelper.php b/SlevomatCodingStandard/Helpers/ReferencedNameHelper.php
@@ -85,7 +85,12 @@ private static function createAllReferencedNames(\PHP_CodeSniffer\Files\File $ph
 					if ($tokens[$previousTokenBeforeStartPointer]['code'] !== T_NEW) {
 						$type = ReferencedName::TYPE_FUNCTION;
 					}
-				} elseif ($tokens[$nextTokenAfterEndPointer]['code'] !== T_VARIABLE) {
+				} elseif (!in_array($tokens[$nextTokenAfterEndPointer]['code'], [
+						T_VARIABLE,
+						T_ELLIPSIS, // variadic parameter
+						T_BITWISE_AND, // parameter by reference
+					], true)
+				) {
 					if (
 						!in_array($tokens[$previousTokenBeforeStartPointer]['code'], [
 							T_EXTENDS,

diff --git a/tests/Helpers/ReferencedNameHelperTest.php b/tests/Helpers/ReferencedNameHelperTest.php
@@ -34,6 +34,8 @@ public function testGetAllReferencedNames()
 			['BAR_CONSTANT', false, true],
 			['Integer', false, false],
 			['Boolean', false, false],
+			['Bobobo', false, false],
+			['Dododo', false, false],
 			['\ExtendedInterface', false, false],
 			['\SecondExtendedInterface', false, false],
 			['\ThirdExtendedInterface', false, false],

diff --git a/tests/Helpers/data/lotsOfReferencedNames.php b/tests/Helpers/data/lotsOfReferencedNames.php
@@ -48,6 +48,14 @@ public function fooMethod(TypeHintedName $foo, array $bar)
 
 		new Integer();
 		new Boolean();
+
+		function (Bobobo ...$bobobo) : array {
+			return $bobobo;
+		};
+
+		function (Dododo &$dododo) : array {
+			return $dododo;
+		};
 	}
 
 }