Merge branch 'master' into 3.0

Author: gsherwood

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

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

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

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

src/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'
+);