Fix #1935 - clear stub grandchildren

vimeo · Jul 11, 2019 · 12eeb8b · 12eeb8b
1 parent 7d05568
commit 12eeb8b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/src/Psalm/Internal/Codebase/Populator.php b/src/Psalm/Internal/Codebase/Populator.php
@@ -117,6 +117,12 @@ public function populateCodebase(\Psalm\Codebase $codebase)
                 }
             }
 
+            foreach ($class_storage->dependent_classlikes as $dependent_classlike_name => $_) {
+                $dependee_storage = $this->classlike_storage_provider->get($dependent_classlike_name);
+
+                $class_storage->dependent_classlikes += $dependee_storage->dependent_classlikes;
+            }
+
             if ($class_storage->aliases) {
                 foreach ($class_storage->public_class_constant_nodes as $const_name => $node) {
                     $const_type = \Psalm\Internal\Analyzer\StatementsAnalyzer::getSimpleType(

diff --git a/tests/StubTest.php b/tests/StubTest.php
@@ -929,7 +929,7 @@ public function foo(string $a) {
      */
     public function testStubFileWithTemplatedClassDefinitionAndMagicMethodOverride()
     {
-        $this->markTestSkipped('Currently broken');
+        //$this->markTestSkipped('Currently broken');
         $this->project_analyzer = $this->getProjectAnalyzerWithConfig(
             TestConfig::loadFromXML(
                 dirname(__DIR__),

diff --git a/tests/fixtures/stubs/templated_class.php b/tests/fixtures/stubs/templated_class.php
@@ -10,3 +10,5 @@ class A {
      */
     public function find($id, $lockMode = null, $lockVersion = null) {}
 }
+
+