fix up! Squiz/FunctionDeclarationArgumentSpacing: improve `SpaceBefor…

…eComma` fixer

src/Standards/Squiz/Sniffs/Functions/FunctionDeclarationArgumentSpacingSniff.php

@@ -330,22 +330,34 @@ public function processBracket($phpcsFile, $openBracket)
 
                     $fix = $phpcsFile->addFixableError($error, $commaToken, 'SpaceBeforeComma', $data);
                     if ($fix === true) {
+                        $startOfCurrentParam = $phpcsFile->findNext(Tokens::$emptyTokens, ($commaToken + 1), null, true);
+
                         $phpcsFile->fixer->beginChangeset();
                         $phpcsFile->fixer->addContent($endOfPreviousParam, ',');
                         $phpcsFile->fixer->replaceToken($commaToken, '');
 
-                        for ($i = ($commaToken - 1); $tokens[$i]['code'] === T_WHITESPACE; $i--) {
-                            $phpcsFile->fixer->replaceToken($i, '');
-                        }
+                        if ($tokens[$commaToken]['line'] === $tokens[$startOfCurrentParam]['line']) {
+                            for ($i = ($commaToken + 1); $tokens[$i]['code'] === T_WHITESPACE; $i++) {
+                                $phpcsFile->fixer->replaceToken($i, '');
+                            }
+                        } else {
+                            for ($i = ($commaToken - 1);
+                                $tokens[$i]['code'] === T_WHITESPACE && $tokens[$endOfPreviousParam]['line'] !== $tokens[$i]['line'];
+                                $i--
+                            ) {
+                                $phpcsFile->fixer->replaceToken($i, '');
+                            }
 
-                        if ($tokens[$i]['code'] === T_COMMENT
-                            && substr($tokens[$i]['content'], -1) === $phpcsFile->eolChar
-                        ) {
-                            $phpcsFile->fixer->replaceToken($i, substr($tokens[$i]['content'], 0, -1));
+                            for ($i = ($commaToken + 1);
+                                $tokens[$i]['code'] === T_WHITESPACE && $tokens[$commaToken]['line'] === $tokens[$i]['line'];
+                                $i++
+                            ) {
+                                $phpcsFile->fixer->replaceToken($i, '');
+                            }
                         }
 
                         $phpcsFile->fixer->endChangeset();
-                    }
+                    }//end if
                 }//end if
 
                 // Don't check spacing after the comma if it is the last content on the line.

src/Standards/Squiz/Tests/Functions/FunctionDeclarationArgumentSpacingUnitTest.1.inc

@@ -191,5 +191,7 @@ function newlineBeforeCommaFixerRespectsComments(
     ,
     $paramB=10 /* comment */
 ,
-    $paramC=20
+    $paramC=20 # comment
+    , $paramC=30
+    , string $paramC='foo'
 ) {}

src/Standards/Squiz/Tests/Functions/FunctionDeclarationArgumentSpacingUnitTest.1.inc.fixed

@@ -167,5 +167,7 @@ function newlineBeforeCommaShouldBeFixedInOneGo(
 function newlineBeforeCommaFixerRespectsComments(
     $paramA, // comment
     $paramB=10, /* comment */
-    $paramC=20
+    $paramC=20, # comment
+    $paramC=30,
+    string $paramC='foo'
 ) {}

src/Standards/Squiz/Tests/Functions/FunctionDeclarationArgumentSpacingUnitTest.php

@@ -87,6 +87,8 @@ public function getErrorList($testFile='')
                 185 => 1,
                 191 => 1,
                 193 => 1,
+                195 => 1,
+                196 => 1,
             ];
 
         default: