diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/ExpressionIdentifier.php b/src/Psalm/Internal/Analyzer/Statements/Expression/ExpressionIdentifier.php index c5f64d47206..ed779f5a539 100644 --- a/src/Psalm/Internal/Analyzer/Statements/Expression/ExpressionIdentifier.php +++ b/src/Psalm/Internal/Analyzer/Statements/Expression/ExpressionIdentifier.php @@ -219,10 +219,6 @@ public static function getArrayVarId( } } - if ($stmt instanceof PhpParser\Node\Expr\ConstFetch) { - return implode('\\', $stmt->name->parts); - } - return self::getVarId($stmt, $this_class_name, $source); } } diff --git a/src/Psalm/Type/Reconciler.php b/src/Psalm/Type/Reconciler.php index f67cdbf1a91..67a828515a9 100644 --- a/src/Psalm/Type/Reconciler.php +++ b/src/Psalm/Type/Reconciler.php @@ -5,7 +5,6 @@ use InvalidArgumentException; use Psalm\CodeLocation; use Psalm\Codebase; -use Psalm\Internal\Analyzer\Statements\Expression\Fetch\ConstFetchAnalyzer; use Psalm\Internal\Analyzer\StatementsAnalyzer; use Psalm\Internal\Codebase\TaintFlowGraph; use Psalm\Internal\Codebase\VariableUseGraph; @@ -556,13 +555,7 @@ private static function getValueForKey( $key_parts = self::breakUpPathIntoParts($key); if (count($key_parts) === 1) { - if (isset($existing_keys[$key_parts[0]])) { - return clone $existing_keys[$key_parts[0]]; - } - - if ($type = ConstFetchAnalyzer::getGlobalConstType($codebase, $key_parts[0], $key_parts[0])) { - return $type; - } + return isset($existing_keys[$key_parts[0]]) ? clone $existing_keys[$key_parts[0]] : null; } $base_key = array_shift($key_parts);