Merge branch 'feature/pear-functioncallsignature-bugfix' of https://github.com/jrfnl/PHP_CodeSniffer

Author: gsherwood

src/Standards/PEAR/Sniffs/Functions/FunctionCallSignatureSniff.php

@@ -546,7 +546,7 @@ public function processMultiLineCall(File $phpcsFile, $stackPtr, $openBracket, $
             // If we are within an argument we should be ignoring commas
             // as these are not signaling the end of an argument.
             if ($inArg === false && $tokens[$i]['code'] === T_COMMA) {
-                $next = $phpcsFile->findNext([T_WHITESPACE, T_COMMENT], ($i + 1), $closeBracket, true);
+                $next = $phpcsFile->findNext(Tokens::$emptyTokens, ($i + 1), $closeBracket, true);
                 if ($next === false) {
                     continue;
                 }

src/Standards/PEAR/Tests/Functions/FunctionCallSignatureUnitTest.inc

@@ -390,8 +390,29 @@ $deprecated_functions = [
 
 $deprecated_functions = [
     'the_category_ID'
-         => function_call( // 7 spaces, not 8. This is the problem line.
+         => function_call( // 9 spaces, not 8. This is the problem line.
         $a,
         $b
     ),
 ];
+
+// phpcs:set PEAR.Functions.FunctionCallSignature allowMultipleArguments false
+
+printf(
+    '<select name="%1$s" id="%2$s">%3$s</select>',
+    $obj->getName(), // Trailing comment.
+    $obj->getID(), // phpcs:ignore Standard.Category.SniffName -- for reasons.
+    $option
+);
+
+// Handling of PHP 7.3 trailing comma's.
+functionCall($args, $foo,);
+functionCall(
+    $args, $foo,
+);
+functionCall(
+    $args,
+    $foo,
+);
+
+// phpcs:set PEAR.Functions.FunctionCallSignature allowMultipleArguments true

src/Standards/PEAR/Tests/Functions/FunctionCallSignatureUnitTest.inc.fixed

@@ -403,8 +403,30 @@ $deprecated_functions = [
 
 $deprecated_functions = [
     'the_category_ID'
-        => function_call( // 7 spaces, not 8. This is the problem line.
+        => function_call( // 9 spaces, not 8. This is the problem line.
             $a,
             $b
         ),
 ];
+
+// phpcs:set PEAR.Functions.FunctionCallSignature allowMultipleArguments false
+
+printf(
+    '<select name="%1$s" id="%2$s">%3$s</select>',
+    $obj->getName(), // Trailing comment.
+    $obj->getID(), // phpcs:ignore Standard.Category.SniffName -- for reasons.
+    $option
+);
+
+// Handling of PHP 7.3 trailing comma's.
+functionCall($args, $foo,);
+functionCall(
+    $args,
+    $foo,
+);
+functionCall(
+    $args,
+    $foo,
+);
+
+// phpcs:set PEAR.Functions.FunctionCallSignature allowMultipleArguments true

src/Standards/PEAR/Tests/Functions/FunctionCallSignatureUnitTest.php

@@ -111,6 +111,7 @@ public function getErrorList($testFile='FunctionCallSignatureUnitTest.inc')
             394 => 1,
             395 => 1,
             396 => 1,
+            411 => 1,
         ];
 
     }//end getErrorList()