Skip to content

[CodeQuality] Skip return by ref with switch on SimplifyUselessVariableRector #6623

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
merged 1 commit into from
Dec 20, 2024
Merged

[CodeQuality] Skip return by ref with switch on SimplifyUselessVariableRector #6623

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
11 changes: 11 additions & 0 deletions ...lity/Rector/FunctionLike/SimplifyUselessVariableRector/Fixture/skip_return_by_ref.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,14 @@ function & notAnonymous()
return $var;
}
}

function & notAnonymous2()
{
for ($i = 0; $i < 4; $i++) {
switch ($i) {
case 1:
$var = 42;
return $var;
}
}
}
9 changes: 9 additions & 0 deletions src/NodeTypeResolver/PHPStan/Scope/NodeVisitor/ByRefReturnNodeVisitor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
use PhpParser\Node\FunctionLike;
use PhpParser\Node\Stmt;
use PhpParser\Node\Stmt\Return_;
use PhpParser\Node\Stmt\Switch_;
use PhpParser\NodeVisitorAbstract;
use Rector\Contract\PhpParser\Node\StmtsAwareInterface;
use Rector\NodeTypeResolver\Node\AttributeKey;
Expand Down Expand Up @@ -50,6 +51,14 @@ private function setByRefAttribute(array $stmts): void
continue;
}

if ($stmt instanceof Switch_) {
foreach ($stmt->cases as $case) {
$this->setByRefAttribute($case->stmts);
}

continue;
}

if ($stmt instanceof Return_) {
$stmt->setAttribute(AttributeKey::IS_BYREF_RETURN, true);
}
Expand Down
Loading