FunctionsAnalyzer - false positive for constant and function definition

PHP-CS-Fixer · Jul 10, 2018 · 673de4a · 673de4a
1 parent fb4f582
commit 673de4a
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 8 deletions.
diff --git a/src/Fixer/LanguageConstruct/ErrorSuppressionFixer.php b/src/Fixer/LanguageConstruct/ErrorSuppressionFixer.php
@@ -114,7 +114,7 @@ protected function applyFix(\SplFileInfo $file, Tokens $tokens)
                 continue;
             }
 
-            if (!$functionsAnalyzer->isGlobalFunctionIndex($tokens, $index)) {
+            if (!$functionsAnalyzer->isGlobalFunctionCall($tokens, $index)) {
                 continue;
             }
 

diff --git a/src/Tokenizer/Analyzer/FunctionsAnalyzer.php b/src/Tokenizer/Analyzer/FunctionsAnalyzer.php
@@ -27,7 +27,7 @@ final class FunctionsAnalyzer
      *
      * @return bool
      */
-    public function isGlobalFunctionIndex(Tokens $tokens, $index)
+    public function isGlobalFunctionCall(Tokens $tokens, $index)
     {
         if (!$tokens[$index]->isGivenKind(T_STRING)) {
             return false;
@@ -40,8 +40,9 @@ public function isGlobalFunctionIndex(Tokens $tokens, $index)
 
         $nextIndex = $tokens->getNextMeaningfulToken($index);
 
-        return !$tokens[$prevIndex]->isGivenKind([T_DOUBLE_COLON, T_NEW, T_OBJECT_OPERATOR, T_STRING])
-            && !$tokens[$nextIndex]->isGivenKind([T_DOUBLE_COLON, T_NS_SEPARATOR]);
+        return !$tokens[$prevIndex]->isGivenKind([T_DOUBLE_COLON, T_NEW, T_OBJECT_OPERATOR, T_STRING, T_FUNCTION])
+            && !$tokens[$nextIndex]->isGivenKind([T_DOUBLE_COLON, T_NS_SEPARATOR])
+            && $tokens[$nextIndex]->equals('(');
     }
 
     /**

diff --git a/tests/Tokenizer/Analyzer/FunctionsAnalyzerTest.php b/tests/Tokenizer/Analyzer/FunctionsAnalyzerTest.php
@@ -32,19 +32,24 @@ final class FunctionsAnalyzerTest extends TestCase
      * @param string $code
      * @param int    $index
      *
-     * @dataProvider provideIsGlobalFunctionIndexCases
+     * @dataProvider provideIsGlobalFunctionCallCases
      */
-    public function testIsGlobalFunctionIndex($isFunctionIndex, $code, $index)
+    public function testIsGlobalFunctionCall($isFunctionIndex, $code, $index)
     {
         $tokens = Tokens::fromCode($code);
         $analyzer = new FunctionsAnalyzer();
 
-        $this->assertSame($isFunctionIndex, $analyzer->isGlobalFunctionIndex($tokens, $index));
+        $this->assertSame($isFunctionIndex, $analyzer->isGlobalFunctionCall($tokens, $index));
     }
 
-    public function provideIsGlobalFunctionIndexCases()
+    public function provideIsGlobalFunctionCallCases()
     {
         return [
+            [
+                false,
+                '<?php CONSTANT;',
+                1,
+            ],
             [
                 true,
                 '<?php foo("bar");',
@@ -90,6 +95,11 @@ public function provideIsGlobalFunctionIndexCases()
                 '<?php new bar("baz");',
                 3,
             ],
+            [
+                false,
+                '<?php function foo() {};',
+                3,
+            ],
         ];
     }