Hotfix: detecting end of statement with PHP 7.4 fn closure

Fixes #2748

Author: michalbundyra

src/Files/File.php

@@ -2356,10 +2356,12 @@ public function findEndOfStatement($start, $ignore=null)
  && ($i === $this->tokens[$i]['scope_opener']
  || $i === $this->tokens[$i]['scope_condition'])
  ) {
- if ($i === $start
- && (isset(Util\Tokens::$scopeOpeners[$this->tokens[$i]['code']]) === true
- || $this->tokens[$i]['code'] === T_FN)
- ) {
+ if ($this->tokens[$i]['code'] === T_FN) {
+ $i = ($this->tokens[$i]['scope_closer'] - 1);
+ continue;
+ }
+
+ if ($i === $start && isset(Util\Tokens::$scopeOpeners[$this->tokens[$i]['code']]) === true) {
  return $this->tokens[$i]['scope_closer'];
  }
 

tests/Core/Tokenizer/BackfillFnTokenTest.inc

@@ -69,3 +69,8 @@ fn(callable $a) : callable => $a;
 
 /* testTernary */
 $fn = fn($a) => $a ? /* testTernaryThen */ fn() : string => 'a' : /* testTernaryElse */ fn() : string => 'b';
+
+/* testEndOfStatement */
+static fn ($a) => $a;
+
+return 0;

tests/Core/Tokenizer/BackfillFnTokenTest.php

@@ -594,4 +594,23 @@ private function backfillHelper($token)
  }//end backfillHelper()
 
 
+ /**
+ * Test end of statement for fn closure.
+ *
+ * @return void
+ */
+ public function testEndOfStatement()
+ {
+ $token = $this->getTargetToken('/* testEndOfStatement */', T_FN);
+ $this->backfillHelper($token);
+
+ $static = self::$phpcsFile->findPrevious(T_STATIC, ($token - 1));
+ $endOfStatementStatic = self::$phpcsFile->findEndOfStatement($static);
+ $endOfStatementFn = self::$phpcsFile->findEndOfStatement($token);
+
+ $this->assertSame($endOfStatementFn, $endOfStatementStatic);
+
+ }//end testEndOfStatement()
+
+
 }//end class