Use better way to determine which signture to use

Fixes #4524
vimeo · Nov 12, 2020 · b7551e7 · b7551e7
1 parent 2f7bf2a
commit b7551e7
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 4 deletions.
diff --git a/src/Psalm/Internal/Codebase/Methods.php b/src/Psalm/Internal/Codebase/Methods.php
@@ -762,9 +762,7 @@ public function getMethodReturnType(
 
                 $self_class = $overridden_class_storage->name;
 
-                if ($candidate_type
-                    && $source_analyzer
-                ) {
+                if ($candidate_type && $source_analyzer && !$candidate_type->isMixed()) {
                     $old_contained_by_new = UnionTypeComparator::isContainedBy(
                         $source_analyzer->getCodebase(),
                         $candidate_type,

diff --git a/src/Psalm/Internal/Codebase/Populator.php b/src/Psalm/Internal/Codebase/Populator.php
@@ -311,7 +311,12 @@ private function populateOverriddenMethods(
 
                     if ($declaring_method_storage->has_docblock_param_types
                         && !$method_storage->has_docblock_param_types
-                        && !isset($storage->documenting_method_ids[$method_name])
+                        && (!isset($storage->documenting_method_ids[$method_name])
+                            || \in_array(
+                                $storage->documenting_method_ids[$method_name]->fq_class_name,
+                                $declaring_class_storage->parent_interfaces
+                            )
+                        )
                     ) {
                         $storage->documenting_method_ids[$method_name] = $declaring_method_id;
                     }

diff --git a/tests/Template/ClassTemplateExtendsTest.php b/tests/Template/ClassTemplateExtendsTest.php
@@ -4561,6 +4561,38 @@ public function valuesToSave(): array
                         }
                     }'
             ],
+            'inheritCorrectParams' => [
+                '<?php
+                    interface ToBeIgnored
+                    {
+                        /**
+                         * @param mixed $value
+                         * @return mixed
+                         */
+                        public static function of($value);
+                    }
+
+                    interface ToBeUsed extends ToBeIgnored
+                    {
+                        /**
+                         * @template U
+                         * @param U $value
+                         * @return U
+                         */
+                        public static function of($value);
+                    }
+
+                    interface ExtendsToBeUsed extends ToBeUsed {}
+
+                    class Foo implements ExtendsToBeUsed {
+                        /** @psalm-suppress InvalidReturnType */
+                        public static function of($value) {}
+                    }
+
+                    function bar(Foo $f, string $s) : string {
+                        return $f::of($s);
+                    }'
+            ],
         ];
     }