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

Ensure that ClassLikeStorage exists when running plugin method

Browse Source
This commit is contained in:
Matthew Brown 2018-02-22 22:35:48 -05:00
parent 6d658ef934
commit 8f2ef50947
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/Psalm/Visitor/DependencyFinderVisitor.php
View File

@ -157,10 +157,6 @@ class DependencyFinderVisitor extends PhpParser\NodeVisitorAbstract implements P
}
}
} elseif ($node instanceof PhpParser\Node\Stmt\ClassLike) {
if ($this->use_storage_cache) {
return PhpParser\NodeTraverser::DONT_TRAVERSE_CHILDREN;
}
if ($node->name === null) {
if (!$node instanceof PhpParser\Node\Stmt\Class_) {
throw new \LogicException('Anonymous classes are always classes');
@ -177,16 +173,25 @@ class DependencyFinderVisitor extends PhpParser\NodeVisitorAbstract implements P
$this->fq_classlike_names[] = $fq_classlike_name;
$storage = $this->codebase->createClassLikeStorage($fq_classlike_name);
if (!$this->use_storage_cache) {
$storage = $this->codebase->createClassLikeStorage($fq_classlike_name);
$storage->location = new CodeLocation($this->file_scanner, $node, null, true);
$storage->user_defined = !$this->codebase->register_global_functions;
$storage->stubbed = $this->codebase->register_global_functions;
$doc_comment = $node->getDocComment();
$storage->location = new CodeLocation($this->file_scanner, $node, null, true);
$storage->user_defined = !$this->codebase->register_global_functions;
$storage->stubbed = $this->codebase->register_global_functions;
} else {
$this->codebase->exhumeClassLikeStorage($fq_classlike_name, $this->file_path);
$storage = $this->codebase->classlike_storage_provider->get($fq_classlike_name);
}
$this->classlike_storages[] = $storage;
if ($this->use_storage_cache) {
return PhpParser\NodeTraverser::DONT_TRAVERSE_CHILDREN;
}
$doc_comment = $node->getDocComment();
if ($doc_comment) {
$docblock_info = null;
try {