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,18 @@
<?php

namespace Rector\Tests\DeadCode\Rector\Closure\RemoveUnusedClosureVariableUseRector\Fixture;

/**
* @see https://3v4l.org/9vhce
*/
final class SkipUsedViaCompact
{
public function run($value)
{
return function () use ($value) {
$v = compact('value');

return $v;
};
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

use PhpParser\Node;
use PhpParser\Node\Expr\Closure;
use Rector\DeadCode\NodeAnalyzer\ExprUsedInNodeAnalyzer;
use Rector\PhpParser\Node\BetterNodeFinder;
use Rector\Rector\AbstractRector;
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
Expand All @@ -17,7 +18,8 @@
final class RemoveUnusedClosureVariableUseRector extends AbstractRector
{
public function __construct(
private readonly BetterNodeFinder $betterNodeFinder
private readonly BetterNodeFinder $betterNodeFinder,
private readonly ExprUsedInNodeAnalyzer $exprUsedInNodeAnalyzer
) {
}

Expand Down Expand Up @@ -72,7 +74,10 @@ public function refactor(Node $node): ?Node
continue;
}

$isUseUsed = (bool) $this->betterNodeFinder->findVariableOfName($node->stmts, $useVariableName);
$isUseUsed = (bool) $this->betterNodeFinder->findFirst(
$node->stmts,
fn (Node $subNode): bool => $this->exprUsedInNodeAnalyzer->isUsed($subNode, $useVariable->var)
);
if ($isUseUsed) {
continue;
}
Expand Down