octoleo/rector
1
1
Fork 0
mirror of https://github.com/rectorphp/rector.git synced 2024-06-25 04:12:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

rename AssignToBinaryMap to AssignAndBinaryMap + add inverse binnary method

Browse Source
This commit is contained in:
Tomas Votruba 2018-10-27 16:02:49 +02:00
parent 6203fbe019
commit aca6386f90
4 changed files with 54 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/CodeQuality/src/Rector/Assign/CombinedAssignRector.php
View File

@ -6,7 +6,7 @@ use PhpParser\Node;
use PhpParser\Node\Expr\Assign;
use PhpParser\Node\Expr\AssignOp;
use PhpParser\Node\Expr\BinaryOp;
use Rector\NodeAnalyzer\AssignToBinaryMap;
use Rector\NodeAnalyzer\AssignAndBinaryMap;
use Rector\Rector\AbstractRector;
use Rector\RectorDefinition\CodeSample;
use Rector\RectorDefinition\RectorDefinition;
@ -14,13 +14,13 @@ use Rector\RectorDefinition\RectorDefinition;
final class CombinedAssignRector extends AbstractRector
{
/**
* @var AssignToBinaryMap
* @var AssignAndBinaryMap
*/
private $assignToBinaryMap;
private $assignAndBinaryMap;
public function __construct(AssignToBinaryMap $assignToBinaryMap)
public function __construct(AssignAndBinaryMap $assignAndBinaryMap)
{
$this->assignToBinaryMap = $assignToBinaryMap;
$this->assignAndBinaryMap = $assignAndBinaryMap;
}
public function getDefinition(): RectorDefinition
@ -55,7 +55,7 @@ final class CombinedAssignRector extends AbstractRector
return null;
}
$assignClass = $this->assignToBinaryMap->getAlternative($binaryNode);
$assignClass = $this->assignAndBinaryMap->getAlternative($binaryNode);
if ($assignClass === null) {
return null;
}

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

