Fix #3296 - propagate final flag to static calls in return types

vimeo · May 4, 2020 · a089d8b · a089d8b
1 parent dc64d4b
commit a089d8b
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 1 deletion.
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/Call/MethodCallReturnTypeFetcher.php b/src/Psalm/Internal/Analyzer/Statements/Expression/Call/MethodCallReturnTypeFetcher.php
@@ -173,7 +173,11 @@ public static function fetch(
                     $return_type_candidate,
                     $self_fq_class_name,
                     $static_type,
-                    $class_storage->parent_class
+                    $class_storage->parent_class,
+                    true,
+                    false,
+                    $static_type instanceof Type\Atomic\TNamedObject
+                        && $codebase->classlike_storage_provider->get($static_type->value)->final
                 );
 
                 if ($codebase->taint) {

diff --git a/tests/Template/ClassTemplateExtendsTest.php b/tests/Template/ClassTemplateExtendsTest.php
@@ -4001,6 +4001,36 @@ public function foo($b): bool {
                         }
                     }'
             ],
+            'finalOverridesStatic' => [
+                '<?php
+                    /**
+                     * @template T
+                     */
+                    class Collection {
+                        /**
+                         * @param T $item
+                         */
+                        public function __construct($item) {}
+                    }
+
+                    abstract class Food {
+                        /**
+                         * @return Collection<static>
+                         */
+                        public function getTypes() {
+                            return new Collection(new static);
+                        }
+                    }
+
+                    final class Cheese extends Food {}
+
+                    /**
+                     * @return Collection<Cheese>
+                     */
+                    function test(Cheese $cheese): Collection {
+                        return $cheese->getTypes();
+                    }'
+            ],
         ];
     }