Fixed bug #2943 : Redundant semicolon added to a file when fixing PSR…

…2.Files.ClosingTag.NotAllowed
squizlabs · May 1, 2020 · e6f5158 · e6f5158
1 parent 4215a31
commit e6f5158
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 1 deletion.
diff --git a/src/Standards/PSR2/Sniffs/Files/ClosingTagSniff.php b/src/Standards/PSR2/Sniffs/Files/ClosingTagSniff.php
@@ -67,6 +67,7 @@ public function process(File $phpcsFile, $stackPtr)
                 $prev = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($last - 1), null, true);
                 if ($tokens[$prev]['code'] !== T_SEMICOLON
                     && $tokens[$prev]['code'] !== T_CLOSE_CURLY_BRACKET
+                    && $tokens[$prev]['code'] !== T_OPEN_TAG
                 ) {
                     $phpcsFile->fixer->addContent($prev, ';');
                 }
@@ -77,7 +78,7 @@ public function process(File $phpcsFile, $stackPtr)
             $phpcsFile->recordMetric($stackPtr, 'PHP closing tag at end of PHP-only file', 'yes');
         } else {
             $phpcsFile->recordMetric($stackPtr, 'PHP closing tag at end of PHP-only file', 'no');
-        }
+        }//end if
 
         // Ignore the rest of the file.
         return $phpcsFile->numTokens;

diff --git a/src/Standards/PSR2/Tests/Files/ClosingTagUnitTest.7.inc b/src/Standards/PSR2/Tests/Files/ClosingTagUnitTest.7.inc
@@ -0,0 +1,5 @@
+<?php
+/*
+ * Some comment goes here
+ */
+?>
diff --git a/src/Standards/PSR2/Tests/Files/ClosingTagUnitTest.7.inc.fixed b/src/Standards/PSR2/Tests/Files/ClosingTagUnitTest.7.inc.fixed
@@ -0,0 +1,5 @@
+<?php
+/*
+ * Some comment goes here
+ */
+
diff --git a/src/Standards/PSR2/Tests/Files/ClosingTagUnitTest.php b/src/Standards/PSR2/Tests/Files/ClosingTagUnitTest.php
@@ -36,6 +36,7 @@ public function getErrorList($testFile='')
             return [1 => 1];
 
         case 'ClosingTagUnitTest.6.inc':
+        case 'ClosingTagUnitTest.7.inc':
             return [5 => 1];
 
         default: