mirror of
https://github.com/rectorphp/rector.git
synced 2025-02-24 03:35:01 +01:00
Merge pull request #200 from rectorphp/fix-array-key-exists
[PHPUnit] Fix array_key_exists() argument up-lifting
This commit is contained in:
commit
c4dc955661
@ -3,6 +3,7 @@
|
||||
namespace Rector\Rector\Contrib\PHPUnit;
|
||||
|
||||
use PhpParser\Node;
|
||||
use PhpParser\Node\Arg;
|
||||
use PhpParser\Node\Expr\Empty_;
|
||||
use PhpParser\Node\Expr\FuncCall;
|
||||
use PhpParser\Node\Expr\MethodCall;
|
||||
@ -52,8 +53,6 @@ final class SpecificMethodRector extends AbstractRector
|
||||
|
||||
public function isCandidate(Node $node): bool
|
||||
{
|
||||
$this->activeFuncCallName = null;
|
||||
|
||||
if (! $this->methodCallAnalyzer->isTypesAndMethods(
|
||||
$node,
|
||||
['PHPUnit\Framework\TestCase', 'PHPUnit_Framework_TestCase'],
|
||||
@ -89,7 +88,7 @@ final class SpecificMethodRector extends AbstractRector
|
||||
public function refactor(Node $methodCallNode): ?Node
|
||||
{
|
||||
$this->renameMethod($methodCallNode);
|
||||
$this->moveArgumentUp($methodCallNode);
|
||||
$this->moveFunctionArgumentsUp($methodCallNode);
|
||||
|
||||
return $methodCallNode;
|
||||
}
|
||||
@ -111,15 +110,26 @@ final class SpecificMethodRector extends AbstractRector
|
||||
}
|
||||
}
|
||||
|
||||
private function moveArgumentUp(MethodCall $methodCallNode): void
|
||||
/**
|
||||
* Before:
|
||||
* - $this->assertTrue(array_key_exists('...', ['...']), 'second argument');
|
||||
*
|
||||
* After:
|
||||
* - $this->assertArrayHasKey('...', ['...'], 'second argument');
|
||||
*/
|
||||
private function moveFunctionArgumentsUp(MethodCall $methodCallNode): void
|
||||
{
|
||||
$funcCallOrEmptyNode = $methodCallNode->args[0]->value;
|
||||
if ($funcCallOrEmptyNode instanceof FuncCall) {
|
||||
$methodCallNode->args[0] = $funcCallOrEmptyNode->args[0];
|
||||
$oldArguments = $methodCallNode->args;
|
||||
unset($oldArguments[0]);
|
||||
$newArguments = array_merge($funcCallOrEmptyNode->args, $oldArguments);
|
||||
|
||||
$methodCallNode->args = $newArguments;
|
||||
}
|
||||
|
||||
if ($funcCallOrEmptyNode instanceof Empty_) {
|
||||
$methodCallNode->args[0] = $funcCallOrEmptyNode->expr;
|
||||
$methodCallNode->args[0] = new Arg($funcCallOrEmptyNode->expr);
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user