Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -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()
{
}
}

?>
Original file line number Diff line number Diff line change
@@ -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()
{
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?php

declare(strict_types=1);

namespace Rector\Tests\Renaming\Rector\MethodCall\RenameMethodRector\Source;

trait SomeTrait
{
public function _test()
{
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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, [
Expand All @@ -39,5 +40,8 @@

// enum method
new MethodCallRename(SomeEnumWithMethod::class, 'oldEnumMethod', 'newEnumMethod'),

// trait method
new MethodCallRename(SomeTrait::class, '_test', 'test'),
]);
};
6 changes: 5 additions & 1 deletion src/NodeTypeResolver/NodeTypeResolver.php
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}

/**
Expand Down