register ReplaceAtMethodWithDesiredMatcherRector to code-quality (#563)

* simplify code

* register ReplaceAtMethodWithDesiredMatcherRector to code-quality

Author: TomasVotruba

config/sets/phpunit-code-quality.php

@@ -46,6 +46,7 @@
 use Rector\PHPUnit\CodeQuality\Rector\MethodCall\UseSpecificWillMethodRector;
 use Rector\PHPUnit\CodeQuality\Rector\MethodCall\UseSpecificWithMethodRector;
 use Rector\PHPUnit\PHPUnit60\Rector\MethodCall\GetMockBuilderGetMockToCreateMockRector;
+use Rector\PHPUnit\PHPUnit90\Rector\MethodCall\ReplaceAtMethodWithDesiredMatcherRector;
 
 return static function (RectorConfig $rectorConfig): void {
     $rectorConfig->rules([
@@ -119,5 +120,6 @@
         // prefer simple mocking
         GetMockBuilderGetMockToCreateMockRector::class,
         EntityDocumentCreateMockToDirectNewRector::class,
+        ReplaceAtMethodWithDesiredMatcherRector::class,
     ]);
 };

rules/PHPUnit90/Rector/MethodCall/ReplaceAtMethodWithDesiredMatcherRector.php

@@ -7,7 +7,6 @@
 use PhpParser\Node;
 use PhpParser\Node\Arg;
 use PhpParser\Node\Expr\MethodCall;
-use PhpParser\Node\Identifier;
 use PhpParser\Node\Scalar\Int_;
 use Rector\PHPUnit\NodeAnalyzer\TestsNodeAnalyzer;
 use Rector\Rector\AbstractRector;
@@ -19,8 +18,6 @@
  */
 final class ReplaceAtMethodWithDesiredMatcherRector extends AbstractRector
 {
-    private bool $hasChanged = false;
-
     public function __construct(
         private readonly TestsNodeAnalyzer $testsNodeAnalyzer
     ) {
@@ -57,70 +54,69 @@ public function getNodeTypes(): array
     }
 
     /**
-     * @param  MethodCall  $node
+     * @param MethodCall $node
      */
     public function refactor(Node $node): null|MethodCall
     {
-        $this->hasChanged = false;
-
         if (! $this->testsNodeAnalyzer->isInTestClass($node)) {
             return null;
         }
 
-        if ($node->var instanceof MethodCall && $arg = $this->findAtMethodCall($node->var)) {
-            $this->replaceWithDesiredMatcher($arg);
-        }
-
-        if ($this->hasChanged) {
-            return $node;
-        }
-
-        return null;
-    }
-
-    private function findAtMethodCall(MethodCall $methodCall): ?Arg
-    {
-        foreach ($methodCall->getArgs() as $arg) {
-            if ($arg->value instanceof MethodCall &&
-                $arg->value->name instanceof Identifier &&
-                $arg->value->name->toString() === 'at'
-            ) {
-                return $arg;
-            }
+        if (! $node->var instanceof MethodCall) {
+            return null;
         }
 
-        if ($methodCall->var instanceof MethodCall) {
-            $this->findAtMethodCall($methodCall->var);
+        $arg = $this->findAtMethodCall($node->var);
+        if (! $arg instanceof Arg) {
+            return null;
         }
 
-        return null;
-    }
-
-    private function replaceWithDesiredMatcher(Arg $arg): void
-    {
         if (! $arg->value instanceof MethodCall) {
-            return;
+            return null;
         }
 
+        $count = null;
         foreach ($arg->value->getArgs() as $item) {
             if ($item->value instanceof Int_) {
                 $count = $item->value->value;
             }
         }
 
         if (! isset($count)) {
-            return;
+            return null;
         }
 
         if ($count === 0) {
             $arg->value = new MethodCall($arg->value->var, 'never');
-            $this->hasChanged = true;
-        } elseif ($count === 1) {
+            return $node;
+        }
+
+        if ($count === 1) {
             $arg->value = new MethodCall($arg->value->var, 'once');
-            $this->hasChanged = true;
-        } elseif ($count > 1) {
+            return $node;
+        }
+
+        if ($count > 1) {
             $arg->value = new MethodCall($arg->value->var, 'exactly', [new Arg(new Int_($count))]);
-            $this->hasChanged = true;
+            return $node;
+        }
+
+        return null;
+    }
+
+    private function findAtMethodCall(MethodCall $methodCall): ?Arg
+    {
+        foreach ($methodCall->getArgs() as $arg) {
+            $argExpr = $arg->value;
+            if ($argExpr instanceof MethodCall && $this->isName($argExpr->name, 'at')) {
+                return $arg;
+            }
         }
+
+        if ($methodCall->var instanceof MethodCall) {
+            $this->findAtMethodCall($methodCall->var);
+        }
+
+        return null;
     }
 }