Merge pull request #11695 from kkmuffme/duplicate-error-for-abstract-method-trait

Fix duplicate error for abstract methods in traits if the issue is due to the implementer

Author: danog

src/Psalm/Internal/Analyzer/ClassAnalyzer.php

@@ -1752,7 +1752,7 @@ private function analyzeClassMethod(
                         $declaring_method_storage,
                         $this->fq_class_name,
                         $implementer_method_storage->visibility,
-                        new CodeLocation($source, $stmt),
+                        $implementer_method_storage->stmt_location ?? new CodeLocation($source, $stmt),
                         $implementer_method_storage->suppressed_issues,
                         false,
                     );

tests/TraitTest.php

@@ -1152,6 +1152,22 @@ public function fooFoo(string $a): void {
                     }',
                 'error_message' => 'MethodSignatureMismatch',
             ],
+            'dontReportImplementerErrorOnAbstractTraitMethodTwice' => [
+                'code' => '<?php
+                    trait B {
+                        abstract public function run();
+                    }
+
+                    final class A {
+                        use B;
+
+                        #[Override]
+                        public function run(string $foo): string {
+                            return $foo;
+                        }
+                    }',
+                'error_message' => 'MethodSignatureMismatch - src' . DIRECTORY_SEPARATOR . 'somefile.php:9:',
+            ],
             'missingTraitPropertyType' => [
                 'code' => '<?php
                     trait T {