Merge pull request #8335 from someniatko/issue-8330

#8330 - take into account that `static` type may have been unwrapped in `hasStaticInType()`
vimeo · Jul 29, 2022 · 489706b · 489706b
2 parents d7cd84c + 0c652f7
commit 489706b
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 1 deletion.
diff --git a/...nal/Analyzer/Statements/Expression/Call/StaticMethod/ExistingAtomicStaticCallAnalyzer.php b/...nal/Analyzer/Statements/Expression/Call/StaticMethod/ExistingAtomicStaticCallAnalyzer.php
@@ -627,7 +627,7 @@ private static function getMethodReturnType(
      */
     private static function hasStaticInType(Type\TypeNode $type): bool
     {
-        if ($type instanceof TNamedObject && $type->value === 'static') {
+        if ($type instanceof TNamedObject && ($type->value === 'static' || $type->was_static)) {
             return true;
         }
 

diff --git a/tests/Template/ClassTemplateTest.php b/tests/Template/ClassTemplateTest.php
@@ -3799,6 +3799,33 @@ final public static function create(): static
                         }
                     }',
             ],
+            'static is the return type of an analyzed static method' => [
+                '<?php
+
+                    abstract class A
+                    {
+                    }
+
+                    final class B extends A
+                    {
+                        public static function create(): static
+                        {
+                            return new self();
+                        }
+                    }
+
+                    final class Service
+                    {
+                        public function do(): void
+                        {
+                            $this->acceptA(B::create());
+                        }
+
+                        private function acceptA(A $_a): void
+                        {
+                        }
+                    }',
+            ],
         ];
     }