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

namespace Rector\Tests\DeadCode\Rector\If_\RemoveUnusedNonEmptyArrayBeforeForeachRector\Fixture;

class SkipCountDifferentVariable
{
public function run(array $vars, array $vars2)
{
if (count($vars) > 0) {
foreach ($vars2 as $key => $val) {
echo "hello";
}
}

return [];
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?php

namespace Rector\Tests\DeadCode\Rector\If_\RemoveUnusedNonEmptyArrayBeforeForeachRector\Fixture;

class SkipCountMixed
{
public function run($vars)
{
if (count($vars) > 0) {
foreach ($vars as $key => $val) {
echo "hello";
}
}

return [];
}
}
16 changes: 14 additions & 2 deletions rules/DeadCode/NodeManipulator/CountManipulator.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,17 @@
use PhpParser\Node\Expr\BinaryOp\SmallerOrEqual;
use PhpParser\Node\Expr\FuncCall;
use PhpParser\Node\Scalar\LNumber;
use PHPStan\Type\NeverType;
use Rector\Core\PhpParser\Comparing\NodeComparator;
use Rector\NodeNameResolver\NodeNameResolver;
use Rector\NodeTypeResolver\NodeTypeResolver;

final class CountManipulator
{
public function __construct(
private readonly NodeNameResolver $nodeNameResolver,
private readonly NodeComparator $nodeComparator
private readonly NodeComparator $nodeComparator,
private readonly NodeTypeResolver $nodeTypeResolver
) {
}

Expand Down Expand Up @@ -113,6 +116,15 @@ private function isCountWithExpression(Expr $node, Expr $expr): bool
$countedExpr = $node->getArgs()[0]
->value;

return $this->nodeComparator->areNodesEqual($countedExpr, $expr);
if ($this->nodeComparator->areNodesEqual($countedExpr, $expr)) {
$exprType = $this->nodeTypeResolver->getNativeType($expr);
if (! $exprType->isArray()->yes()) {
return $exprType instanceof NeverType;
}

return true;
}

return false;
}
}