From cab0d4557f6de64f3813bd1532b670104b7a7506 Mon Sep 17 00:00:00 2001
From: Tomas Votruba <tomas.vot@gmail.com>
Date: Wed, 8 Jul 2026 18:15:35 +0200
Subject: [PATCH 1/2] [CodingStyle] Add AlternativeIfToBracketRector to convert
 if/endif alternative syntax to bracket syntax

---
 .../AlternativeIfToBracketRectorTest.php      |  28 +++++
 .../Fixture/if_elseif_else.php.inc            |  33 ++++++
 .../Fixture/nested_if.php.inc                 |  31 ++++++
 .../Fixture/simple_if.php.inc                 |  25 +++++
 .../Fixture/skip_bracket.php.inc              |  16 +++
 .../config/configured_rule.php                |   9 ++
 .../If_/AlternativeIfToBracketRector.php      | 102 ++++++++++++++++++
 7 files changed, 244 insertions(+)
 create mode 100644 rules-tests/CodingStyle/Rector/If_/AlternativeIfToBracketRector/AlternativeIfToBracketRectorTest.php
 create mode 100644 rules-tests/CodingStyle/Rector/If_/AlternativeIfToBracketRector/Fixture/if_elseif_else.php.inc
 create mode 100644 rules-tests/CodingStyle/Rector/If_/AlternativeIfToBracketRector/Fixture/nested_if.php.inc
 create mode 100644 rules-tests/CodingStyle/Rector/If_/AlternativeIfToBracketRector/Fixture/simple_if.php.inc
 create mode 100644 rules-tests/CodingStyle/Rector/If_/AlternativeIfToBracketRector/Fixture/skip_bracket.php.inc
 create mode 100644 rules-tests/CodingStyle/Rector/If_/AlternativeIfToBracketRector/config/configured_rule.php
 create mode 100644 rules/CodingStyle/Rector/If_/AlternativeIfToBracketRector.php

