From 7206db2cb642ca81b3946ba1f2d9b87891adb18a Mon Sep 17 00:00:00 2001
From: Matt Brown <github@muglug.com>
Date: Tue, 1 Dec 2020 11:23:38 -0500
Subject: [PATCH] Fix #4705 - clear documenting method ids when scanning stubs

---
 src/Psalm/Internal/Codebase/Populator.php | 2 ++
 tests/StubTest.php                        | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Psalm/Internal/Codebase/Populator.php b/src/Psalm/Internal/Codebase/Populator.php
index 71ec2f483..a24afc0c2 100644
--- a/src/Psalm/Internal/Codebase/Populator.php
+++ b/src/Psalm/Internal/Codebase/Populator.php
@@ -273,6 +273,8 @@ class Populator
     private function populateOverriddenMethods(
         ClassLikeStorage $storage
     ): void {
+        $storage->documenting_method_ids = [];
+
         foreach ($storage->methods as $method_name => $method_storage) {
             if (isset($storage->overridden_method_ids[$method_name])) {
                 $overridden_method_ids = $storage->overridden_method_ids[$method_name];
diff --git a/tests/StubTest.php b/tests/StubTest.php
index 3c806baae..fb302d089 100644
--- a/tests/StubTest.php
+++ b/tests/StubTest.php
@@ -1181,8 +1181,6 @@ class StubTest extends TestCase
 
     public function testStubReplacingInterfaceDocblock(): void
     {
-        $this->markTestSkipped('Tis broken');
-
         $this->project_analyzer = $this->getProjectAnalyzerWithConfig(
             TestConfig::loadFromXML(
                 dirname(__DIR__),