cover equals

Author: TomasVotruba

rules-tests/CodeQuality/Rector/MethodCall/WithCallbackIdenticalToStandaloneAssertsRector/Fixture/cover_equal.php.inc

@@ -0,0 +1,44 @@
+<?php
+
+namespace Rector\PHPUnit\Tests\CodeQuality\Rector\MethodCall\WithCallbackIdenticalToStandaloneAssertsRector\Fixture;
+
+use PHPUnit\Framework\TestCase;
+
+final class CoverEqual extends TestCase
+{
+    public function test($type)
+    {
+        $this->createMock('SomeType')
+            ->method('someMethod')
+            ->with($this->callback(
+                fn ($item): bool => $item instanceof $type &&
+                    $item->getName() == 'name'
+                ));
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\PHPUnit\Tests\CodeQuality\Rector\MethodCall\WithCallbackIdenticalToStandaloneAssertsRector\Fixture;
+
+use PHPUnit\Framework\TestCase;
+
+final class CoverEqual extends TestCase
+{
+    public function test($type)
+    {
+        $this->createMock('SomeType')
+            ->method('someMethod')
+            ->with($this->callback(
+                function ($item) use ($type): bool {
+                    $this->assertInstanceOf($type, $item);
+                    $this->assertEquals('name', $item->getName());
+                    return true;
+                }
+                ));
+    }
+}
+
+?>

rules/CodeQuality/NodeFactory/FromBinaryAndAssertExpressionsFactory.php

@@ -84,7 +84,7 @@ public function create(array $exprs): ?array
                 continue;
             }
 
-            if ($expr instanceof Identical) {
+            if ($expr instanceof Identical || $expr instanceof Expr\BinaryOp\Equal) {
                 if ($expr->left instanceof FuncCall && $this->nodeNameResolver->isName($expr->left, 'count')) {
                     if ($expr->right instanceof Int_) {
                         $countedExpr = $expr->left->getArgs()[0]
@@ -107,7 +107,7 @@ public function create(array $exprs): ?array
                 // create assertSame()
                 $assertMethodCalls[] = $this->nodeFactory->createMethodCall(
                     'this',
-                    'assertSame',
+                    $expr instanceof Identical ? 'assertSame' : 'assertEquals',
                     [$expr->right, $expr->left]
                 );
             } else {

rules/CodeQuality/Rector/MethodCall/WithCallbackIdenticalToStandaloneAssertsRector.php

@@ -122,7 +122,7 @@ public function refactor(Node $node): MethodCall|null
         } elseif ($innerSoleExpr instanceof Identical || $innerSoleExpr instanceof Instanceof_ || $innerSoleExpr instanceof Isset_ || ($innerSoleExpr instanceof FuncCall && $this->isName(
             $innerSoleExpr->name,
             'array_key_exists'
-        ))) {
+        )) || $innerSoleExpr instanceof Expr\BinaryOp\Equal) {
             $joinedExprs = [$innerSoleExpr];
         } else {
             return null;