Merge pull request #131 from PHPCSStandards/feature/objectdeclarations-getname-bug-fix

ObjectDeclarations::getName(): bug fix for functions returning by reference

Author: jrfnl

PHPCSUtils/Utils/ObjectDeclarations.php

@@ -120,6 +120,7 @@ public static function getName(File $phpcsFile, $stackPtr)
  $exclude = Tokens::$emptyTokens;
  $exclude[] = \T_OPEN_PARENTHESIS;
  $exclude[] = \T_OPEN_CURLY_BRACKET;
+ $exclude[] = \T_BITWISE_AND;
 
  $nameStart = $phpcsFile->findNext($exclude, ($stackPtr + 1), $stopPoint, true);
  if ($nameStart === false) {

Tests/BackCompat/BCFile/GetDeclarationNameTest.inc

@@ -27,13 +27,19 @@ $class = new class extends SomeClass {
 /* testFunction */
 function functionName() {}
 
+/* testFunctionReturnByRef */
+function & functionNameByRef();
+
 /* testClass */
 abstract class ClassName {
  /* testMethod */
  public function methodName() {}
 
  /* testAbstractMethod */
  abstract protected function abstractMethodName();
+
+ /* testMethodReturnByRef */
+ private function &MethodNameByRef();
 }
 
 /* testExtendedClass */

Tests/BackCompat/BCFile/GetDeclarationNameTest.php

@@ -133,6 +133,10 @@ public function dataGetDeclarationName()
  '/* testFunction */',
  'functionName',
  ],
+ 'function-return-by-reference' => [
+ '/* testFunctionReturnByRef */',
+ 'functionNameByRef',
+ ],
  'class' => [
  '/* testClass */',
  'ClassName',
@@ -145,6 +149,10 @@ public function dataGetDeclarationName()
  '/* testAbstractMethod */',
  'abstractMethodName',
  ],
+ 'method-return-by-reference' => [
+ '/* testMethodReturnByRef */',
+ 'MethodNameByRef',
+ ],
  'extended-class' => [
  '/* testExtendedClass */',
  'ExtendedClass',