handle solo identical as well, to get better message (#572)

Author: TomasVotruba

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

@@ -0,0 +1,48 @@
+<?php
+
+namespace Rector\PHPUnit\Tests\CodeQuality\Rector\MethodCall\WithCallbackIdenticalToStandaloneAssertsRector\Fixture;
+
+use PHPUnit\Framework\TestCase;
+
+final class HandleSoloCompare extends TestCase
+{
+    public function test()
+    {
+        $someMock = $this->createMock('AnyType')
+            ->expects($this->any())
+            ->method('trans')
+            ->with(
+                $this->callback(
+                    fn ($args): bool => count($args) === 5
+                )
+            );
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\PHPUnit\Tests\CodeQuality\Rector\MethodCall\WithCallbackIdenticalToStandaloneAssertsRector\Fixture;
+
+use PHPUnit\Framework\TestCase;
+
+final class HandleSoloCompare extends TestCase
+{
+    public function test()
+    {
+        $someMock = $this->createMock('AnyType')
+            ->expects($this->any())
+            ->method('trans')
+            ->with(
+                $this->callback(
+                    function ($args): bool {
+                        $this->assertCount(5, $args);
+                        return true;
+                    }
+                )
+            );
+    }
+}
+
+?>

rules/CodeQuality/Rector/MethodCall/WithCallbackIdenticalToStandaloneAssertsRector.php

@@ -4,6 +4,7 @@
 
 namespace Rector\PHPUnit\CodeQuality\Rector\MethodCall;
 
+use PhpParser\Node\Expr\BinaryOp\Identical;
 use PhpParser\Node;
 use PhpParser\Node\ClosureUse;
 use PhpParser\Node\Expr;
@@ -38,7 +39,7 @@ public function __construct(
     public function getRuleDefinition(): RuleDefinition
     {
         return new RuleDefinition(
-            'Replaces identical compare in $this->callable() to standalone PHPUnit asserts',
+            'Replaces identical compare in $this->callable() sole return to standalone PHPUnit asserts that show more detailed failure messages',
             [
                 new CodeSample(
                     <<<'CODE_SAMPLE'
@@ -113,11 +114,14 @@ public function refactor(Node $node): MethodCall|null
         }
 
         $innerSoleExpr = $this->matchInnerSoleExpr($argAndFunctionLike->getFunctionLike());
-        if (! $innerSoleExpr instanceof BooleanAnd) {
+        if ($innerSoleExpr instanceof BooleanAnd) {
+            $joinedExprs = $this->extractJoinedExprs($innerSoleExpr);
+        } elseif ($innerSoleExpr instanceof Identical) {
+            $joinedExprs = [$innerSoleExpr];
+        } else {
             return null;
         }
 
-        $joinedExprs = $this->extractJoinedExprs($innerSoleExpr);
         if ($joinedExprs === null || $joinedExprs === []) {
             return null;
         }