@ -4,15 +4,10 @@ namespace Rector\CodeQuality\Rector\Identical;
use PhpParser\Node;
use PhpParser\Node\Expr\BinaryOp;
use PhpParser\Node\Expr\BinaryOp\Equal;
use PhpParser\Node\Expr\BinaryOp\Greater;
use PhpParser\Node\Expr\BinaryOp\GreaterOrEqual;
use PhpParser\Node\Expr\BinaryOp\Identical;
use PhpParser\Node\Expr\BinaryOp\NotEqual;
use PhpParser\Node\Expr\BinaryOp\NotIdentical;
use PhpParser\Node\Expr\BinaryOp\Smaller;
use PhpParser\Node\Expr\BinaryOp\SmallerOrEqual;
use PhpParser\Node\Expr\BooleanNot;
use Rector\NodeAnalyzer\AssignAndBinaryMap;
use Rector\Rector\AbstractRector;
use Rector\RectorDefinition\CodeSample;
use Rector\RectorDefinition\RectorDefinition;
@ -20,18 +15,14 @@ use Rector\RectorDefinition\RectorDefinition;
final class SimplifyConditionsRector extends AbstractRector
{
/**
* @var string[]
* @var AssignAndBinaryMap
*/
private $binaryOpClassesToInversedClasses = [
Identical::class => NotIdentical::class,
NotIdentical::class => Identical::class,
Equal::class => NotEqual::class,
NotEqual::class => Equal::class,
Greater::class => SmallerOrEqual::class,
Smaller::class => GreaterOrEqual::class,
GreaterOrEqual::class => Smaller::class,
SmallerOrEqual::class => Greater::class,
];
private $assignAndBinaryMap;
public function __construct(AssignAndBinaryMap $assignAndBinaryMap)
{
$this->assignAndBinaryMap = $assignAndBinaryMap;
}
public function getDefinition(): RectorDefinition
{
@ -61,6 +52,8 @@ final class SimplifyConditionsRector extends AbstractRector
if ($node instanceof Identical) {
return $this->processIdenticalAndNotIdentical($node);
}
return null;
}
private function processBooleanNot(BooleanNot $node): ?Node
@ -97,16 +90,8 @@ final class SimplifyConditionsRector extends AbstractRector
private function createInversedBooleanOp(BinaryOp $binaryOpNode): BinaryOp
{
$binaryOpNodeClass = get_class($binaryOpNode);
// we can't invert that
if (! isset($this->binaryOpClassesToInversedClasses[$binaryOpNodeClass])) {
return $binaryOpNode;
}
$inversedBinaryOpNodeClass = $this->binaryOpClassesToInversedClasses[$binaryOpNodeClass];
return new $inversedBinaryOpNodeClass($binaryOpNode->left, $binaryOpNode->right);
$inversedBinaryClass = $this->assignAndBinaryMap->getInversed($binaryOpNode);
return new $inversedBinaryClass($binaryOpNode->left, $binaryOpNode->right);
}
/**

12
packages/CodeQuality/src/Rector/Return_/SimplifyUselessVariableRector.php
View File

@ -8,7 +8,7 @@ use PhpParser\Node\Expr\AssignOp;
use PhpParser\Node\Expr\Variable;
use PhpParser\Node\Stmt\Expression;
use PhpParser\Node\Stmt\Return_;
use Rector\NodeAnalyzer\AssignToBinaryMap;
use Rector\NodeAnalyzer\AssignAndBinaryMap;
use Rector\NodeTypeResolver\Node\Attribute;
use Rector\Rector\AbstractRector;
use Rector\RectorDefinition\CodeSample;
@ -20,13 +20,13 @@ use Rector\RectorDefinition\RectorDefinition;
final class SimplifyUselessVariableRector extends AbstractRector
{
/**
* @var AssignToBinaryMap
* @var AssignAndBinaryMap
*/
private $assignToBinaryMap;
private $assignAndBinaryMap;
public function __construct(AssignToBinaryMap $assignToBinaryMap)
public function __construct(AssignAndBinaryMap $assignAndBinaryMap)
{
$this->assignToBinaryMap = $assignToBinaryMap;
$this->assignAndBinaryMap = $assignAndBinaryMap;
}
public function getDefinition(): RectorDefinition
@ -81,7 +81,7 @@ CODE_SAMPLE
}
if ($previousNode instanceof AssignOp) {
$binaryClass = $this->assignToBinaryMap->getAlternative($previousNode);
$binaryClass = $this->assignAndBinaryMap->getAlternative($previousNode);
if (! $binaryClass) {
return null;
}

31
src/NodeAnalyzer/AssignToBinaryMap.php → src/NodeAnalyzer/AssignAndBinaryMap.php
View File

@ -22,16 +22,38 @@ use PhpParser\Node\Expr\BinaryOp\BitwiseOr;
use PhpParser\Node\Expr\BinaryOp\BitwiseXor;
use PhpParser\Node\Expr\BinaryOp\Concat;
use PhpParser\Node\Expr\BinaryOp\Div;
use PhpParser\Node\Expr\BinaryOp\Equal;
use PhpParser\Node\Expr\BinaryOp\Greater;
use PhpParser\Node\Expr\BinaryOp\GreaterOrEqual;
use PhpParser\Node\Expr\BinaryOp\Identical;
use PhpParser\Node\Expr\BinaryOp\Minus;
use PhpParser\Node\Expr\BinaryOp\Mod;
use PhpParser\Node\Expr\BinaryOp\Mul;
use PhpParser\Node\Expr\BinaryOp\NotEqual;
use PhpParser\Node\Expr\BinaryOp\NotIdentical;
use PhpParser\Node\Expr\BinaryOp\Plus;
use PhpParser\Node\Expr\BinaryOp\Pow;
use PhpParser\Node\Expr\BinaryOp\ShiftLeft;
use PhpParser\Node\Expr\BinaryOp\ShiftRight;
use PhpParser\Node\Expr\BinaryOp\Smaller;
use PhpParser\Node\Expr\BinaryOp\SmallerOrEqual;
final class AssignToBinaryMap
final class AssignAndBinaryMap
{
/**
* @var string[]
*/
private $binaryOpToInverseClasses = [
Identical::class => NotIdentical::class,
NotIdentical::class => Identical::class,
Equal::class => NotEqual::class,
NotEqual::class => Equal::class,
Greater::class => SmallerOrEqual::class,
Smaller::class => GreaterOrEqual::class,
GreaterOrEqual::class => Smaller::class,
SmallerOrEqual::class => Greater::class,
];
/**
* @var string[]
*/
@ -74,4 +96,11 @@ final class AssignToBinaryMap
return null;
}
public function getInversed(BinaryOp $node): ?string
{
$nodeClass = get_class($node);
return $this->binaryOpToInverseClasses[$nodeClass] ?? null;
}
}