FunctionDeclarations::getArrowFunctionOpenClose(): arrow functions as function argument

Allow for arrow functions being used as function argument as per upstream commit squizlabs/PHP_CodeSniffer/commit/2914011675cd13f8a7d5eae16ed1d5ee4f0e701d which is included in PHPCS 3.5.5.

Also see: squizlabs/PHP_CodeSniffer 2895 and squizlabs/PHP_CodeSniffer 2523

Co-authored-by: Greg Sherwood <[email protected]>

Author: jrfnl

PHPCSUtils/Utils/FunctionDeclarations.php

@@ -676,6 +676,7 @@ public static function getArrowFunctionOpenClose(File $phpcsFile, $stackPtr)
 
         if ($tokens[$stackPtr]['type'] === 'T_FN'
             && isset($tokens[$stackPtr]['scope_closer']) === true
+            && \version_compare(Helper::getVersion(), '3.5.4', '>') === true
         ) {
             // The keys will either all be set or none will be set, so no additional checks needed.
             return [
@@ -736,12 +737,20 @@ public static function getArrowFunctionOpenClose(File $phpcsFile, $stackPtr)
 
         $returnValue['scope_opener'] = $arrow;
         $inTernary                   = false;
+        $lastEndToken                = null;
 
         for ($scopeCloser = ($arrow + 1); $scopeCloser < $phpcsFile->numTokens; $scopeCloser++) {
             if (isset(self::$arrowFunctionEndTokens[$tokens[$scopeCloser]['code']]) === true
                 // BC for misidentified ternary else in some PHPCS versions.
                 && ($tokens[$scopeCloser]['code'] !== \T_COLON || $inTernary === false)
             ) {
+                if ($lastEndToken !== null
+                    && $tokens[$scopeCloser]['code'] === \T_CLOSE_PARENTHESIS
+                    && $tokens[$scopeCloser]['parenthesis_opener'] < $arrow
+                ) {
+                    $scopeCloser = $lastEndToken;
+                }
+
                 break;
             }
 
@@ -763,12 +772,14 @@ public static function getArrowFunctionOpenClose(File $phpcsFile, $stackPtr)
             }
 
             if (isset($tokens[$scopeCloser]['parenthesis_closer']) === true) {
-                $scopeCloser = $tokens[$scopeCloser]['parenthesis_closer'];
+                $scopeCloser  = $tokens[$scopeCloser]['parenthesis_closer'];
+                $lastEndToken = $scopeCloser;
                 continue;
             }
 
             if (isset($tokens[$scopeCloser]['bracket_closer']) === true) {
-                $scopeCloser = $tokens[$scopeCloser]['bracket_closer'];
+                $scopeCloser  = $tokens[$scopeCloser]['bracket_closer'];
+                $lastEndToken = $scopeCloser;
                 continue;
             }
 

Tests/Utils/FunctionDeclarations/IsArrowFunctionTest.inc

@@ -88,6 +88,16 @@ array_map(
 /* testTernary */
 $fn = fn($a) => $a ? /* testTernaryThen */ fn() : string => 'a' : /* testTernaryElse */ fn() : string => 'b';
 
+$foo = foo(
+    /* testArrowFunctionAsArgument */
+    fn() => bar()
+);
+
+$foo = foo(
+    /* testArrowFunctionWithArrayAsArgument */
+    fn() => [$row[0], $row[3]]
+);
+
 /* testConstantDeclaration */
 const FN = 'a';
 

Tests/Utils/FunctionDeclarations/IsArrowFunctionTest.php

@@ -456,6 +456,30 @@ public function dataArrowFunction()
                     ],
                 ],
             ],
+            'arrow-function-as-function-call-argument' => [
+                '/* testArrowFunctionAsArgument */',
+                [
+                    'is'  => true,
+                    'get' => [
+                        'parenthesis_opener' => 1,
+                        'parenthesis_closer' => 2,
+                        'scope_opener'       => 4,
+                        'scope_closer'       => 8,
+                    ],
+                ],
+            ],
+            'arrow-function-as-function-call-argument-with-array-return' => [
+                '/* testArrowFunctionWithArrayAsArgument */',
+                [
+                    'is'  => true,
+                    'get' => [
+                        'parenthesis_opener' => 1,
+                        'parenthesis_closer' => 2,
+                        'scope_opener'       => 4,
+                        'scope_closer'       => 17,
+                    ],
+                ],
+            ],
             'arrow-function-nested-in-method' => [
                 '/* testNestedInMethod */',
                 [