Skip to content
Permalink
Browse files

Fix #2565 - prevent infinite recursion when analysing file with @mixin

…annotations that reference each other
  • Loading branch information
muglug committed Jan 7, 2020
1 parent 55aceb2 commit adfb4889868869a268167f541a65cb5033b23b52
Showing with 2 additions and 2 deletions.
  1. +2 −2 src/Psalm/Internal/Codebase/Populator.php
@@ -175,14 +175,14 @@ private function populateClassLikeStorage(ClassLikeStorage $storage, array $depe

$storage_provider = $this->classlike_storage_provider;

$dependent_classlikes[$fq_classlike_name_lc] = true;

$this->populateDataFromTraits($storage, $storage_provider, $dependent_classlikes);

if ($storage->mixin_fqcln) {
$this->populateDataFromMixin($storage, $storage_provider, $dependent_classlikes, $storage->mixin_fqcln);
}

$dependent_classlikes[$fq_classlike_name_lc] = true;

if ($storage->parent_classes) {
$this->populateDataFromParentClass($storage, $storage_provider, $dependent_classlikes);
}

0 comments on commit adfb488

Please sign in to comment.
You can’t perform that action at this time.