diff --git a/rules-tests/CodingStyle/Rector/If_/AlternativeIfToBracketRector/AlternativeIfToBracketRectorTest.php b/rules-tests/CodingStyle/Rector/If_/AlternativeIfToBracketRector/AlternativeIfToBracketRectorTest.php
new file mode 100644
index 00000000000..83b23940831
--- /dev/null
+++ b/rules-tests/CodingStyle/Rector/If_/AlternativeIfToBracketRector/AlternativeIfToBracketRectorTest.php
@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Tests\CodingStyle\Rector\If_\AlternativeIfToBracketRector;
+
+use Iterator;
+use PHPUnit\Framework\Attributes\DataProvider;
+use Rector\Testing\PHPUnit\AbstractRectorTestCase;
+
+final class AlternativeIfToBracketRectorTest extends AbstractRectorTestCase
+{
+    #[DataProvider('provideData')]
+    public function test(string $filePath): void
+    {
+        $this->doTestFile($filePath);
+    }
+
+    public static function provideData(): Iterator
+    {
+        return self::yieldFilesFromDirectory(__DIR__ . '/Fixture');
+    }
+
+    public function provideConfigFilePath(): string
+    {
+        return __DIR__ . '/config/configured_rule.php';
+    }
+}
diff --git a/rules-tests/CodingStyle/Rector/If_/AlternativeIfToBracketRector/Fixture/if_elseif_else.php.inc b/rules-tests/CodingStyle/Rector/If_/AlternativeIfToBracketRector/Fixture/if_elseif_else.php.inc
new file mode 100644
index 00000000000..dcdff5f1af0
--- /dev/null
+++ b/rules-tests/CodingStyle/Rector/If_/AlternativeIfToBracketRector/Fixture/if_elseif_else.php.inc
@@ -0,0 +1,33 @@
+<?php
+
+namespace Rector\Tests\CodingStyle\Rector\If_\AlternativeIfToBracketRector\Fixture;
+
+function ifElseIf($a, $b)
+{
+    if ($a) :
+        $x = 1;
+    elseif ($b) :
+        $x = 2;
+    else :
+        $x = 3;
+    endif;
+
+    return $x;
+}
+-----
+<?php
+
+namespace Rector\Tests\CodingStyle\Rector\If_\AlternativeIfToBracketRector\Fixture;
+
+function ifElseIf($a, $b)
+{
+    if ($a) {
+        $x = 1;
+    } elseif ($b) {
+        $x = 2;
+    } else {
+        $x = 3;
+    }
+
+    return $x;
+}
diff --git a/rules-tests/CodingStyle/Rector/If_/AlternativeIfToBracketRector/Fixture/nested_if.php.inc b/rules-tests/CodingStyle/Rector/If_/AlternativeIfToBracketRector/Fixture/nested_if.php.inc
new file mode 100644
index 00000000000..17cacb72dd5
--- /dev/null
+++ b/rules-tests/CodingStyle/Rector/If_/AlternativeIfToBracketRector/Fixture/nested_if.php.inc
@@ -0,0 +1,31 @@
+<?php
+
+namespace Rector\Tests\CodingStyle\Rector\If_\AlternativeIfToBracketRector\Fixture;
+
+function nestedIf($a, $b)
+{
+    if ($a) :
+        $x = 1;
+    else :
+        if ($b) :
+            $x = 2;
+        endif;
+    endif;
+
+    return $x;
+}
+-----
+<?php
+
+namespace Rector\Tests\CodingStyle\Rector\If_\AlternativeIfToBracketRector\Fixture;
+
+function nestedIf($a, $b)
+{
+    if ($a) {
+        $x = 1;
+    } else if ($b) {
+        $x = 2;
+    }
+
+    return $x;
+}
diff --git a/rules-tests/CodingStyle/Rector/If_/AlternativeIfToBracketRector/Fixture/simple_if.php.inc b/rules-tests/CodingStyle/Rector/If_/AlternativeIfToBracketRector/Fixture/simple_if.php.inc
new file mode 100644
index 00000000000..431d721caf5
--- /dev/null
+++ b/rules-tests/CodingStyle/Rector/If_/AlternativeIfToBracketRector/Fixture/simple_if.php.inc
@@ -0,0 +1,25 @@
+<?php
+
+namespace Rector\Tests\CodingStyle\Rector\If_\AlternativeIfToBracketRector\Fixture;
+
+function simpleIf($value)
+{
+    if ($value) :
+        $result = 1;
+    endif;
+
+    return $result;
+}
+-----
+<?php
+
+namespace Rector\Tests\CodingStyle\Rector\If_\AlternativeIfToBracketRector\Fixture;
+
+function simpleIf($value)
+{
+    if ($value) {
+        $result = 1;
+    }
+
+    return $result;
+}
diff --git a/rules-tests/CodingStyle/Rector/If_/AlternativeIfToBracketRector/Fixture/skip_bracket.php.inc b/rules-tests/CodingStyle/Rector/If_/AlternativeIfToBracketRector/Fixture/skip_bracket.php.inc
new file mode 100644
index 00000000000..5b14f807f34
--- /dev/null
+++ b/rules-tests/CodingStyle/Rector/If_/AlternativeIfToBracketRector/Fixture/skip_bracket.php.inc
@@ -0,0 +1,16 @@
+<?php
+
+namespace Rector\Tests\CodingStyle\Rector\If_\AlternativeIfToBracketRector\Fixture;
+
+function skipBracket($a, $b)
+{
+    if ($a) {
+        $x = 1;
+    } elseif ($b) {
+        $x = 2;
+    } else {
+        $x = 3;
+    }
+
+    return $x;
+}
diff --git a/rules-tests/CodingStyle/Rector/If_/AlternativeIfToBracketRector/config/configured_rule.php b/rules-tests/CodingStyle/Rector/If_/AlternativeIfToBracketRector/config/configured_rule.php
new file mode 100644
index 00000000000..9078416e46f
--- /dev/null
+++ b/rules-tests/CodingStyle/Rector/If_/AlternativeIfToBracketRector/config/configured_rule.php
@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+use Rector\CodingStyle\Rector\If_\AlternativeIfToBracketRector;
+use Rector\Config\RectorConfig;
+
+return RectorConfig::configure()
+    ->withRules([AlternativeIfToBracketRector::class]);
diff --git a/rules/CodingStyle/Rector/If_/AlternativeIfToBracketRector.php b/rules/CodingStyle/Rector/If_/AlternativeIfToBracketRector.php
new file mode 100644
index 00000000000..cef4ce579ae
--- /dev/null
+++ b/rules/CodingStyle/Rector/If_/AlternativeIfToBracketRector.php
@@ -0,0 +1,102 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\CodingStyle\Rector\If_;
+
+use PhpParser\Node;
+use PhpParser\Node\Stmt\If_;
+use PhpParser\Token;
+use Rector\Contract\Rector\HTMLAverseRectorInterface;
+use Rector\NodeTypeResolver\Node\AttributeKey;
+use Rector\Rector\AbstractRector;
+use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
+use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
+
+/**
+ * @see \Rector\Tests\CodingStyle\Rector\If_\AlternativeIfToBracketRector\AlternativeIfToBracketRectorTest
+ */
+final class AlternativeIfToBracketRector extends AbstractRector implements HTMLAverseRectorInterface
+{
+    public function getRuleDefinition(): RuleDefinition
+    {
+        return new RuleDefinition('Change alternative if/elseif/else/endif syntax to bracket syntax', [
+            new CodeSample(
+                <<<'CODE_SAMPLE'
+if ($value) :
+    $result = 1;
+else :
+    $result = 2;
+endif;
+CODE_SAMPLE
+                ,
+                <<<'CODE_SAMPLE'
+if ($value) {
+    $result = 1;
+} else {
+    $result = 2;
+}
+CODE_SAMPLE
+            ),
+        ]);
+    }
+
+    /**
+     * @return array<class-string<Node>>
+     */
+    public function getNodeTypes(): array
+    {
+        return [If_::class];
+    }
+
+    /**
+     * @param If_ $node
+     */
+    public function refactor(Node $node): ?Node
+    {
+        if (! $this->isAlternativeSyntax($node)) {
+            return null;
+        }
+
+        // force reprint of the whole if/elseif/else chain with bracket syntax
+        $node->setAttribute(AttributeKey::ORIGINAL_NODE, null);
+
+        foreach ($node->elseifs as $elseif) {
+            $elseif->setAttribute(AttributeKey::ORIGINAL_NODE, null);
+        }
+
+        if ($node->else instanceof Node) {
+            $node->else->setAttribute(AttributeKey::ORIGINAL_NODE, null);
+        }
+
+        return $node;
+    }
+
+    private function isAlternativeSyntax(If_ $if): bool
+    {
+        $startTokenPos = $if->cond->getEndTokenPos();
+        if ($startTokenPos < 0) {
+            return false;
+        }
+
+        $oldTokens = $this->getFile()
+            ->getOldTokens();
+
+        for ($i = $startTokenPos + 1; isset($oldTokens[$i]); ++$i) {
+            $token = $oldTokens[$i];
+            if (! $token instanceof Token) {
+                continue;
+            }
+
+            if ($token->text === ':') {
+                return true;
+            }
+
+            if ($token->text === '{') {
+                return false;
+            }
+        }
+
+        return false;
+    }
+}

