[CodeQuality] Add Else and ElseIf on CompleteMissingIfElseBracketRect…

…or (#5124)

* [CodeQuality] Add Else and ElseIf on CompleteMissingIfElseBracketRector

* fix

* fix end statement

* clean up

* clean up

rules-tests/CodeQuality/Rector/If_/CompleteMissingIfElseBracketRector/Fixture/missing_bracket_on_else.php.inc

@@ -0,0 +1,34 @@
+<?php
+
+namespace Rector\Tests\CodeQuality\Rector\If_\CompleteMissingIfElseBracketRector\Fixture;
+
+class MissingBracketOnElse
+{
+    public function run($value, $value2)
+    {
+        if ($value) {
+            return 1;
+        } else
+            return 2;
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\CodeQuality\Rector\If_\CompleteMissingIfElseBracketRector\Fixture;
+
+class MissingBracketOnElse
+{
+    public function run($value, $value2)
+    {
+        if ($value) {
+            return 1;
+        } else {
+            return 2;
+        }
+    }
+}
+
+?>

rules-tests/CodeQuality/Rector/If_/CompleteMissingIfElseBracketRector/Fixture/missing_bracket_on_elseif.php.inc

@@ -0,0 +1,34 @@
+<?php
+
+namespace Rector\Tests\CodeQuality\Rector\If_\CompleteMissingIfElseBracketRector\Fixture;
+
+class MissingBracketOnElseIf
+{
+    public function run($value, $value2)
+    {
+        if ($value) {
+            return 1;
+        } elseif ($value2)
+            return 2;
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\CodeQuality\Rector\If_\CompleteMissingIfElseBracketRector\Fixture;
+
+class MissingBracketOnElseIf
+{
+    public function run($value, $value2)
+    {
+        if ($value) {
+            return 1;
+        } elseif ($value2) {
+            return 2;
+        }
+    }
+}
+
+?>

rules-tests/CodeQuality/Rector/If_/CompleteMissingIfElseBracketRector/Fixture/skip_spaced_else_stmts.php.inc

@@ -0,0 +1,17 @@
+<?php
+
+namespace Rector\Tests\CodeQuality\Rector\If_\CompleteMissingIfElseBracketRector\Fixture;
+
+class SkipSpacedElseStmts
+{
+    public function run($value, $value2)
+    {
+        if ($value) {
+            return 1;
+        } else {
+            $a = 1;
+
+            return $a;
+        }
+    }
+}

rules/CodeQuality/Rector/If_/CompleteMissingIfElseBracketRector.php

@@ -5,6 +5,8 @@
 namespace Rector\CodeQuality\Rector\If_;
 
 use PhpParser\Node;
+use PhpParser\Node\Stmt\Else_;
+use PhpParser\Node\Stmt\ElseIf_;
 use PhpParser\Node\Stmt\If_;
 use Rector\Core\Rector\AbstractRector;
 use Rector\NodeTypeResolver\Node\AttributeKey;
@@ -52,11 +54,11 @@ public function run($value)
      */
     public function getNodeTypes(): array
     {
-        return [If_::class];
+        return [If_::class, ElseIf_::class, Else_::class];
     }
 
     /**
-     * @param If_ $node
+     * @param If_|ElseIf_|Else_ $node
      */
     public function refactor(Node $node): ?Node
     {
@@ -78,10 +80,15 @@ public function refactor(Node $node): ?Node
     /**
      * @param mixed[] $oldTokens
      */
-    private function isIfConditionFollowedByOpeningCurlyBracket(If_ $if, array $oldTokens): bool
+    private function isIfConditionFollowedByOpeningCurlyBracket(If_|ElseIf_|Else_ $if, array $oldTokens): bool
     {
         for ($i = $if->getStartTokenPos(); $i < $if->getEndTokenPos(); ++$i) {
             if ($oldTokens[$i] !== ')') {
+                if ($oldTokens[$i] === ';') {
+                    // all good
+                    return true;
+                }
+
                 continue;
             }
 
@@ -103,7 +110,7 @@ private function isIfConditionFollowedByOpeningCurlyBracket(If_ $if, array $oldT
         return false;
     }
 
-    private function isBareNewNode(If_ $if): bool
+    private function isBareNewNode(If_|ElseIf_|Else_ $if): bool
     {
         $originalNode = $if->getAttribute(AttributeKey::ORIGINAL_NODE);
         if (! $originalNode instanceof Node) {