fix: RenameMethodRector does not rename trait methods (#6928)

* fix: RenameMethodRector does not rename trait methods

* adjust order of if condition

* add more tests

* more tests adjustments

Author: LordSimal

rules-tests/Renaming/Rector/MethodCall/RenameMethodRector/Fixture/rename_trait_method_which_is_overwritten.php.inc

@@ -0,0 +1,33 @@
+<?php
+
+namespace Rector\Tests\Renaming\Rector\MethodCall\RenameMethodRector\Fixture;
+
+use Rector\Tests\Renaming\Rector\MethodCall\RenameMethodRector\Source\SomeTrait;
+
+final class RenameTraitMethodWhichIsOverwritten
+{
+    use SomeTrait;
+
+    public function _test()
+    {
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\Renaming\Rector\MethodCall\RenameMethodRector\Fixture;
+
+use Rector\Tests\Renaming\Rector\MethodCall\RenameMethodRector\Source\SomeTrait;
+
+final class RenameTraitMethodWhichIsOverwritten
+{
+    use SomeTrait;
+
+    public function test()
+    {
+    }
+}
+
+?>

rules-tests/Renaming/Rector/MethodCall/RenameMethodRector/Fixture/skip_rename_method_which_is_not_in_trait.php.inc

@@ -0,0 +1,14 @@
+<?php
+
+namespace Rector\Tests\Renaming\Rector\MethodCall\RenameMethodRector\Fixture;
+
+use Rector\Tests\Renaming\Rector\MethodCall\RenameMethodRector\Source\SomeTrait;
+
+final class SkipRenameMethodWhichIsNotInTrait
+{
+    use SomeTrait;
+
+    public function _otherMethod()
+    {
+    }
+}

rules-tests/Renaming/Rector/MethodCall/RenameMethodRector/Source/SomeTrait.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Tests\Renaming\Rector\MethodCall\RenameMethodRector\Source;
+
+trait SomeTrait
+{
+    public function _test()
+    {
+    }
+}

rules-tests/Renaming/Rector/MethodCall/RenameMethodRector/config/configured_rule.php

@@ -13,6 +13,7 @@
 use Rector\Tests\Renaming\Rector\MethodCall\RenameMethodRector\Source\Foo;
 use Rector\Tests\Renaming\Rector\MethodCall\RenameMethodRector\Source\NewInterface;
 use Rector\Tests\Renaming\Rector\MethodCall\RenameMethodRector\Source\SomeSubscriber;
+use Rector\Tests\Renaming\Rector\MethodCall\RenameMethodRector\Source\SomeTrait;
 
 return static function (RectorConfig $rectorConfig): void {
     $rectorConfig->ruleWithConfiguration(RenameMethodRector::class, [
@@ -39,5 +40,8 @@
 
         // enum method
         new MethodCallRename(SomeEnumWithMethod::class, 'oldEnumMethod', 'newEnumMethod'),
+
+        // trait method
+        new MethodCallRename(SomeTrait::class, '_test', 'test'),
     ]);
 };

src/NodeTypeResolver/NodeTypeResolver.php

@@ -337,7 +337,11 @@ public function isMethodStaticCallOrClassMethodObjectType(Node $node, ObjectType
             return true;
         }
 
-        return $classReflection->is($objectType->getClassName());
+        if ($classReflection->is($objectType->getClassName())) {
+            return true;
+        }
+
+        return $classReflection->hasTraitUse($objectType->getClassName());
     }
 
     /**