From a8e182cd347200606a9017bef85df465228cc7da Mon Sep 17 00:00:00 2001
From: Tomas Votruba <tomas.vot@gmail.com>
Date: Wed, 8 Jul 2026 18:19:32 +0200
Subject: [PATCH 2/2] Register AlternativeIfToBracketRector in code-quality set
 before bracket rules

---
 src/Config/Level/CodeQualityLevel.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Config/Level/CodeQualityLevel.php b/src/Config/Level/CodeQualityLevel.php
index ddeb933c002..dc6c447f637 100644
--- a/src/Config/Level/CodeQualityLevel.php
+++ b/src/Config/Level/CodeQualityLevel.php
@@ -83,6 +83,7 @@
 use Rector\CodeQuality\Rector\Ternary\TernaryEmptyArrayArrayDimFetchToCoalesceRector;
 use Rector\CodeQuality\Rector\Ternary\TernaryImplodeToImplodeRector;
 use Rector\CodeQuality\Rector\Ternary\UnnecessaryTernaryExpressionRector;
+use Rector\CodingStyle\Rector\If_\AlternativeIfToBracketRector;
 use Rector\Contract\Rector\RectorInterface;
 use Rector\Php52\Rector\Property\VarToPublicPropertyRector;
 use Rector\Php71\Rector\FuncCall\RemoveExtraParametersRector;
@@ -186,6 +187,7 @@ final class CodeQualityLevel
         DisallowedEmptyRuleFixerRector::class,
         LocallyCalledStaticMethodToNonStaticRector::class,
         NumberCompareToMaxFuncCallRector::class,
+        AlternativeIfToBracketRector::class,
         CompleteMissingIfElseBracketRector::class,
         RemoveUselessIsObjectCheckRector::class,
         ConvertStaticToSelfRector::class,