From 2d44d0558e92dbc90da45e525d8293f71dc86f26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilian=20B=C3=B6sing?=
 <2189546+boesing@users.noreply.github.com>
Date: Sun, 10 Sep 2023 15:22:36 +0200
Subject: [PATCH] qa: remove unnecessary type juggling regarding inherited
 assertions
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Maximilian Bösing <2189546+boesing@users.noreply.github.com>
---
 .../AssertionsFromInheritanceResolver.php     | 77 +------------------
 1 file changed, 1 insertion(+), 76 deletions(-)

diff --git a/src/Psalm/Internal/Codebase/AssertionsFromInheritanceResolver.php b/src/Psalm/Internal/Codebase/AssertionsFromInheritanceResolver.php
index 489c88f3644..aa42e2a8942 100644
--- a/src/Psalm/Internal/Codebase/AssertionsFromInheritanceResolver.php
+++ b/src/Psalm/Internal/Codebase/AssertionsFromInheritanceResolver.php
@@ -5,17 +5,13 @@
 namespace Psalm\Internal\Codebase;
 
 use Psalm\Codebase;
-use Psalm\Storage\Assertion\IsType;
 use Psalm\Storage\ClassLikeStorage;
 use Psalm\Storage\MethodStorage;
 use Psalm\Storage\Possibilities;
-use Psalm\Type\Atomic\TTemplateParam;
 
 use function array_filter;
-use function array_map;
 use function array_merge;
 use function array_values;
-use function reset;
 use function strtolower;
 
 /**
@@ -61,80 +57,9 @@ public function resolve(
              * Since the inheritance does not provide its own assertions, we have to detect those
              * from inherited classes
              */
-            $assertions += array_map(
-                fn(Possibilities $possibilities) => $this->modifyAssertionsForInheritance(
-                    $possibilities,
-                    $this->codebase,
-                    $called_class,
-                    $inherited_classes_and_interfaces,
-                ),
-                $potential_assertion_providing_method_storage->assertions,
-            );
+            $assertions += $potential_assertion_providing_method_storage->assertions;
         }
 
         return $assertions;
     }
-
-    /**
-     * In case the called class is either implementing or extending a class/interface which does also has the
-     * template we are searching for, we assume that the called method has the same assertions.
-     *
-     * @param list<class-string> $potential_assertion_providing_classes
-     */
-    private function modifyAssertionsForInheritance(
-        Possibilities $possibilities,
-        Codebase $codebase,
-        ClassLikeStorage $called_class,
-        array $potential_assertion_providing_classes
-    ): Possibilities {
-        $replacement = new Possibilities($possibilities->var_id, []);
-        $extended_params = $called_class->template_extended_params;
-        foreach ($possibilities->rule as $assertion) {
-            if (!$assertion instanceof IsType
-                || !$assertion->type instanceof TTemplateParam) {
-                $replacement->rule[] = $assertion;
-                continue;
-            }
-
-            /** Called class does not extend the template parameter */
-            $extended_templates = $called_class->template_extended_params;
-            if (!isset($extended_templates[$assertion->type->defining_class][$assertion->type->param_name])) {
-                $replacement->rule[] = $assertion;
-                continue;
-            }
-
-            foreach ($potential_assertion_providing_classes as $potential_assertion_providing_class) {
-                if (!isset($extended_params[$potential_assertion_providing_class][$assertion->type->param_name])) {
-                    continue;
-                }
-
-                if (!$codebase->classlike_storage_provider->has($potential_assertion_providing_class)) {
-                    continue;
-                }
-
-                $potential_assertion_providing_classlike_storage = $codebase->classlike_storage_provider->get(
-                    $potential_assertion_providing_class,
-                );
-                if (!isset(
-                    $potential_assertion_providing_classlike_storage->template_types[$assertion->type->param_name],
-                )) {
-                    continue;
-                }
-
-                $replacement->rule[] = new IsType(new TTemplateParam(
-                    $assertion->type->param_name,
-                    reset(
-                        $potential_assertion_providing_classlike_storage->template_types[$assertion->type->param_name],
-                    ),
-                    $potential_assertion_providing_class,
-                ));
-
-                continue 2;
-            }
-
-            $replacement->rule[] = $assertion;
-        }
-
-        return $replacement;
-    }
 }