bug #3910 FunctionsAnalyzer - fix isGlobalFunctionCall (gharlan)

This PR was squashed before being merged into the 2.12 branch (closes #3910). Discussion ---------- FunctionsAnalyzer - fix isGlobalFunctionCall Commits ------- c9849f8 FunctionsAnalyzer - fix isGlobalFunctionCall
PHP-CS-Fixer · Jul 20, 2018 · e576dc9 · e576dc9
2 parents 0790602 + c9849f8
commit e576dc9
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/src/Tokenizer/Analyzer/FunctionsAnalyzer.php b/src/Tokenizer/Analyzer/FunctionsAnalyzer.php
@@ -14,6 +14,7 @@
 
 use PhpCsFixer\Tokenizer\Analyzer\Analysis\ArgumentAnalysis;
 use PhpCsFixer\Tokenizer\Analyzer\Analysis\TypeAnalysis;
+use PhpCsFixer\Tokenizer\CT;
 use PhpCsFixer\Tokenizer\Tokens;
 
 /**
@@ -40,7 +41,7 @@ public function isGlobalFunctionCall(Tokens $tokens, $index)
 
         $nextIndex = $tokens->getNextMeaningfulToken($index);
 
-        return !$tokens[$prevIndex]->isGivenKind([T_DOUBLE_COLON, T_FUNCTION, T_NEW, T_OBJECT_OPERATOR, T_STRING])
+        return !$tokens[$prevIndex]->isGivenKind([T_DOUBLE_COLON, T_FUNCTION, CT::T_NAMESPACE_OPERATOR, T_NEW, T_OBJECT_OPERATOR, CT::T_RETURN_REF, T_STRING])
             && $tokens[$nextIndex]->equals('(');
     }
 

diff --git a/tests/Tokenizer/Analyzer/FunctionsAnalyzerTest.php b/tests/Tokenizer/Analyzer/FunctionsAnalyzerTest.php
@@ -97,7 +97,17 @@ public function provideIsGlobalFunctionCallCases()
             ],
             [
                 false,
-                '<?php function foo() {};',
+                '<?php function foo() {}',
+                3,
+            ],
+            [
+                false,
+                '<?php function & foo() {}',
+                5,
+            ],
+            [
+                false,
+                '<?php namespace\foo("bar");',
                 3,
             ],
         ];