[EarlyReturn] Move comment in If_ stmt for ChangeAndIfToEarlyReturnRe…

…ctor (#648)

rules-tests/EarlyReturn/Rector/If_/ChangeAndIfToEarlyReturnRector/Fixture/move_comment_in_if_stmt.php.inc

@@ -0,0 +1,39 @@
+<?php
+
+namespace Rector\Tests\EarlyReturn\Rector\If_\ChangeAndIfToEarlyReturnRector\Fixture;
+
+class MoveCommentInIfStmt
+{
+    public function canDrive(Car $car)
+    {
+        if ($car->hasWheels && $car->hasFuel) {
+            // a comment
+            return true;
+        }
+
+        return false;
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\EarlyReturn\Rector\If_\ChangeAndIfToEarlyReturnRector\Fixture;
+
+class MoveCommentInIfStmt
+{
+    public function canDrive(Car $car)
+    {
+        if (!$car->hasWheels) {
+            return false;
+        }
+        if (!$car->hasFuel) {
+            return false;
+        }
+        // a comment
+        return true;
+    }
+}
+
+?>

rules-tests/EarlyReturn/Rector/If_/ChangeAndIfToEarlyReturnRector/Fixture/move_comment_in_if_stmt2.php.inc

@@ -0,0 +1,42 @@
+<?php
+
+namespace Rector\Tests\EarlyReturn\Rector\If_\ChangeAndIfToEarlyReturnRector\Fixture;
+
+class MoveCommentInIfStmt2
+{
+    public function canDrive(Car $car)
+    {
+        if ($car->hasWheels && $car->hasFuel) {
+            // a comment
+            return true;
+        }
+
+        // another comment
+        return false;
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\EarlyReturn\Rector\If_\ChangeAndIfToEarlyReturnRector\Fixture;
+
+class MoveCommentInIfStmt2
+{
+    public function canDrive(Car $car)
+    {
+        if (!$car->hasWheels) {
+            // another comment
+            return false;
+        }
+        if (!$car->hasFuel) {
+            // another comment
+            return false;
+        }
+        // a comment
+        return true;
+    }
+}
+
+?>

rules/EarlyReturn/NodeFactory/InvertedIfFactory.php

@@ -30,10 +30,15 @@ public function __construct(
     public function createFromConditions(If_ $if, array $conditions, Return_ $return): array
     {
         $ifs = [];
-        $stmt = $this->contextAnalyzer->isInLoop($if) && ! $this->getIfNextReturn($if)
+        $ifNextReturn = $this->getIfNextReturn($if);
+        $stmt = $this->contextAnalyzer->isInLoop($if) && ! $ifNextReturn
             ? [new Continue_()]
             : [$return];
 
+        if ($ifNextReturn instanceof Return_) {
+            $stmt[0]->setAttribute(AttributeKey::COMMENTS, $ifNextReturn->getAttribute(AttributeKey::COMMENTS));
+        }
+
         $getNextReturnExpr = $this->getNextReturnExpr($if);
         if ($getNextReturnExpr instanceof Return_) {
             $return->expr = $getNextReturnExpr->expr;