fix incorrect circular dependency if multiple stubbed types (trait+interface, or trait+extends,...) are used

Author: kkmuffme

src/Psalm/Internal/Codebase/Populator.php

@@ -251,7 +251,7 @@ private function populateClassLikeStorage(ClassLikeStorage $storage, array $depe
 
                 $dependency->populated = false;
                 unset($dependency->invalid_dependencies[$fq_classlike_name_lc]);
-                $this->populateClassLikeStorage($dependency, $dependent_classlikes);
+                $this->populateClassLikeStorage($dependency, $dependency->dependent_classlikes);
             }
 
             unset($this->invalid_class_storages[$fq_classlike_name_lc]);

tests/StubTest.php

@@ -1245,6 +1245,56 @@ public function run_stubbed($x): float {
         $this->analyzeFile($file_path, new Context());
     }
 
+    public function testUseOnlyStubbedTraitAndInterface(): void
+    {
+        $this->project_analyzer = $this->getProjectAnalyzerWithConfig(
+            TestConfig::loadFromXML(
+                dirname(__DIR__),
+                '<?xml version="1.0"?>
+                <psalm
+                    errorLevel="1"
+                >
+                    <projectFiles>
+                        <directory name="src" />
+                    </projectFiles>
+
+                    <stubs>
+                        <file name="tests/fixtures/stubs/trait.phpstub" />
+                        <file name="tests/fixtures/stubs/interface.phpstub" />
+                    </stubs>
+                </psalm>',
+            ),
+        );
+
+        $file_path = (string) getcwd() . '/src/somefile.php';
+
+        $this->addFile(
+            $file_path,
+            '<?php
+                namespace Foo;
+
+                class A implements StubbedInterface {
+                    use StubbedTrait;
+
+                    public function run(): float {
+                        return $this->run_stubbed_trait(rand(7, 9));
+                    }
+
+                    /**
+                     * @param int $x
+                     */
+                    public function run_stubbed($x): float {
+                        return $x . "";
+                    }
+                }',
+        );
+
+        $this->expectExceptionMessage('InvalidReturnType');
+        $this->expectException(CodeException::class);
+
+        $this->analyzeFile($file_path, new Context());
+    }
+
     public function testStubFileWithExtendedStubbedClass(): void
     {
         $this->project_analyzer = $this->getProjectAnalyzerWithConfig(