danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2024-11-27 04:45:20 +01:00
Code Issues Projects Releases Wiki Activity

Fix re-added function storage removal

Browse Source
This commit is contained in:
Brown 2019-11-14 12:17:17 -05:00
parent b693b726c7
commit 738ce4f850
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Psalm/Internal/Visitor/ReflectorVisitor.php
View File

@ -1571,7 +1571,10 @@ class ReflectorVisitor extends PhpParser\NodeVisitorAbstract implements PhpParse
if ($duplicate_function_storage->location if ($duplicate_function_storage->location
&& $duplicate_function_storage->location->getLineNumber() === $stmt->getLine() && $duplicate_function_storage->location->getLineNumber() === $stmt->getLine()
) { ) {
return $this->file_storage->functions[$function_id]; $storage = $this->file_storage->functions[$function_id];
$this->functionlike_storages[] = $storage;
return $storage;
} }
if (IssueBuffer::accepts( if (IssueBuffer::accepts(
@ -1590,8 +1593,13 @@ class ReflectorVisitor extends PhpParser\NodeVisitorAbstract implements PhpParse
$duplicate_function_storage->has_visitor_issues = true; $duplicate_function_storage->has_visitor_issues = true;
return $this->file_storage->functions[$function_id]; $storage = $this->file_storage->functions[$function_id];
} elseif (isset($this->config->getPredefinedFunctions()[$function_id])) { $this->functionlike_storages[] = $storage;
return $storage;
}
if (isset($this->config->getPredefinedFunctions()[$function_id])) {
/** @psalm-suppress TypeCoercion */ /** @psalm-suppress TypeCoercion */
$reflection_function = new \ReflectionFunction($function_id); $reflection_function = new \ReflectionFunction($function_id);