Merge pull request #169 from PHPCSStandards/universal/disallowlonelyi…

…f-bow-out-early-for-close-tag Universal/DisallowLonelyIf: bow out early for a specific situation (PHP close tag)
PHPCSStandards · Dec 1, 2022 · 3d4bb19 · 3d4bb19
2 parents e5fa39e + 09df531
commit 3d4bb19
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 5 deletions.
diff --git a/Universal/Sniffs/ControlStructures/DisallowLonelyIfSniff.php b/Universal/Sniffs/ControlStructures/DisallowLonelyIfSniff.php
@@ -89,16 +89,15 @@ public function process(File $phpcsFile, $stackPtr)
         /*
          * Find the end of an if - else chain.
          */
+
         $innerIfPtr       = $nextNonEmpty;
         $innerIfToken     = $tokens[$innerIfPtr];
         $autoFixable      = true;
         $innerScopeCloser = $innerIfToken['scope_closer'];
 
-        /*
-         * For alternative syntax fixer only.
-         * Remember the individual inner scope opener and closers so the fixer doesn't need
-         * to do the same walking over the if/else chain again.
-         */
+        // For alternative syntax fixer only.
+        // Remember the individual inner scope opener and closers so the fixer doesn't need
+        // to do the same walking over the if/else chain again.
         $innerScopes = [
             $innerIfToken['scope_opener'] => $innerScopeCloser,
         ];
@@ -116,6 +115,11 @@ public function process(File $phpcsFile, $stackPtr)
                         true
                     );
 
+                    if ($tokens[$nextAfter]['code'] === \T_CLOSE_TAG) {
+                        // Not "lonely" as at the very least there must be a PHP open tag before the outer closer.
+                        return;
+                    }
+
                     if ($tokens[$nextAfter]['code'] === \T_SEMICOLON) {
                         $innerScopeCloser = $nextAfter;
                     } else {

diff --git a/Universal/Tests/ControlStructures/DisallowLonelyIfUnitTest.inc b/Universal/Tests/ControlStructures/DisallowLonelyIfUnitTest.inc
@@ -278,6 +278,21 @@ if ($condition) {
         doSomething();
 }
 
+/*
+ * Tests involving PHP close tags to close the inner control structure.
+ * Ignore as these will always need an open tag to reach the outer control structure again,
+ * so are never the "only" thing within the `else` (so not a lonely if).
+ */
+if ($condition):
+    doSomething();
+else:
+    if ($anotherCondition):
+        doSomething();
+    endif ?>
+    Inline HTML
+    <?php
+endif;
+
 // Live coding.
 // Intentional parse error. This test has to be the last in the file.
 if ($a) {

diff --git a/Universal/Tests/ControlStructures/DisallowLonelyIfUnitTest.inc.fixed b/Universal/Tests/ControlStructures/DisallowLonelyIfUnitTest.inc.fixed
@@ -253,6 +253,21 @@ if ($condition) {
         doSomething();
 }
 
+/*
+ * Tests involving PHP close tags to close the inner control structure.
+ * Ignore as these will always need an open tag to reach the outer control structure again,
+ * so are never the "only" thing within the `else` (so not a lonely if).
+ */
+if ($condition):
+    doSomething();
+else:
+    if ($anotherCondition):
+        doSomething();
+    endif ?>
+    Inline HTML
+    <?php
+endif;
+
 // Live coding.
 // Intentional parse error. This test has to be the last in the file.
 if ($a) {