fix: Do not prefix excluded functions used in call_user_func_array() (

#1028)
humbug · May 5, 2024 · c1e866e · c1e866e
1 parent 4f8d70b
commit c1e866e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/specs/string-literal/func-arg-call-user-func.php b/specs/string-literal/func-arg-call-user-func.php
@@ -23,6 +23,7 @@
     'FQCN string argument' => <<<'PHP'
         <?php
 
+        call_user_func_array('sprintf', []);
         call_user_func_array('sodiumCompatAutoloader', []);
         call_user_func_array('Sodium\compatAutoloader', []);
         call_user_func_array(['Swift', 'autoload'], []);
@@ -38,6 +39,7 @@
 
         namespace Humbug;
 
+        \call_user_func_array('sprintf', []);
         \call_user_func_array('Humbug\sodiumCompatAutoloader', []);
         \call_user_func_array('Humbug\Sodium\compatAutoloader', []);
         \call_user_func_array(['Humbug\Swift', 'autoload'], []);

diff --git a/src/PhpParser/NodeVisitor/StringScalarPrefixer.php b/src/PhpParser/NodeVisitor/StringScalarPrefixer.php
@@ -249,19 +249,20 @@ private function prefixFunctionStringArg(String_ $string, FuncCall $functionNode
 
         $isConstantNode = self::isConstantNode($string);
 
-        if (!$isConstantNode) {
-            if ('define' === $functionName
-                && $this->belongsToTheGlobalNamespace($string)
-            ) {
-                return $string;
-            }
-
-            return $this->enrichedReflector->isClassExcluded($normalizedValue)
+        if ($isConstantNode) {
+            return $this->enrichedReflector->isExposedConstant($normalizedValue)
                 ? $string
                 : $this->createPrefixedString($string);
         }
 
-        return $this->enrichedReflector->isExposedConstant($normalizedValue)
+        if ('define' === $functionName
+            && $this->belongsToTheGlobalNamespace($string)
+        ) {
+            return $string;
+        }
+
+        return $this->enrichedReflector->isClassExcluded($normalizedValue)
+            || $this->enrichedReflector->isFunctionExcluded($normalizedValue)
             ? $string
             : $this->createPrefixedString($string);
     }