From dd721a27c5a2468a3a846107247b5713829448f1 Mon Sep 17 00:00:00 2001 From: Daniil Gentili Date: Wed, 21 Dec 2022 14:00:57 +0100 Subject: [PATCH 1/2] Revert --- src/Psalm/Internal/Codebase/Methods.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Psalm/Internal/Codebase/Methods.php b/src/Psalm/Internal/Codebase/Methods.php index 90805291218..37631e603d9 100644 --- a/src/Psalm/Internal/Codebase/Methods.php +++ b/src/Psalm/Internal/Codebase/Methods.php @@ -803,7 +803,7 @@ public function getMethodReturnType( return $candidate_type; } - if ($old_contained_by_new || $overridden_storage_return_type->hasTemplate()) { + if ($old_contained_by_new) { $self_class = $appearing_fq_class_storage->name; return $candidate_type; From e2a5ef1eb52538993f2c3b7388cf07ceedc1767c Mon Sep 17 00:00:00 2001 From: Daniil Gentili Date: Wed, 21 Dec 2022 14:05:05 +0100 Subject: [PATCH 2/2] Revert --- tests/Template/ClassTemplateExtendsTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Template/ClassTemplateExtendsTest.php b/tests/Template/ClassTemplateExtendsTest.php index 5f9eaef20cb..17abbb12dd2 100644 --- a/tests/Template/ClassTemplateExtendsTest.php +++ b/tests/Template/ClassTemplateExtendsTest.php @@ -16,7 +16,7 @@ class ClassTemplateExtendsTest extends TestCase public function providerValidCodeParse(): iterable { return [ - 'interface' => [ + 'SKIPPED-interface' => [ 'code' => '