Skip setter + getter, keep original stmts order

rules-tests/Unambiguous/Rector/Expression/FluentSettersToStandaloneCallMethodRector/Fixture/fixture.php.inc

@@ -27,8 +27,9 @@ final class SomeClass
     public function setup()
     {
         $someSetterClass = new SomeSetterClass();
-        $someSetterClass->setSurname('Doe');
         $someSetterClass->setName('John');
+        $someSetterClass->setSurname('Doe');
+        return $someSetterClass;
     }
 }
 

rules-tests/Unambiguous/Rector/Expression/FluentSettersToStandaloneCallMethodRector/Fixture/skip_getter_setter.php.inc

@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Tests\Unambiguous\Rector\Expression\FluentSettersToStandaloneCallMethodRector\Fixture;
+
+use Rector\Tests\Unambiguous\Rector\Expression\FluentSettersToStandaloneCallMethodRector\Source\GetterSetterClass;
+
+final class SkipGetterSetter
+{
+    public function setup()
+    {
+        return (new GetterSetterClass())
+            ->getter()
+            ->setName('John')
+            ->setSurname('Doe');
+    }
+}

rules-tests/Unambiguous/Rector/Expression/FluentSettersToStandaloneCallMethodRector/Fixture/skip_mocks_on_variable.php.inc

@@ -0,0 +1,17 @@
+<?php
+
+namespace Rector\Tests\Unambiguous\Rector\Expression\FluentSettersToStandaloneCallMethodRector\Fixture;
+
+use PHPUnit\Framework\TestCase;
+use Rector\Tests\Unambiguous\Rector\Expression\FluentSettersToStandaloneCallMethodRector\Source\SomeSetterClass;
+
+final class SkipMocksOnVariable extends TestCase
+{
+    public function test()
+    {
+        $someVariable = $this->createMock(SomeSetterClass::class);
+        $someVariable->expects($this->once())
+            ->method('some')
+            ->with(1);
+    }
+}

rules-tests/Unambiguous/Rector/Expression/FluentSettersToStandaloneCallMethodRector/Source/GetterSetterClass.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace Rector\Tests\Unambiguous\Rector\Expression\FluentSettersToStandaloneCallMethodRector\Source;
+
+final class GetterSetterClass
+{
+    public function getter()
+    {
+        return new SomeSetterClass();
+    }
+}

rules/Unambiguous/Rector/Expression/FluentSettersToStandaloneCallMethodRector.php

@@ -4,7 +4,6 @@
 
 namespace Rector\Unambiguous\Rector\Expression;
 
-use PHPStan\Type\ObjectType;
 use PhpParser\Node;
 use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\Assign;
@@ -15,6 +14,7 @@
 use PhpParser\Node\Stmt\Expression;
 use PhpParser\Node\Stmt\Return_;
 use PHPStan\Reflection\ClassReflection;
+use PHPStan\Type\ObjectType;
 use Rector\Naming\Naming\PropertyNaming;
 use Rector\NodeTypeResolver\Node\AttributeKey;
 use Rector\Rector\AbstractRector;
@@ -98,6 +98,11 @@ public function refactor(Node $node): ?array
 
         $currentMethodCall = $firstMethodCall;
         while ($currentMethodCall instanceof MethodCall) {
+            // must be exactly one argument
+            if (count($currentMethodCall->getArgs()) !== 1) {
+                return null;
+            }
+
             $methodCalls[] = $currentMethodCall;
             $currentMethodCall = $currentMethodCall->var;
         }
@@ -119,13 +124,21 @@ public function refactor(Node $node): ?array
         $firstAssign = new Assign($someVariable, $rootExpr);
         $stmts = [new Expression($firstAssign)];
 
+        // revert to normal order
+        $methodCalls = array_reverse($methodCalls);
+
         foreach ($methodCalls as $methodCall) {
             $methodCall->var = $someVariable;
             // inlines indent and removes () around first expr
             $methodCall->setAttribute(AttributeKey::ORIGINAL_NODE, null);
             $stmts[] = new Expression($methodCall);
         }
 
+        if ($node instanceof Return_) {
+            $node->expr = $someVariable;
+            $stmts[] = $node;
+        }
+
         $node->expr = $someVariable;
 
         return $stmts;