AbstractMethodInNonAbstractClassRule - fix abstract method from trait that overshadowed method from parent class

Author: ondrejmirtes

composer.json

@@ -21,7 +21,7 @@
 "nette/utils": "^3.1.1",
 "nikic/php-parser": "^4.5.0",
 "ondram/ci-detector": "^3.1",
-"ondrejmirtes/better-reflection": "^4.3.5",
+"ondrejmirtes/better-reflection": "^4.3.6",
 "phpdocumentor/type-resolver": "1.0.1",
 "phpstan/phpdoc-parser": "^0.4.7",
 "react/child-process": "^0.6.1",

tests/PHPStan/Rules/Methods/AbstractMethodInNonAbstractClassRuleTest.php

@@ -2,6 +2,8 @@
 
 namespace PHPStan\Rules\Methods;
 
+use Bug3406\AbstractFoo;
+use Bug3406\ClassFoo;
 use PHPStan\Rules\Rule;
 use PHPStan\Testing\RuleTestCase;
 
@@ -38,4 +40,18 @@ public function testTraitProblem(): void
 $this->analyse([__DIR__ . '/data/trait-method-problem.php'], []);
 }
 
+public function testBug3406(): void
+{
+$this->analyse([__DIR__ . '/data/bug-3406.php'], []);
+}
+
+public function testBug3406ReflectionCheck(): void
+{
+$this->createBroker();
+$reflectionProvider = $this->createReflectionProvider();
+$reflection = $reflectionProvider->getClass(ClassFoo::class);
+$this->assertSame(AbstractFoo::class, $reflection->getNativeMethod('myFoo')->getDeclaringClass()->getName());
+$this->assertSame(ClassFoo::class, $reflection->getNativeMethod('myBar')->getDeclaringClass()->getName());
+}
+
 }

tests/PHPStan/Rules/Methods/data/bug-3406.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace Bug3406;
+
+abstract class AbstractFoo
+{
+
+public function myFoo(): void
+{
+
+}
+
+public function myBar(): void
+{
+
+}
+
+}
+
+trait TraitFoo
+{
+
+abstract public function myFoo(): void;
+
+public function myBar(): void
+{
+
+}
+
+}
+
+final class ClassFoo extends AbstractFoo
+{
+
+use TraitFoo;
+
+}