Hotfix: detecting end of statement with PHP 7.4 fn closure

Fixes squizlabs#2748
michalbundyra · Dec 6, 2019 · 6c2020a · 6c2020a
1 parent 2ecd8dc
commit 6c2020a
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/Files/File.php b/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'];
                 }