Generic.Files.LineLength ignoreComments property now only ignores com…

…ments that are on a line by themselves (ref squizlabs#2533, squizlabs#1510)

package.xml

@@ -53,6 +53,8 @@ http://pear.php.net/dtd/package-2.0.xsd">
     -- Enforce the use of a strict types declaration in PHP files
   - Added PSR12.Files.DeclareStatement sniff
     -- Enforce the formatting of declare statements within a file
+  - Generic.Files.LineLength ignoreComments property now only ignores comments that are on a line by themselves
+      -- Previously, this property was incorrectly causing the sniff to ignore any line that ended with a comment
   - Generic.Functions.FunctionCallArgumentSpacing no longer checks spacing around assignment operators inside function calls
     -- Use the Squiz.WhiteSpace.OperatorSpacing sniff to enforce spacing around assignment operators
        --- Note that this sniff checks spacing around all assignment operators, not just inside function calls

src/Standards/Generic/Sniffs/Files/LineLengthSniff.php

@@ -115,8 +115,6 @@ protected function checkLineLength($phpcsFile, $tokens, $stackPtr)
                 // Ignore PHPCS annotation comments if they are on a line by themselves.
                 return;
             }
-
-            unset($prevNonWhiteSpace);
         }
 
         $lineLength = ($tokens[$stackPtr]['column'] + $tokens[$stackPtr]['length'] - 1);
@@ -135,8 +133,14 @@ protected function checkLineLength($phpcsFile, $tokens, $stackPtr)
         if ($tokens[$stackPtr]['code'] === T_COMMENT
             || $tokens[$stackPtr]['code'] === T_DOC_COMMENT_STRING
         ) {
+            // The current line ends with a comment.
+            // If the comment is the only thing on the line and we are ignoring comments,
+            // we can stop processing the line here.
             if ($this->ignoreComments === true) {
-                return;
+                $prevNonWhiteSpace = $phpcsFile->findPrevious(T_WHITESPACE, ($stackPtr - 1), null, true);
+                if ($tokens[$stackPtr]['line'] !== $tokens[$prevNonWhiteSpace]['line']) {
+                    return;
+                }
             }
 
             // If this is a long comment, check if it can be broken up onto multiple lines.

src/Standards/Generic/Tests/Files/LineLengthUnitTest.4.inc

@@ -8,3 +8,5 @@ if($thisIsOk === true) {}
 
 /* This line is too long but will be ignored. This line is too long but will be ignored. */
 if (($anotherReallyLongVarName === true) || (is_array($anotherReallyLongVarName) === false)) {}
+
+if (($anotherReallyLongVarName === true) {} // This comment makes the line too long.

src/Standards/Generic/Tests/Files/LineLengthUnitTest.php

@@ -94,7 +94,10 @@ public function getWarningList($testFile='')
             return [6 => 1];
             break;
         case 'LineLengthUnitTest.4.inc':
-            return [10 => 1];
+            return [
+                10 => 1,
+                12 => 1,
+            ];
             break;
         default:
             return [];