Fixed bug #594 : Tokenizer issue on closure that returns by reference

Author: gsherwood

CodeSniffer/Standards/PEAR/Tests/Functions/FunctionDeclarationUnitTest.inc

@@ -174,3 +174,7 @@ blah
 {
     // body
 }
+
+$b = function &() {
+    echo "hello";
+};

CodeSniffer/Standards/PEAR/Tests/Functions/FunctionDeclarationUnitTest.inc.fixed

@@ -178,3 +178,7 @@ function blah()
 {
     // body
 }
+
+$b = function &() {
+    echo "hello";
+};

CodeSniffer/Tokenizers/PHP.php

@@ -854,7 +854,9 @@ public function processAdditional(&$tokens, $eolChar)
             // Looking for functions that are actually closures.
             if ($tokens[$i]['code'] === T_FUNCTION && isset($tokens[$i]['scope_opener']) === true) {
                 for ($x = ($i + 1); $x < $numTokens; $x++) {
-                    if (isset(PHP_CodeSniffer_Tokens::$emptyTokens[$tokens[$x]['code']]) === false) {
+                    if (isset(PHP_CodeSniffer_Tokens::$emptyTokens[$tokens[$x]['code']]) === false
+                        && $tokens[$x]['code'] !== T_BITWISE_AND
+                    ) {
                         break;
                     }
                 }

package.xml

@@ -32,6 +32,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
     -- Stops conflict with other projects, like PHP_CodeCoverage
   - Added more guard code for syntax errors to various sniffs
   - Fixed bug #584 : Squiz.Arrays.ArrayDeclaration sniff gives incorrect NoComma error for multiline string values
+  - Fixed bug #594 : Tokenizer issue on closure that returns by reference
  </notes>
  <contents>
   <dir name="/">