danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2025-01-22 05:41:20 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #7263 from orklah/revert

Browse Source 
revert #7054
This commit is contained in:
orklah 2022-01-01 19:39:47 +01:00 committed by GitHub
commit 6f4707aa41
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Psalm/Internal/Analyzer/Statements/Expression/ExpressionIdentifier.php
View File

@ -219,10 +219,6 @@ class ExpressionIdentifier
} }
} }
if ($stmt instanceof PhpParser\Node\Expr\ConstFetch) {
return implode('\\', $stmt->name->parts);
}
return self::getVarId($stmt, $this_class_name, $source); return self::getVarId($stmt, $this_class_name, $source);
} }
} }

9
src/Psalm/Type/Reconciler.php
View File

@ -5,7 +5,6 @@ namespace Psalm\Type;
use InvalidArgumentException; use InvalidArgumentException;
use Psalm\CodeLocation; use Psalm\CodeLocation;
use Psalm\Codebase; use Psalm\Codebase;
use Psalm\Internal\Analyzer\Statements\Expression\Fetch\ConstFetchAnalyzer;
use Psalm\Internal\Analyzer\StatementsAnalyzer; use Psalm\Internal\Analyzer\StatementsAnalyzer;
use Psalm\Internal\Codebase\TaintFlowGraph; use Psalm\Internal\Codebase\TaintFlowGraph;
use Psalm\Internal\Codebase\VariableUseGraph; use Psalm\Internal\Codebase\VariableUseGraph;
@ -556,13 +555,7 @@ class Reconciler
$key_parts = self::breakUpPathIntoParts($key); $key_parts = self::breakUpPathIntoParts($key);
if (count($key_parts) === 1) { if (count($key_parts) === 1) {
if (isset($existing_keys[$key_parts[0]])) { return isset($existing_keys[$key_parts[0]]) ? clone $existing_keys[$key_parts[0]] : null;
return clone $existing_keys[$key_parts[0]];
}
if ($type = ConstFetchAnalyzer::getGlobalConstType($codebase, $key_parts[0], $key_parts[0])) {
return $type;
}
} }
$base_key = array_shift($key_parts); $base_key = array_shift($key_parts);