diff --git a/src/Rector/Contrib/PHPUnit/SpecificMethod/AssertFalseStrposToContainsRector.php b/src/Rector/Contrib/PHPUnit/SpecificMethod/AssertFalseStrposToContainsRector.php index 98c079ea0a2..f707a6911dc 100644 --- a/src/Rector/Contrib/PHPUnit/SpecificMethod/AssertFalseStrposToContainsRector.php +++ b/src/Rector/Contrib/PHPUnit/SpecificMethod/AssertFalseStrposToContainsRector.php @@ -33,6 +33,14 @@ final class AssertFalseStrposToContainsRector extends AbstractPHPUnitRector */ private $identifierRenamer; + /** + * @var string[] + */ + private $renameMethodsMap = [ + 'assertFalse' => 'assertNotContains', + 'assertNotFalse' => 'assertContains', + ]; + public function __construct(MethodCallAnalyzer $methodCallAnalyzer, IdentifierRenamer $identifierRenamer) { $this->methodCallAnalyzer = $methodCallAnalyzer; @@ -45,7 +53,7 @@ final class AssertFalseStrposToContainsRector extends AbstractPHPUnitRector return false; } - if (! $this->methodCallAnalyzer->isMethods($node, ['assertFalse', 'assertNotFalse'])) { + if (! $this->methodCallAnalyzer->isMethods($node, array_keys($this->renameMethodsMap))) { return false; } @@ -67,7 +75,7 @@ final class AssertFalseStrposToContainsRector extends AbstractPHPUnitRector */ public function refactor(Node $methodCallNode): ?Node { - $this->renameMethod($methodCallNode); + $this->identifierRenamer->renameNodeWithMap($methodCallNode, $this->renameMethodsMap); $this->changeOrderArguments($methodCallNode); return $methodCallNode; @@ -89,14 +97,6 @@ final class AssertFalseStrposToContainsRector extends AbstractPHPUnitRector ], $oldArguments); } - private function renameMethod(MethodCall $methodCallNode): void - { - $this->identifierRenamer->renameNodeWithMap($methodCallNode, [ - 'assertFalse' => 'assertNotContains', - 'assertNotFalse' => 'assertContains', - ]); - } - private function isNamedFunction(Expr $node): bool { if (! $node instanceof FuncCall) { diff --git a/src/Rector/Contrib/PHPUnit/SpecificMethod/AssertInstanceOfComparisonRector.php b/src/Rector/Contrib/PHPUnit/SpecificMethod/AssertInstanceOfComparisonRector.php index 6f739545cb7..3d410abb8ef 100644 --- a/src/Rector/Contrib/PHPUnit/SpecificMethod/AssertInstanceOfComparisonRector.php +++ b/src/Rector/Contrib/PHPUnit/SpecificMethod/AssertInstanceOfComparisonRector.php @@ -36,6 +36,14 @@ final class AssertInstanceOfComparisonRector extends AbstractPHPUnitRector */ private $builderFactory; + /** + * @var string[] + */ + private $renameMethodsMap = [ + 'assertTrue' => 'assertInstanceOf', + 'assertFalse' => 'assertNotInstanceOf', + ]; + public function __construct( MethodCallAnalyzer $methodCallAnalyzer, IdentifierRenamer $identifierRenamer, @@ -52,7 +60,7 @@ final class AssertInstanceOfComparisonRector extends AbstractPHPUnitRector return false; } - if (! $this->methodCallAnalyzer->isMethods($node, ['assertTrue', 'assertFalse'])) { + if (! $this->methodCallAnalyzer->isMethods($node, array_keys($this->renameMethodsMap))) { return false; } @@ -69,7 +77,7 @@ final class AssertInstanceOfComparisonRector extends AbstractPHPUnitRector */ public function refactor(Node $methodCallNode): ?Node { - $this->renameMethod($methodCallNode); + $this->identifierRenamer->renameNodeWithMap($methodCallNode, $this->renameMethodsMap); $this->changeOrderArguments($methodCallNode); return $methodCallNode; @@ -91,12 +99,4 @@ final class AssertInstanceOfComparisonRector extends AbstractPHPUnitRector $argument, ], $oldArguments); } - - private function renameMethod(MethodCall $methodCallNode): void - { - $this->identifierRenamer->renameNodeWithMap($methodCallNode, [ - 'assertTrue' => 'assertInstanceOf', - 'assertFalse' => 'assertNotInstanceOf', - ]); - } } diff --git a/src/Rector/Contrib/PHPUnit/SpecificMethod/AssertNotOperatorRector.php b/src/Rector/Contrib/PHPUnit/SpecificMethod/AssertNotOperatorRector.php index f50c2b601e6..6e27c698480 100644 --- a/src/Rector/Contrib/PHPUnit/SpecificMethod/AssertNotOperatorRector.php +++ b/src/Rector/Contrib/PHPUnit/SpecificMethod/AssertNotOperatorRector.php @@ -30,6 +30,14 @@ final class AssertNotOperatorRector extends AbstractPHPUnitRector */ private $identifierRenamer; + /** + * @var string[] + */ + private $renameMethodsMap = [ + 'assertTrue' => 'assertFalse', + 'assertFalse' => 'assertTrue', + ]; + public function __construct(MethodCallAnalyzer $methodCallAnalyzer, IdentifierRenamer $identifierRenamer) { $this->methodCallAnalyzer = $methodCallAnalyzer; @@ -42,7 +50,7 @@ final class AssertNotOperatorRector extends AbstractPHPUnitRector return false; } - if (! $this->methodCallAnalyzer->isMethods($node, ['assertTrue', 'assertFalse'])) { + if (! $this->methodCallAnalyzer->isMethods($node, array_keys($this->renameMethodsMap))) { return false; } @@ -59,10 +67,7 @@ final class AssertNotOperatorRector extends AbstractPHPUnitRector */ public function refactor(Node $methodCallNode): ?Node { - $this->identifierRenamer->renameNodeWithMap($methodCallNode, [ - 'assertTrue' => 'assertFalse', - 'assertFalse' => 'assertTrue', - ]); + $this->identifierRenamer->renameNodeWithMap($methodCallNode, $this->renameMethodsMap); $oldArguments = $methodCallNode->args; /** @var BooleanNot $negation */ diff --git a/src/Rector/Contrib/PHPUnit/SpecificMethod/AssertPropertyExistsRector.php b/src/Rector/Contrib/PHPUnit/SpecificMethod/AssertPropertyExistsRector.php index e071a8455d4..282177f9ca0 100644 --- a/src/Rector/Contrib/PHPUnit/SpecificMethod/AssertPropertyExistsRector.php +++ b/src/Rector/Contrib/PHPUnit/SpecificMethod/AssertPropertyExistsRector.php @@ -39,6 +39,14 @@ final class AssertPropertyExistsRector extends AbstractPHPUnitRector */ private $nodeFactory; + /** + * @var string[] + */ + private $renameMethodsMap = [ + 'assertTrue' => 'assertClassHasAttribute', + 'assertFalse' => 'assertClassNotHasAttribute', + ]; + public function __construct( MethodCallAnalyzer $methodCallAnalyzer, IdentifierRenamer $identifierRenamer, @@ -55,7 +63,7 @@ final class AssertPropertyExistsRector extends AbstractPHPUnitRector return false; } - if (! $this->methodCallAnalyzer->isMethods($node, ['assertTrue', 'assertFalse'])) { + if (! $this->methodCallAnalyzer->isMethods($node, array_keys($this->renameMethodsMap))) { return false; } @@ -78,10 +86,7 @@ final class AssertPropertyExistsRector extends AbstractPHPUnitRector */ public function refactor(Node $methodCallNode): ?Node { - $this->identifierRenamer->renameNodeWithMap($methodCallNode, [ - 'assertTrue' => 'assertClassHasAttribute', - 'assertFalse' => 'assertClassNotHasAttribute', - ]); + $this->identifierRenamer->renameNodeWithMap($methodCallNode, $this->renameMethodsMap); /** @var Identifier $oldArguments */ $oldArguments = $methodCallNode->args;