Fixed bug #1224 : PHPCBF fails to fix code with heredoc/nowdoc as first argument to a function

Author: gsherwood

CodeSniffer/Standards/Generic/Sniffs/Functions/FunctionCallArgumentSpacingSniff.php

@@ -111,7 +111,8 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
 
             if ($tokens[$nextSeparator]['code'] === T_COMMA) {
                 if ($tokens[($nextSeparator - 1)]['code'] === T_WHITESPACE) {
-                    if (isset(PHP_CodeSniffer_Tokens::$heredocTokens[$tokens[($nextSeparator - 2)]['code']]) === false) {
+                    $prev = $phpcsFile->findPrevious(PHP_CodeSniffer_Tokens::$emptyTokens, ($nextSeparator - 2), null, true);
+                    if (isset(PHP_CodeSniffer_Tokens::$heredocTokens[$tokens[$prev]['code']]) === false) {
                         $error = 'Space found before comma in function call';
                         $fix   = $phpcsFile->addFixableError($error, $nextSeparator, 'SpaceBeforeComma');
                         if ($fix === true) {

CodeSniffer/Standards/Generic/Tests/Functions/FunctionCallArgumentSpacingUnitTest.inc

@@ -93,3 +93,11 @@ $b = foo(
     "3",// this is a comment
     "4"
 );
+
+var_dump(
+    <<<TEXT
+foo
+TEXT
+    ,
+    'bar'
+);

CodeSniffer/Standards/Generic/Tests/Functions/FunctionCallArgumentSpacingUnitTest.inc.fixed

@@ -93,3 +93,11 @@ $b = foo(
     "3", // this is a comment
     "4"
 );
+
+var_dump(
+    <<<TEXT
+foo
+TEXT
+    ,
+    'bar'
+);

package.xml

@@ -55,6 +55,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
   - Fixed bug #1203 : Inconsistent behavior of PHP_CodeSniffer_File::findEndOfStatement
   - Fixed bug #1218 : CASE conditions using class constants named NAMESPACE/INTERFACE/TRAIT etc are incorrectly tokenized
   - Fixed bug #1221 : Indented function call with multiple closure arguments can cause scope indent error
+  - Fixed bug #1224 : PHPCBF fails to fix code with heredoc/nowdoc as first argument to a function
  </notes>
  <contents>
   <dir name="/">