Skip to content
/ rector-src Public

fix: ReturnTypeFromReturnNewRector #7291

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

Closed
calebdw wants to merge 1 commit into from
Closed

fix: ReturnTypeFromReturnNewRector #7291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 14 additions & 0 deletions ...n/Rector/ClassMethod/ReturnTypeFromReturnNewRector/Fixture/return_anonymous_class.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,13 @@ final class ReturnAnonymousClass
{
return new class {};
}

public function foo()
{
$data = new class {};

return $data;
}
}

?>
Expand All @@ -26,6 +33,13 @@ final class ReturnAnonymousClass
{
return new class {};
}

public function foo(): object
{
$data = new class {};

return $data;
}
}

?>
5 changes: 4 additions & 1 deletion rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromReturnNewRector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

use PhpParser\Node;
use PhpParser\Node\Expr\New_;
use PhpParser\Node\Identifier;
use PhpParser\Node\Name;
use PhpParser\Node\Name\FullyQualified;
use PhpParser\Node\Stmt\ClassMethod;
Expand Down Expand Up @@ -120,7 +121,9 @@ public function refactor(Node $node): ?Node
$returnedNewClassName = $this->strictReturnNewAnalyzer->matchAlwaysReturnVariableNew($node);

if (is_string($returnedNewClassName)) {
$node->returnType = new FullyQualified($returnedNewClassName);
$node->returnType = str_starts_with($returnedNewClassName, 'AnonymousClass')
Copy link
Member

@samsonasik samsonasik Sep 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this can be covered by NodeTypeResolver itself, via ClassReflection->isAnonymous(), check in TypeTraverser::map(), see example

rector-src/src/NodeTypeResolver/NodeTypeCorrector/GenericClassStringTypeCorrector.php

Line 24 in 7546e9a

return TypeTraverser::map($mainType, function (Type $traversedType, callable $traverseCallback): Type {

Copy link
Member

@samsonasik samsonasik Sep 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

use getNativeType() over getType() should works for this.

Copy link
Member

@samsonasik samsonasik Sep 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I created separate PR:

to use native type, which more reliable for this strict type rule.

? new Identifier('object')
: new FullyQualified($returnedNewClassName);

return $node;
}
Expand Down
Loading