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
Expand Up @@ -9,6 +9,8 @@
use PhpParser\Node\Expr\FuncCall;
use PhpParser\Node\Expr\Variable;
use PhpParser\Node\Stmt\For_;
use PHPStan\Analyser\Scope;
use Rector\NodeTypeResolver\Node\AttributeKey;
use Rector\Rector\AbstractRector;
use Rector\RectorDefinition\CodeSample;
use Rector\RectorDefinition\RectorDefinition;
Expand Down Expand Up @@ -71,8 +73,13 @@ public function refactor(Node $node): ?Node
{
$countInCond = null;
$countedValueName = null;
$for = $node;

$this->traverseNodesWithCallable($node->cond, function (Node $node) use (&$countInCond, &$countedValueName) {
$this->traverseNodesWithCallable($node->cond, function (Node $node) use (
&$countInCond,
&$countedValueName,
$for
) {
if (! $node instanceof FuncCall) {
return null;
}
Expand All @@ -83,12 +90,7 @@ public function refactor(Node $node): ?Node

$countInCond = $node;
$valueName = $this->getName($node->args[0]->value);

if ($valueName === null) {
$countedValueName = self::DEFAULT_VARIABLE_COUNT_NAME;
} else {
$countedValueName = $valueName . 'Count';
}
$countedValueName = $this->createCountedValueName($valueName, $for);

return new Variable($countedValueName);
});
Expand All @@ -98,9 +100,38 @@ public function refactor(Node $node): ?Node
}

$countAssign = new Assign(new Variable($countedValueName), $countInCond);

$this->addNodeBeforeNode($countAssign, $node);

return $node;
}

private function createCountedValueName(?string $valueName, For_ $for): string
{
if ($valueName === null) {
$countedValueName = self::DEFAULT_VARIABLE_COUNT_NAME;
} else {
$countedValueName = $valueName . 'Count';
}

/** @var Scope|null $forScope */
$forScope = $for->getAttribute(AttributeKey::SCOPE);
if ($forScope === null) {
return $countedValueName;
}

// make sure variable name is unique
if (! $forScope->hasVariableType($countedValueName)->yes()) {
return $countedValueName;
}

// we need to add number suffix until the variable is unique
$i = 2;
$countedValueNamePart = $countedValueName;
while ($forScope->hasVariableType($countedValueName)->yes()) {
$countedValueName = $countedValueNamePart . $i;
++$i;
}

return $countedValueName;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
<?php

namespace Rector\CodeQuality\Tests\Rector\For_\ForRepeatedCountToOwnVariableRector\Fixture;

class AlreadyExistingItemsCount
{
public function run($items, \stdClass $someObject)
{
$itemsCount = 500000;

for ($i = 5; $i <= count($someObject->getItems() + 10); $i++) {
echo $items[$i];
}

return $itemsCount;
}
}

?>
-----
<?php

namespace Rector\CodeQuality\Tests\Rector\For_\ForRepeatedCountToOwnVariableRector\Fixture;

class AlreadyExistingItemsCount
{
public function run($items, \stdClass $someObject)
{
$itemsCount = 500000;
$itemsCount2 = count($someObject->getItems() + 10);

for ($i = 5; $i <= $itemsCount2; $i++) {
echo $items[$i];
}

return $itemsCount;
}
}

?>