[Renaming] Allow rename method in trait itself on RenameMethodRector (#6942)

* [Renaming] Allow rename method in trait itself on RenameMethodRector

* [ci-review] Rector Rectify

---------

Co-authored-by: GitHub Action <actions@github.com>

Author: samsonasik

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

@@ -0,0 +1,25 @@
+<?php
+
+namespace Rector\Tests\Renaming\Rector\MethodCall\RenameMethodRector\Fixture;
+
+trait RenameTraitMethod
+{
+    private function run()
+    {
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\Renaming\Rector\MethodCall\RenameMethodRector\Fixture;
+
+trait RenameTraitMethod
+{
+    private function execute()
+    {
+    }
+}
+
+?>

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

@@ -6,6 +6,7 @@
 use Rector\Renaming\Rector\MethodCall\RenameMethodRector;
 use Rector\Renaming\ValueObject\MethodCallRename;
 use Rector\Renaming\ValueObject\MethodCallRenameWithArrayKey;
+use Rector\Tests\Renaming\Rector\MethodCall\RenameMethodRector\Fixture\RenameTraitMethod;
 use Rector\Tests\Renaming\Rector\MethodCall\RenameMethodRector\Source\AbstractType;
 use Rector\Tests\Renaming\Rector\MethodCall\RenameMethodRector\Source\CustomType;
 use Rector\Tests\Renaming\Rector\MethodCall\RenameMethodRector\Source\DifferentInterface;
@@ -37,5 +38,6 @@
 
         new MethodCallRename(SomeEnumWithMethod::class, 'oldEnumMethod', 'newEnumMethod'),
         new MethodCallRename(SomeTrait::class, '_test', 'test'),
+        new MethodCallRename(RenameTraitMethod::class, 'run', 'execute'),
     ]);
 };

rules/Renaming/Rector/MethodCall/RenameMethodRector.php

@@ -14,6 +14,7 @@
 use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\Node\Stmt\Interface_;
+use PhpParser\Node\Stmt\Trait_;
 use PHPStan\Analyser\Scope;
 use PHPStan\Reflection\ClassReflection;
 use PHPStan\Reflection\ReflectionProvider;
@@ -70,16 +71,16 @@ public function getRuleDefinition(): RuleDefinition
      */
     public function getNodeTypes(): array
     {
-        return [MethodCall::class, NullsafeMethodCall::class, StaticCall::class, Class_::class, Interface_::class];
+        return [MethodCall::class, NullsafeMethodCall::class, StaticCall::class, Class_::class, Trait_::class, Interface_::class];
     }
 
     /**
-     * @param MethodCall|NullsafeMethodCall|StaticCall|Class_|Interface_ $node
+     * @param MethodCall|NullsafeMethodCall|StaticCall|Class_|Interface_|Trait_ $node
      */
     public function refactor(Node $node): ?Node
     {
         $scope = ScopeFetcher::fetch($node);
-        if ($node instanceof Class_ || $node instanceof Interface_) {
+        if ($node instanceof Class_ || $node instanceof Trait_ || $node instanceof Interface_) {
             return $this->refactorClass($node, $scope);
         }
 
@@ -124,7 +125,7 @@ private function shouldSkipClassMethod(
     }
 
     private function hasClassNewClassMethod(
-        Class_|Interface_ $classOrInterface,
+        Class_|Trait_|Interface_ $classOrInterface,
         MethodCallRenameInterface $methodCallRename
     ): bool {
         return (bool) $classOrInterface->getMethod($methodCallRename->getNewMethod());
@@ -149,12 +150,8 @@ private function shouldKeepForParentInterface(
         );
     }
 
-    private function refactorClass(Class_|Interface_ $classOrInterface, Scope $scope): Class_|Interface_|null
+    private function refactorClass(Class_|Trait_|Interface_ $classOrInterface, Scope $scope): Class_|Trait_|Interface_|null
     {
-        if (! $scope->isInClass()) {
-            return null;
-        }
-
         $classReflection = $scope->getClassReflection();
 
         $hasChanged = false;
@@ -194,13 +191,17 @@ private function shouldSkipRename(
         string $methodName,
         ClassMethod $classMethod,
         MethodCallRenameInterface $methodCallRename,
-        Class_|Interface_ $classOrInterface,
+        Class_|Trait_|Interface_ $classOrInterface,
         ?ClassReflection $classReflection
     ): bool {
         if (! $this->nodeNameResolver->isStringName($methodName, $methodCallRename->getOldMethod())) {
             return true;
         }
 
+        if (!$classReflection instanceof ClassReflection && $classOrInterface instanceof Trait_) {
+            return $this->hasClassNewClassMethod($classOrInterface, $methodCallRename);
+        }
+
         if (! $this->nodeTypeResolver->isMethodStaticCallOrClassMethodObjectType(
             $classMethod,
             $methodCallRename->getObjectType()