mirror_php/rector
1
0
Fork 0
mirror of https://github.com/rectorphp/rector.git synced 2025-02-19 15:45:43 +01:00
Code Issues Projects Releases Wiki Activity

make use of matchFirstAndSecondConditionNode Node type

Browse Source
This commit is contained in:
Tomas Votruba 2018-11-09 23:27:07 +01:00
parent 3ecf8172ed
commit 09e949f76e
5 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/CodeQuality/src/Rector/Foreach_/ForeachToInArrayRector.php
View File

@ -94,9 +94,7 @@ CODE_SAMPLE
$matchedNodes = $this->binaryOpMaintainer->matchFirstAndSecondConditionNode(
$ifCondition,
function (Node $node) {
return $node instanceof Variable;
},
Variable::class,
function (Node $node, Node $otherNode) use ($foreachValueNode) {
return $this->areNodesEqual($otherNode, $foreachValueNode);
}

4
packages/CodeQuality/src/Rector/Identical/SimplifyConditionsRector.php
View File

@ -80,9 +80,7 @@ final class SimplifyConditionsRector extends AbstractRector
function (Node $node) {
return $node instanceof Identical || $node instanceof NotIdentical;
},
function (Node $node) {
return $node;
}
Node::class
);
if ($matchedNodes === null) {

2
packages/CodeQuality/tests/Rector/FuncCall/SimplifyEmptyArrayCheckRector/Correct/correct3.php.inc
View File

@ -22,4 +22,4 @@ class SomeClass
}
$objects = [];
echo is_array($objects) && is_array($objects);
is_array($objects) && is_array($objects);

2
packages/CodeQuality/tests/Rector/FuncCall/SimplifyEmptyArrayCheckRector/Wrong/wrong3.php.inc
View File

@ -22,4 +22,4 @@ class SomeClass
}
$objects = [];
echo is_array($objects) && is_array($objects);
is_array($objects) && is_array($objects);

9
packages/Php/src/DualCheckToAble.php
View File

@ -2,7 +2,6 @@
namespace Rector\Php;
use PhpParser\Node;
use PhpParser\Node\Arg;
use PhpParser\Node\Expr\BinaryOp\BooleanOr;
use PhpParser\Node\Expr\FuncCall;
@ -34,12 +33,8 @@ final class DualCheckToAble
{
$matchedNodes = $this->binaryOpMaintainer->matchFirstAndSecondConditionNode(
$booleanOrNode,
function (Node $node) {
return $node instanceof Instanceof_;
},
function (Node $node) {
return $node instanceof FuncCall;
}
Instanceof_::class,
FuncCall::class
);
if ($matchedNodes === null) {