From f095412891a683713a8d9da465e4edacd768bb90 Mon Sep 17 00:00:00 2001
From: Patrick Remy <remy@divera.gmbh>
Date: Sun, 19 Jan 2025 15:48:46 +0100
Subject: [PATCH] fix: revert adding expr-identifier for func-calls
---
.../Expression/ExpressionIdentifier.php | 22 -------------------
1 file changed, 22 deletions(-)
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/ExpressionIdentifier.php b/src/Psalm/Internal/Analyzer/Statements/Expression/ExpressionIdentifier.php
index 76711d0fa7f..634d49bcae6 100644
--- a/src/Psalm/Internal/Analyzer/Statements/Expression/ExpressionIdentifier.php
+++ b/src/Psalm/Internal/Analyzer/Statements/Expression/ExpressionIdentifier.php
@@ -8,12 +8,9 @@
use Psalm\Internal\Analyzer\ClassLikeAnalyzer;
use Psalm\Internal\Analyzer\StatementsAnalyzer;
-use function array_keys;
-use function array_map;
use function count;
use function implode;
use function in_array;
-use function is_int;
use function is_string;
use function strtolower;
@@ -210,25 +207,6 @@ public static function getExtendedVarId(
}
}
- if ($stmt instanceof PhpParser\Node\Expr\FuncCall) {
- if ($stmt->name instanceof PhpParser\Node\Name) {
- $resolved_name = $stmt->name->toCodeString();
- } else {
- $resolved_name = self::getExtendedVarId($stmt->name, $this_class_name, $source);
- }
- if ($resolved_name === null) {
- return null;
- }
-
- $argsPlaceholder = array_map(
- fn($index): string => is_int($index) ? '#' . ($index + 1) : $index,
- array_keys($stmt->args),
- );
- $argsPlaceholder = implode(', ', $argsPlaceholder);
-
- return $resolved_name . '(' . $argsPlaceholder . ')';
- }
-
if ($stmt instanceof PhpParser\Node\Expr\MethodCall
&& $stmt->name instanceof PhpParser\Node\Identifier
&& !$stmt->isFirstClassCallable()