bug: FunctionsAnalyzer - fix detecting global function (#6792)

PHP-CS-Fixer · Feb 26, 2023 · cc6dea3 · cc6dea3
1 parent 8f4de80
commit cc6dea3
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 4 deletions.
diff --git a/src/Tokenizer/Analyzer/FunctionsAnalyzer.php b/src/Tokenizer/Analyzer/FunctionsAnalyzer.php
@@ -65,14 +65,14 @@ public function isGlobalFunctionCall(Tokens $tokens, int $index): bool
             return false;
         }
 
-        if ($previousIsNamespaceSeparator) {
-            return true;
-        }
-
         if ($tokens[$tokens->getNextMeaningfulToken($nextIndex)]->isGivenKind(CT::T_FIRST_CLASS_CALLABLE)) {
             return false;
         }
 
+        if ($previousIsNamespaceSeparator) {
+            return true;
+        }
+
         if ($tokens->isChanged() || $tokens->getCodeHash() !== $this->functionsAnalysis['tokens']) {
             $this->buildFunctionsAnalysis($tokens);
         }

diff --git a/tests/Fixer/LanguageConstruct/IsNullFixerTest.php b/tests/Fixer/LanguageConstruct/IsNullFixerTest.php
@@ -243,4 +243,25 @@ public static function provideFixCases(): array
             ],
         ];
     }
+
+    /**
+     * @dataProvider provideFix81Cases
+     *
+     * @requires PHP 8.1
+     */
+    public function testFix81(string $expected, ?string $input = null): void
+    {
+        $this->doTest($expected, $input);
+    }
+
+    public static function provideFix81Cases(): iterable
+    {
+        yield 'first-class callable' => [
+            '<?php array_filter([], is_null(...));',
+        ];
+
+        yield 'first-class callable with leading slash' => [
+            '<?php array_filter([], \is_null(...));',
+        ];
+    }
 }
diff --git a/tests/Tokenizer/Analyzer/FunctionsAnalyzerTest.php b/tests/Tokenizer/Analyzer/FunctionsAnalyzerTest.php
@@ -342,6 +342,7 @@ public static function provideIsGlobalFunctionCallPhp81Cases(): iterable
             [],
             '<?php
 strlen(...);
+\strlen(...);
 $closure(...);
 $invokableObject(...);
 $obj->method(...);