add isset support, revert order to respect original one

Author: TomasVotruba

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

@@ -35,8 +35,8 @@ final class ClosureInstanceOf extends TestCase
         $someMock->expects($this->any())
             ->method('trans')
             ->with($this->callback(function ($args): void {
-                $this->assertInstanceOf(\stdClass::class, $args[0]);
                 $this->assertCount(5, $args);
+                $this->assertInstanceOf(\stdClass::class, $args[0]);
             }));
     }
 }

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

@@ -0,0 +1,45 @@
+<?php
+
+namespace Rector\PHPUnit\Tests\CodeQuality\Rector\MethodCall\WithCallbackIdenticalToStandaloneAssertsRector\Fixture;
+
+use PHPUnit\Framework\TestCase;
+
+final class IssetArrayKeys extends TestCase
+{
+    public function test()
+    {
+        $someMock = $this->getMockBuilder('AnyType')->getMock();
+
+        $someMock->expects($this->any())
+            ->method('trans')
+            ->with($this->callback(function ($args): bool {
+                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 IssetArrayKeys extends TestCase
+{
+    public function test()
+    {
+        $someMock = $this->getMockBuilder('AnyType')->getMock();
+
+        $someMock->expects($this->any())
+            ->method('trans')
+            ->with($this->callback(function ($args): void {
+                $this->assertCount(5, $args);
+                $this->assertArrayHasKey(0, $args);
+                $this->assertSame('some_value', $args[0]);
+            }));
+    }
+}
+
+?>

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

@@ -39,8 +39,8 @@ final class WithArrowFunction extends TestCase
             ->with(
                 $this->callback(
                     function ($args): void {
-                        $this->assertInstanceOf(\stdClass::class, $args[0]);
                         $this->assertCount(5, $args);
+                        $this->assertInstanceOf(\stdClass::class, $args[0]);
                     }
                 )
             );

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

@@ -35,8 +35,8 @@ final class WithCallbackAssert extends TestCase
         $someMock->expects($this->any())
             ->method('trans')
             ->with($this->callback(function ($args): void {
-                $this->assertSame('some_value', $args[0]);
                 $this->assertCount(5, $args);
+                $this->assertSame('some_value', $args[0]);
             }));
     }
 }

rules/CodeQuality/NodeFactory/FromBinaryAndAssertExpressionsFactory.php

@@ -4,7 +4,9 @@
 
 namespace Rector\PHPUnit\CodeQuality\NodeFactory;
 
+use PhpParser\Node\Expr\Isset_;
 use PhpParser\Node\Expr;
+use PhpParser\Node\Expr\ArrayDimFetch;
 use PhpParser\Node\Expr\BinaryOp\Identical;
 use PhpParser\Node\Expr\ClassConstFetch;
 use PhpParser\Node\Expr\FuncCall;
@@ -34,6 +36,23 @@ public function create(array $exprs): ?array
         $assertMethodCalls = [];
 
         foreach ($exprs as $expr) {
+            if ($expr instanceof Isset_) {
+                foreach ($expr->vars as $issetVariable) {
+                    if ($issetVariable instanceof ArrayDimFetch) {
+                        $assertMethodCalls[] = $this->nodeFactory->createMethodCall(
+                            'this',
+                            'assertArrayHasKey',
+                            [$issetVariable->dim, $issetVariable->var]
+                        );
+                    } else {
+                        // not supported yet
+                        return null;
+                    }
+                }
+
+                continue;
+            }
+
             if ($expr instanceof Instanceof_) {
                 if (! $expr->class instanceof Name) {
                     return null;
@@ -85,6 +104,9 @@ public function create(array $exprs): ?array
             return null;
         }
 
+        // to keep order from binary
+        $assertMethodCalls = array_reverse($assertMethodCalls);
+
         $stmts = [];
         foreach ($assertMethodCalls as $assertMethodCall) {
             $stmts[] = new Expression($assertMethodCall);