Fix calls on magic methods on abstract classes

nicelocal · Nov 28, 2023 · f037822 · f037822
1 parent a3024ad
commit f037822
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/src/Psalm/Internal/PhpVisitor/Reflector/ClassLikeNodeScanner.php b/src/Psalm/Internal/PhpVisitor/Reflector/ClassLikeNodeScanner.php
@@ -638,9 +638,9 @@ public function start(PhpParser\Node\Stmt\ClassLike $node): ?bool
                     $lc_method_name,
                 );
                 $storage->inheritable_method_ids[$lc_method_name] = $method_identifier;
-                if (!isset($storage->overridden_method_ids[$lc_method_name])) {
-                    $storage->overridden_method_ids[$lc_method_name] = [];
-                }
+                $storage->declaring_method_ids[$lc_method_name] ??= $method_identifier;
+                $storage->appearing_method_ids[$lc_method_name] ??= $method_identifier;
+                $storage->overridden_method_ids[$lc_method_name] ??= [];
                 $storage->declaring_pseudo_method_ids[$lc_method_name] = $method_identifier;
             }
 

diff --git a/tests/MethodCallTest.php b/tests/MethodCallTest.php
@@ -282,6 +282,20 @@ public function __call(string $method_name, array $args) : string {
                     '$s' => 'string',
                 ],
             ],
+            'magicCallOnAbstract' => [
+                'code' => '<?php
+
+                    /**
+                     * @method string getConfirmationUrl()
+                     */
+                    abstract class AbstractConfirmation
+                    {
+                    }
+
+                    function t(AbstractConfirmation $v): void {
+                        $v->getConfirmationUrl();
+                    }'
+            ],
             'canBeCalledOnMagic' => [
                 'code' => '<?php
                     class A {