allow extra stmt (#579)

Author: TomasVotruba

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

@@ -0,0 +1,48 @@
+<?php
+
+namespace Rector\PHPUnit\Tests\CodeQuality\Rector\MethodCall\WithCallbackIdenticalToStandaloneAssertsRector\Fixture;
+
+use PHPUnit\Framework\TestCase;
+
+final class ExtraStmt extends TestCase
+{
+    public function test()
+    {
+        $someMock = $this->getMockBuilder('AnyType')->getMock();
+
+        $someMock->expects($this->any())
+            ->method('trans')
+            ->with($this->callback(function ($args): bool {
+                $item = 100;
+                return count($args) === 5 && isset($args[0]) && $args[0] === 'some_value';
+            }));
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\PHPUnit\Tests\CodeQuality\Rector\MethodCall\WithCallbackIdenticalToStandaloneAssertsRector\Fixture;
+
+use PHPUnit\Framework\TestCase;
+
+final class ExtraStmt extends TestCase
+{
+    public function test()
+    {
+        $someMock = $this->getMockBuilder('AnyType')->getMock();
+
+        $someMock->expects($this->any())
+            ->method('trans')
+            ->with($this->callback(function ($args): bool {
+                $item = 100;
+                $this->assertCount(5, $args);
+                $this->assertArrayHasKey(0, $args);
+                $this->assertSame('some_value', $args[0]);
+                return true;
+            }));
+    }
+}
+
+?>

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

@@ -6,6 +6,7 @@
 
 use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\ArrayDimFetch;
+use PhpParser\Node\Expr\BinaryOp\Equal;
 use PhpParser\Node\Expr\BinaryOp\Identical;
 use PhpParser\Node\Expr\ClassConstFetch;
 use PhpParser\Node\Expr\FuncCall;
@@ -84,7 +85,7 @@ public function create(array $exprs): ?array
                 continue;
             }
 
-            if ($expr instanceof Identical || $expr instanceof Expr\BinaryOp\Equal) {
+            if ($expr instanceof Identical || $expr instanceof Equal) {
                 if ($expr->left instanceof FuncCall && $this->nodeNameResolver->isName($expr->left, 'count')) {
                     if ($expr->right instanceof Int_) {
                         $countedExpr = $expr->left->getArgs()[0]

rules/CodeQuality/NodeFactory/FromBinaryAndAssertExpressionsFactory.php

@@ -10,6 +10,7 @@
 use PhpParser\Node\Expr\ArrowFunction;
 use PhpParser\Node\Expr\BinaryOp\BooleanAnd;
 use PhpParser\Node\Expr\BinaryOp\BooleanOr;
+use PhpParser\Node\Expr\BinaryOp\Equal;
 use PhpParser\Node\Expr\BinaryOp\Identical;
 use PhpParser\Node\Expr\Closure;
 use PhpParser\Node\Expr\FuncCall;
@@ -122,7 +123,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) {
+        )) || $innerSoleExpr instanceof Equal) {
             $joinedExprs = [$innerSoleExpr];
         } else {
             return null;
@@ -137,13 +138,28 @@ public function refactor(Node $node): MethodCall|null
             return null;
         }
 
+        // all stmts but last
+        $functionLike = $argAndFunctionLike->getFunctionLike();
+
+        if ($functionLike instanceof Closure) {
+            $functionStmts = $functionLike->stmts;
+
+            if (count($functionStmts) >= 2) {
+                unset($functionStmts[array_key_last($functionStmts)]);
+            } else {
+                $functionStmts = [];
+            }
+        } else {
+            $functionStmts = [];
+        }
+
         // last si return true;
         $assertExpressions[] = new Return_($this->nodeFactory->createTrue());
 
         $innerFunctionLike = $argAndFunctionLike->getFunctionLike();
 
         if ($innerFunctionLike instanceof Closure) {
-            $innerFunctionLike->stmts = $assertExpressions;
+            $innerFunctionLike->stmts = array_merge($functionStmts, $assertExpressions);
         } else {
             // arrow function -> flip to closure
             $functionLikeInArg = $argAndFunctionLike->getArg();
@@ -218,16 +234,15 @@ private function matchWithCallbackInnerClosure(MethodCall $methodCall): null|Arg
     private function matchInnerSoleExpr(Closure|ArrowFunction $functionLike): ?Expr
     {
         if ($functionLike instanceof Closure) {
-            if (count($functionLike->stmts) !== 1) {
-                return null;
-            }
+            foreach ($functionLike->getStmts() as $stmt) {
+                if (! $stmt instanceof Return_) {
+                    continue;
+                }
 
-            $innerStmt = $functionLike->stmts[0];
-            if (! $innerStmt instanceof Return_) {
-                return null;
+                return $stmt->expr;
             }
 
-            return $innerStmt->expr;
+            return null;
         }
 
         return $functionLike->expr;