From 4d8374ebd06a7764ac97d975f32d4317915008d2 Mon Sep 17 00:00:00 2001 From: Gabriel Caruso Date: Tue, 26 Dec 2017 18:58:22 -0200 Subject: [PATCH] Use MethodNameChanger in AssertTrueFalseToSpecificMethodRector --- .../AssertTrueFalseToSpecificMethodRector.php | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/src/Rector/Contrib/PHPUnit/SpecificMethod/AssertTrueFalseToSpecificMethodRector.php b/src/Rector/Contrib/PHPUnit/SpecificMethod/AssertTrueFalseToSpecificMethodRector.php index 1c63f3d68b6..e7ba4d5b9e6 100644 --- a/src/Rector/Contrib/PHPUnit/SpecificMethod/AssertTrueFalseToSpecificMethodRector.php +++ b/src/Rector/Contrib/PHPUnit/SpecificMethod/AssertTrueFalseToSpecificMethodRector.php @@ -10,6 +10,7 @@ use PhpParser\Node\Expr\MethodCall; use PhpParser\Node\Identifier; use PhpParser\Node\Name; use Rector\NodeAnalyzer\MethodCallAnalyzer; +use Rector\NodeChanger\MethodNameChanger; use Rector\Rector\AbstractRector; /** @@ -48,6 +49,11 @@ final class AssertTrueFalseToSpecificMethodRector extends AbstractRector */ private $methodCallAnalyzer; + /** + * @var MethodNameChanger + */ + private $methodNameChanger; + /** * @var string|null */ @@ -56,10 +62,14 @@ final class AssertTrueFalseToSpecificMethodRector extends AbstractRector /** * @param string[][] $activeMethods */ - public function __construct(array $activeMethods = [], MethodCallAnalyzer $methodCallAnalyzer) - { + public function __construct( + array $activeMethods = [], + MethodCallAnalyzer $methodCallAnalyzer, + MethodNameChanger $methodNameChanger + ) { $this->activeOldToNewMethods = $this->filterActiveOldToNewMethods($activeMethods); $this->methodCallAnalyzer = $methodCallAnalyzer; + $this->methodNameChanger = $methodNameChanger; } public function isCandidate(Node $node): bool @@ -113,11 +123,9 @@ final class AssertTrueFalseToSpecificMethodRector extends AbstractRector [$trueMethodName, $falseMethodName] = $this->activeOldToNewMethods[$this->activeFuncCallName]; if ($oldMethodName === 'assertTrue' && $trueMethodName) { - /** @var string $trueMethodName */ - $methodCallNode->name = new Identifier($trueMethodName); + $this->methodNameChanger->renameNode($methodCallNode, $trueMethodName); } elseif ($oldMethodName === 'assertFalse' && $falseMethodName) { - /** @var string $falseMethodName */ - $methodCallNode->name = new Identifier($falseMethodName); + $this->methodNameChanger->renameNode($methodCallNode, $falseMethodName); } }