mirror_php/rector
1
0
Fork 0
mirror of https://github.com/rectorphp/rector.git synced 2025-04-22 00:12:29 +02:00
Code Issues Projects Releases Wiki Activity

[Performance] Bug Fix CountArrayToEmptyArrayComparisonRector for negation inside or / and operator (#4508)

Browse Source 
Co-authored-by: rector-bot <tomas@getrector.org>
This commit is contained in:
Abdul Malik Ikhsan 2020-10-30 20:09:18 +07:00 committed by GitHub
parent dc2047f70a
commit 49b7635b27
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 45 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
rules/performance/src/Rector/FuncCall/CountArrayToEmptyArrayComparisonRector.php
View File

@ -52,16 +52,16 @@ CODE_SAMPLE
*/
public function getNodeTypes(): array
{
return [FuncCall::class, If_::class, ElseIf_::class];
return [FuncCall::class, BooleanNot::class];
}
/**
* @param FuncCall|ElseIf_|If_ $node
* @param FuncCall|BooleanNot $node
*/
public function refactor(Node $node): ?Node
{
if (! $node instanceof FuncCall) {
return $this->processMarkTruthyNegationInsideConditional($node);
if ($node instanceof BooleanNot) {
return $this->processMarkTruthyNegation($node);
}
if ($this->getName($node) !== 'count') {
@ -92,27 +92,24 @@ CODE_SAMPLE
return $processGreaterOrSmaller;
}
return $this->processMarkTruthyAndTruthyNegation($parent, $node, $expr);
return $this->processMarkTruthy($parent, $node, $expr);
}
private function processMarkTruthyNegationInsideConditional(Node $node): ?Node
private function processMarkTruthyNegation(BooleanNot $booleanNot): ?Identical
{
if (! $node->cond instanceof BooleanNot || ! $node->cond->expr instanceof FuncCall || $this->getName(
$node->cond->expr
) !== 'count') {
if (! $booleanNot->expr instanceof FuncCall || $this->getName($booleanNot->expr) !== 'count') {
return null;
}
/** @var Expr $expr */
$expr = $node->cond->expr->args[0]->value;
$expr = $booleanNot->expr->args[0]->value;
// not pass array type, skip
if (! $this->isArray($expr)) {
return null;
}
$node->cond = new Identical($expr, new Array_([]));
return $node;
return new Identical($expr, new Array_([]));
}
private function isArray(Expr $expr): bool
@ -165,22 +162,13 @@ CODE_SAMPLE
return null;
}
private function processMarkTruthyAndTruthyNegation(Node $node, FuncCall $funcCall, Expr $expr): ?Expr
private function processMarkTruthy(Node $node, FuncCall $funcCall, Expr $expr): ?Expr
{
if ($this->isConditional($node) && $node->cond === $funcCall) {
$node->cond = new NotIdentical($expr, new Array_([]));
return $node->cond;
}
$parent = $node->getAttribute(AttributeKey::PARENT_NODE);
if ($node instanceof BooleanNot && $node->expr === $funcCall && ! $this->isConditional($parent)) {
$identical = new Identical($expr, new Array_([]));
$this->addNodeBeforeNode($identical, $node);
$this->removeNode($node);
return $identical;
}
return null;
}

35
rules/performance/tests/Rector/FuncCall/CountArrayToEmptyArrayComparisonRector/Fixture/fixture_mark_as_truthy_negation_check_inside_or_and.php.inc Normal file
View File

@ -0,0 +1,35 @@
<?php
namespace Rector\Performance\Tests\Rector\FuncCall\CountArrayToEmptyArrayComparisonRector\Fixture;
class SomeClassMarkTruthyInsideOrAnd
{
public function run()
{
$data = [];
true || ! count($data);
! count($data) || true;
true && ! count($data);
! count($data) && true;
}
}
?>
-----
<?php
namespace Rector\Performance\Tests\Rector\FuncCall\CountArrayToEmptyArrayComparisonRector\Fixture;
class SomeClassMarkTruthyInsideOrAnd
{
public function run()
{
$data = [];
true || $data === [];
$data === [] || true;
true && $data === [];
$data === [] && true;
}
}
?>