Skip to content
/ rector-src Public

allow different property name #7629

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TomasVotruba merged 2 commits into from
Nov 13, 2025
Merged

allow different property name #7629

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
755d81c
add fixture
TomasVotruba Nov 13, 2025
7c51a40
allow different property name
TomasVotruba Nov 13, 2025
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
8 changes: 4 additions & 4 deletions ...biguous/Rector/Class_/RemoveReturnThisFromSetterClassMethodRector/Fixture/fixture.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ namespace Rector\Tests\Unambiguous\Rector\Class_\RemoveReturnThisFromSetterClass

final class SomeClass
{
private string $name;
private string $nameValue;

public function setName(string $name): self
{
$this->name = $name;
$this->nameValue = $name;

return $this;
}
Expand All @@ -22,11 +22,11 @@ namespace Rector\Tests\Unambiguous\Rector\Class_\RemoveReturnThisFromSetterClass

final class SomeClass
{
private string $name;
private string $nameValue;

public function setName(string $name): void
{
$this->name = $name;
$this->nameValue = $name;
}
}

Expand Down
12 changes: 8 additions & 4 deletions rules/TypeDeclaration/NodeAnalyzer/ClassMethodAndPropertyAnalyzer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public function hasOnlyPropertyAssign(ClassMethod $classMethod, string $property
return $this->isLocalPropertyVariableAssign($onlyClassMethodStmt, $propertyName);
}

public function hasPropertyAssignWithReturnThis(ClassMethod $classMethod, string $propertyName): bool
public function hasPropertyAssignWithReturnThis(ClassMethod $classMethod): bool
{
$stmts = (array) $classMethod->stmts;
if (count($stmts) !== 2) {
Expand All @@ -63,7 +63,7 @@ public function hasPropertyAssignWithReturnThis(ClassMethod $classMethod, string
$possibleAssignStmt = $stmts[0];
$possibleReturnThis = $stmts[1];

if (! $this->isLocalPropertyVariableAssign($possibleAssignStmt, $propertyName)) {
if (! $this->isLocalPropertyVariableAssign($possibleAssignStmt, null)) {
return false;
}

Expand All @@ -80,7 +80,7 @@ public function hasPropertyAssignWithReturnThis(ClassMethod $classMethod, string
return $this->nodeNameResolver->isName($returnExpr, 'this');
}

private function isLocalPropertyVariableAssign(Stmt $onlyClassMethodStmt, string $propertyName): bool
private function isLocalPropertyVariableAssign(Stmt $onlyClassMethodStmt, ?string $propertyName): bool
{
if (! $onlyClassMethodStmt instanceof Expression) {
return false;
Expand All @@ -102,6 +102,10 @@ private function isLocalPropertyVariableAssign(Stmt $onlyClassMethodStmt, string
return false;
}

return $this->nodeNameResolver->isName($propertyFetch->name, $propertyName);
if ($propertyName) {
return $this->nodeNameResolver->isName($propertyFetch->name, $propertyName);
}

return true;
}
}
1 change: 0 additions & 1 deletion ...eDeclaration/TypeInferer/PropertyTypeInferer/SetterTypeDeclarationPropertyTypeInferer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ public function __construct(

public function inferProperty(Property $property, Class_ $class): ?Type
{
/** @var string $propertyName */
$propertyName = $this->nodeNameResolver->getName($property);

foreach ($class->getMethods() as $classMethod) {
Expand Down
2 changes: 1 addition & 1 deletion rules/Unambiguous/Rector/Class_/RemoveReturnThisFromSetterClassMethodRector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ public function refactor(Node $node): ?Class_
continue;
}

if (! $this->classMethodAndPropertyAnalyzer->hasPropertyAssignWithReturnThis($classMethod, $paramName)) {
if (! $this->classMethodAndPropertyAnalyzer->hasPropertyAssignWithReturnThis($classMethod)) {
continue;
}

Expand Down