Refactor isConstantValue check

This commit is contained in:
Gabriel Caruso 2018-04-09 04:10:48 -03:00
parent 87eebf4bbf
commit a866eb5bbe
No known key found for this signature in database
GPG Key ID: D93D6E258EFC438A

View File

@ -116,17 +116,10 @@ final class AssertComparisonToSpecificMethodRector extends AbstractPHPUnitRector
/** @var BinaryOp $expression */
$expression = $oldArguments[0]->value;
if (in_array(get_class($expression->right), [LNumber::class, ConstFetch::class, String_::class], true)
) {
if ($this->isConstantValue($expression->right)) {
$firstArgument = new Arg($expression->right);
$secondArgument = new Arg($expression->left);
} elseif (in_array(get_class($expression->left), [LNumber::class, ConstFetch::class, String_::class], true)) {
$firstArgument = new Arg($expression->left);
$secondArgument = new Arg($expression->right);
} elseif ($expression->right instanceof Variable && stripos($expression->right->name, 'exp') === 0) {
$firstArgument = new Arg($expression->right);
$secondArgument = new Arg($expression->left);
} elseif ($expression->left instanceof Variable && stripos($expression->left->name, 'exp') === 0) {
} elseif ($this->isConstantValue($expression->left)) {
$firstArgument = new Arg($expression->left);
$secondArgument = new Arg($expression->right);
} else {
@ -151,4 +144,10 @@ final class AssertComparisonToSpecificMethodRector extends AbstractPHPUnitRector
'assertFalse' => $falseMethodName,
]);
}
private function isConstantValue(Node $node): bool
{
return in_array(get_class($node), [LNumber::class, ConstFetch::class, String_::class], true)
|| $node instanceof Variable && stripos($node->name, 'exp') === 0;
}
}