BCFile::findEndOfStatement(): 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/BackCompat/BCFile.php

@@ -1251,6 +1251,7 @@ public static function findStartOfStatement(File $phpcsFile, $start, $ignore = n
      * - PHPCS 3.5.0: Improved handling of group use statements.
      * - PHPCS 3.5.3: Added support for PHP 7.4 T_FN arrow functions.
      * - PHPCS 3.5.4: Improved support for PHP 7.4 T_FN arrow functions.
+     * - PHPCS 3.5.5: Improved support for PHP 7.4 T_FN arrow functions, PHPCS #2895.
      *
      * @see \PHP_CodeSniffer\Files\File::findEndOfStatement() Original source.
      *
@@ -1288,7 +1289,6 @@ public static function findEndOfStatement(File $phpcsFile, $start, $ignore = nul
         }
 
         $lastNotEmpty = $start;
-
         for ($i = $start; $i < $phpcsFile->numTokens; $i++) {
             if ($i !== $start && isset($endTokens[$tokens[$i]['code']]) === true) {
                 // Found the end of the statement.
@@ -1311,6 +1311,8 @@ public static function findEndOfStatement(File $phpcsFile, $start, $ignore = nul
                 || $i === $tokens[$i]['scope_condition'])
             ) {
                 if ($tokens[$i]['type'] === 'T_FN') {
+                    $lastNotEmpty = $tokens[$i]['scope_closer'];
+
                     // Minus 1 as the closer can be shared.
                     $i = ($tokens[$i]['scope_closer'] - 1);
                     continue;
@@ -1342,8 +1344,11 @@ public static function findEndOfStatement(File $phpcsFile, $start, $ignore = nul
                         return $arrowFunctionOpenClose['scope_closer'];
                     }
 
+                    $lastNotEmpty = $arrowFunctionOpenClose['scope_closer'];
+
                     // Minus 1 as the closer can be shared.
                     $i = ($arrowFunctionOpenClose['scope_closer'] - 1);
+                    continue;
                 }
             }
 

Tests/BackCompat/BCFile/FindEndOfStatementTest.inc

@@ -42,4 +42,14 @@ static fn ($a) => $a;
 /* testArrowFunctionReturnValue */
 fn(): array => [a($a, $b)];
 
+$foo = foo(
+    /* testArrowFunctionAsArgument */
+    fn() => bar()
+);
+
+$foo = foo(
+    /* testArrowFunctionWithArrayAsArgument */
+    fn() => [$row[0], $row[3]]
+);
+
 return 0;

Tests/BackCompat/BCFile/FindEndOfStatementTest.php

@@ -207,4 +207,33 @@ public function testArrowFunctionReturnValue()
 
         $this->assertSame(($start + 18), $found);
     }
+
+    /**
+     * Test arrow function used as a function argument.
+     *
+     * @return void
+     */
+    public function testArrowFunctionAsArgument()
+    {
+        $start = $this->getTargetToken('/* testArrowFunctionAsArgument */', Collections::arrowFunctionTokensBC());
+        $found = BCFile::findEndOfStatement(self::$phpcsFile, $start);
+
+        $this->assertSame(($start + 8), $found);
+    }
+
+    /**
+     * Test arrow function with arrays used as a function argument.
+     *
+     * @return void
+     */
+    public function testArrowFunctionWithArrayAsArgument()
+    {
+        $start = $this->getTargetToken(
+            '/* testArrowFunctionWithArrayAsArgument */',
+            Collections::arrowFunctionTokensBC()
+        );
+        $found = BCFile::findEndOfStatement(self::$phpcsFile, $start);
+
+        $this->assertSame(($start + 17), $found);
+    }
 }