Skip to content

Commit

Permalink
Fix foreach key evaluation for SimplifyForeachToArrayFilterRector. (#…
Browse files Browse the repository at this point in the history
…3100)

* Fix foreach key evaluation for SimplifyForeachToArrayFilterRector.

* use ReadExprAnalyzer service

Co-authored-by: Abdul Malik Ikhsan <samsonasik@gmail.com>
  • Loading branch information
Wohlie and samsonasik committed Dec 3, 2022
1 parent 12ea285 commit 139c19c
Show file tree
Hide file tree
Showing 2 changed files with 61 additions and 1 deletion.
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<?php

namespace Rector\Tests\CodeQuality\Rector\Foreach_\SimplifyForeachToArrayFilterRector\Fixture;

final class SkipOnKeyEvaluation
{
public function filter1(array $input)
{
$output = [];
foreach ($input as $key => $value) {
if ($key) {
$output[$key] = $value;
}
}

return $output;
}

public function filter2(array $input)
{
$output = [];
foreach ($input as $key => $value) {
if (\is_string($key)) {
$output[$key] = $value;
}
}

return $output;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
use PhpParser\Node\Expr\Assign;
use PhpParser\Node\Expr\FuncCall;
use PhpParser\Node\Expr\Variable;
use PhpParser\Node\Param;
use PhpParser\Node\Stmt\Expression;
use PhpParser\Node\Stmt\Foreach_;
use PhpParser\Node\Stmt\If_;
Expand All @@ -19,6 +18,8 @@
use PHPStan\Type\UnionType;
use Rector\CodeQuality\NodeFactory\ArrayFilterFactory;
use Rector\Core\Rector\AbstractRector;
use Rector\DeadCode\NodeAnalyzer\ExprUsedInNodeAnalyzer;
use Rector\ReadWrite\NodeAnalyzer\ReadExprAnalyzer;
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;

Expand All @@ -29,6 +30,8 @@ final class SimplifyForeachToArrayFilterRector extends AbstractRector
{
public function __construct(
private readonly ArrayFilterFactory $arrayFilterFactory,
private readonly ExprUsedInNodeAnalyzer $exprUsedInNodeAnalyzer,
private readonly ReadExprAnalyzer $readExprAnalyzer
) {
}

Expand Down Expand Up @@ -85,6 +88,11 @@ public function refactor(Node $node): ?Node

$condExpr = $ifNode->cond;

$foreachKeyVar = $node->keyVar;
if ($foreachKeyVar !== null && $this->shouldSkipForeachKeyUsage($ifNode, $foreachKeyVar)) {
return null;
}

if ($condExpr instanceof FuncCall) {
return $this->refactorFuncCall($ifNode, $condExpr, $node, $foreachValueVar);
}
Expand Down Expand Up @@ -119,6 +127,28 @@ private function shouldSkip(Foreach_ $foreach): bool
return $ifNode->elseifs !== [];
}

private function shouldSkipForeachKeyUsage(If_ $if, Expr $expr): bool
{
if (! $expr instanceof Variable) {
return false;
}

/** @var Variable[] $keyVarUsage */
$keyVarUsage = $this->betterNodeFinder->find(
$if,
fn (Node $node): bool => $this->exprUsedInNodeAnalyzer->isUsed($node, $expr)
);

$keyVarUsageCount = count($keyVarUsage);
if ($keyVarUsageCount === 1) {
/** @var Variable $currentVarUsage */
$currentVarUsage = current($keyVarUsage);
return ! $this->readExprAnalyzer->isExprRead($currentVarUsage);
}

return $keyVarUsageCount !== 0;
}

private function isArrayDimFetchInForLoop(Foreach_ $foreach, ArrayDimFetch $arrayDimFetch): bool
{
$loopVar = $foreach->expr;
Expand Down

0 comments on commit 139c19c

Please sign in to comment.