Merge branch 'php-8.0/3253-psr2-functioncallsignature-support-named-params' of https://github.com/jrfnl/PHP_CodeSniffer

Author: gsherwood

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

@@ -581,7 +581,7 @@ public function processMultiLineCall(File $phpcsFile, $stackPtr, $openBracket, $
 
                 if ($inArg === false) {
                     $argStart = $nextCode;
-                    $argEnd   = $phpcsFile->findEndOfStatement($nextCode);
+                    $argEnd   = $phpcsFile->findEndOfStatement($nextCode, [T_COLON]);
                 }
             }//end if
 
@@ -618,7 +618,7 @@ public function processMultiLineCall(File $phpcsFile, $stackPtr, $openBracket, $
                 }//end if
 
                 $argStart = $next;
-                $argEnd   = $phpcsFile->findEndOfStatement($next);
+                $argEnd   = $phpcsFile->findEndOfStatement($next, [T_COLON]);
             }//end if
         }//end for
 

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

@@ -525,3 +525,26 @@ return trim(preg_replace_callback(
 
 $a = ['a' => function ($b) { return $b; }];
 $a['a']( 1 );
+
+// PHP 8.0 named parameters.
+array_fill_keys(
+    keys: range(
+        1,
+        12,
+    ),
+    value: true,
+);
+
+array_fill_keys(
+    keys: range( 1,
+            12,
+    ), value: true,
+);
+
+// phpcs:set PEAR.Functions.FunctionCallSignature allowMultipleArguments false
+array_fill_keys(
+    keys: range( 1,
+            12,
+    ), value: true,
+);
+// phpcs:set PEAR.Functions.FunctionCallSignature allowMultipleArguments true

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

@@ -537,3 +537,29 @@ return trim(
 
 $a = ['a' => function ($b) { return $b; }];
 $a['a'](1);
+
+// PHP 8.0 named parameters.
+array_fill_keys(
+    keys: range(
+        1,
+        12,
+    ),
+    value: true,
+);
+
+array_fill_keys(
+    keys: range(
+        1,
+        12,
+    ), value: true,
+);
+
+// phpcs:set PEAR.Functions.FunctionCallSignature allowMultipleArguments false
+array_fill_keys(
+    keys: range(
+        1,
+        12,
+    ),
+    value: true,
+);
+// phpcs:set PEAR.Functions.FunctionCallSignature allowMultipleArguments true

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

@@ -126,6 +126,11 @@ public function getErrorList($testFile='FunctionCallSignatureUnitTest.inc')
             523 => 1,
             524 => 3,
             527 => 2,
+            539 => 1,
+            540 => 1,
+            546 => 1,
+            547 => 1,
+            548 => 1,
         ];
 
     }//end getErrorList()

src/Standards/PSR2/Sniffs/Methods/FunctionCallSignatureSniff.php

@@ -48,7 +48,7 @@ public function isMultiLineCall(File $phpcsFile, $stackPtr, $openBracket, $token
 
         $closeBracket = $tokens[$openBracket]['parenthesis_closer'];
 
-        $end = $phpcsFile->findEndOfStatement($openBracket + 1);
+        $end = $phpcsFile->findEndOfStatement(($openBracket + 1), [T_COLON]);
         while ($tokens[$end]['code'] === T_COMMA) {
             // If the next bit of code is not on the same line, this is a
             // multi-line function call.
@@ -61,7 +61,7 @@ public function isMultiLineCall(File $phpcsFile, $stackPtr, $openBracket, $token
                 return true;
             }
 
-            $end = $phpcsFile->findEndOfStatement($next);
+            $end = $phpcsFile->findEndOfStatement($next, [T_COLON]);
         }
 
         // We've reached the last argument, so see if the next content

src/Standards/PSR2/Tests/Methods/FunctionCallSignatureUnitTest.inc

@@ -242,3 +242,26 @@ function (array $term) use ($mode): string {
 },
 $search
 ));
+
+// PHP 8.0 named parameters.
+array_fill_keys(
+    keys: range(
+        1,
+        12,
+    ),
+    value: true,
+);
+
+array_fill_keys(
+    keys: range( 1,
+            12,
+    ), value: true,
+);
+
+// phpcs:set PSR2.Methods.FunctionCallSignature allowMultipleArguments true
+array_fill_keys(
+    keys: range( 1,
+            12,
+    ), value: true,
+);
+// phpcs:set PSR2.Methods.FunctionCallSignature allowMultipleArguments false

src/Standards/PSR2/Tests/Methods/FunctionCallSignatureUnitTest.inc.fixed

@@ -255,3 +255,29 @@ return trim(preg_replace_callback(
     },
     $search
 ));
+
+// PHP 8.0 named parameters.
+array_fill_keys(
+    keys: range(
+        1,
+        12,
+    ),
+    value: true,
+);
+
+array_fill_keys(
+    keys: range(
+        1,
+        12,
+    ),
+    value: true,
+);
+
+// phpcs:set PSR2.Methods.FunctionCallSignature allowMultipleArguments true
+array_fill_keys(
+    keys: range(
+        1,
+        12,
+    ), value: true,
+);
+// phpcs:set PSR2.Methods.FunctionCallSignature allowMultipleArguments false

src/Standards/PSR2/Tests/Methods/FunctionCallSignatureUnitTest.php

@@ -66,6 +66,11 @@ public function getErrorList()
             234 => 1,
             242 => 1,
             243 => 1,
+            256 => 1,
+            257 => 1,
+            258 => 1,
+            263 => 1,
+            264 => 1,
         ];
 
     }//end getErrorList()