Fixed bug #2619 : PSR12.Files.FileHeader locks up when inline comment…

… is the last content in a file
squizlabs · Oct 1, 2019 · 716b619 · 716b619
1 parent a81e341
commit 716b619
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/package.xml b/package.xml
@@ -27,6 +27,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
  <license uri="https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt">BSD 3-Clause License</license>
  <notes>
   - Fixed bug #2615 : Constant visibility false positive on non-class constants
+  - Fixed bug #2619 : PSR12.Files.FileHeader locks up when inline comment is the last content in a file
  </notes>
  <contents>
   <dir name="/">
@@ -1055,6 +1056,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
         <file baseinstalldir="PHP/CodeSniffer" name="FileHeaderUnitTest.4.inc.fixed" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="FileHeaderUnitTest.5.inc" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="FileHeaderUnitTest.6.inc" role="test" />
+        <file baseinstalldir="PHP/CodeSniffer" name="FileHeaderUnitTest.7.inc" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="FileHeaderUnitTest.php" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="ImportStatementUnitTest.inc" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="ImportStatementUnitTest.php" role="test" />

diff --git a/src/Standards/PSR12/Sniffs/Files/FileHeaderSniff.php b/src/Standards/PSR12/Sniffs/Files/FileHeaderSniff.php
@@ -130,7 +130,7 @@ public function process(File $phpcsFile, $stackPtr)
             }//end switch
 
             $next = $phpcsFile->findNext(T_WHITESPACE, ($next + 1), null, true);
-        } while ($next !== false);
+        } while ($next !== false && ($next !== $phpcsFile->numTokens - 1));
 
         if (count($headerLines) === 1) {
             // This is only an open tag and doesn't contain the file header.

diff --git a/src/Standards/PSR12/Tests/Files/FileHeaderUnitTest.7.inc b/src/Standards/PSR12/Tests/Files/FileHeaderUnitTest.7.inc
@@ -0,0 +1,2 @@
+<?php
+// Do nothing