Only throw namespace error and warning if line cannot be shortened

Author: rjd22

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

@@ -178,7 +178,7 @@ protected function checkLineLength(File $phpcsFile, array $tokens, int $stackPtr
             && $lineLength > $this->absoluteLineLimit
         ) {
             $code = 'MaxExceeded';
-            if ($this->isLineNamespacedName($tokens, $tokens[$stackPtr]['line']) === true) {
+            if ($this->isNamespacedNameExceedingLength($tokens, $stackPtr, $this->absoluteLineLimit) === true) {
                 $code = 'NamespacedNameMaxExceeded';
             }
 
@@ -191,7 +191,7 @@ protected function checkLineLength(File $phpcsFile, array $tokens, int $stackPtr
             $phpcsFile->addError($error, $stackPtr, $code, $data);
         } elseif ($lineLength > $this->lineLimit) {
             $code = 'TooLong';
-            if ($this->isLineNamespacedName($tokens, $tokens[$stackPtr]['line']) === true) {
+            if ($this->isNamespacedNameExceedingLength($tokens, $stackPtr, $this->lineLimit) === true) {
                 $code = 'NamespacedNameTooLong';
             }
 
@@ -209,21 +209,30 @@ protected function checkLineLength(File $phpcsFile, array $tokens, int $stackPtr
     /**
      * Checks if a line is a namespaced name
      *
-     * @param array $tokens The token stack.
-     * @param int   $line   The line to check validate
+     * @param array $tokens    The token stack.
+     * @param int   $stackPtr  The last token on the line.
+     * @param int   $lineLimit The line limit.
      *
      * @return bool
      */
-    private function isLineNamespacedName(array $tokens, int $line): bool
+    private function isNamespacedNameExceedingLength(array $tokens, int $stackPtr, int $lineLimit): bool
     {
-        $filteredTokens = array_filter(
-            $tokens,
-            function ($token) use ($line) {
-                return $token['line'] === $line
-                    && in_array($token['code'], [T_NAME_QUALIFIED, T_NAME_FULLY_QUALIFIED, T_NAME_RELATIVE], true);
+        $line = $tokens[$stackPtr]['line'];
+
+        for ($i = $stackPtr; $tokens[$i]['line'] === $line; $i--) {
+            $length = ($tokens[$i]['column'] + $tokens[$i]['length'] - 1);
+
+            // Check the line limit of the namespaced name is equal or over the line length. This check accounts for the
+            // fact that namespaced names are or closed by ; or opened by ( or {.
+            if ($length >= $lineLimit
+                && ($tokens[$i]['code'] === T_NAME_QUALIFIED
+                || $tokens[$i]['code'] === T_NAME_FULLY_QUALIFIED
+                || $tokens[$i]['code'] === T_NAME_RELATIVE)
+            ) {
+                return true;
             }
-        );
+        }
 
-        return $filteredTokens !== [];
+        return false;
     }
 }

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

@@ -33,5 +33,13 @@ echo \ThisReallyLong\Long\Looooong\Loooooooong\UseStatement\ThatShouldThrowAWarn
 new \ThisReallyLong\Long\Looooong\Loooooooooooong\UseStatement\ThatShouldThrowAWarning\BecauseItsNotTooLong\ClassName();
 
 // These are just a bit too long and should throw a NamespacedNameMaxExceeded error
-echo \ThisReallyLong\Long\Long\Looong\UseStatement\ThatShouldNotBeAllowed\AndThrowErrorsBecauseItsTooLong\functionCall();
-new \ThisReallyLong\Long\Long\Looooooong\UseStatement\ThatShouldNotBeAllowed\AndThrowErrorsBecauseItsTooLong\ClassName();
+echo \ThisReallyLong\Long\Long\Looooong\UseStatement\ThatShouldNotBeAllowed\AndThrowErrorsBecauseItsTooLong\functionCall();
+new \ThisReallyLong\Long\Long\Looooooooong\UseStatement\ThatShouldNotBeAllowed\AndThrowErrorsBecauseItsTooLong\ClassName();
+
+// These are a bit too long but can be shortened and should throw a TooLong warning
+echo \This\Name\Space\IsGoingToBeJustWithinLimits\LongLongLooong\functionCall('foo', 'bar', 'baz');
+new \This\Name\Space\IsGoingToBeJustWithinLimits\LongLongLongLooong\ClassName('foo', 'bar', 'baz');
+
+// These are just a bit too long but can be shortened and should throw a MaxExceeded error
+echo \ThisReallyLong\Long\Long\Looong\UseStatement\ThatShouldNotBeAllowed\AndThrowErrorsBecauseItsTooLong\functionCall('foo', 'bar', 'baz');
+new \ThisReallyLong\Long\Long\Looooooong\UseStatement\ThatShouldNotBeAllowed\AndThrowErrorsBecauseItsTooLong\ClassName('foo', 'bar', 'baz');

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

@@ -68,6 +68,8 @@ public function getErrorList($testFile = '')
                     25 => 1,
                     36 => 1,
                     37 => 1,
+                    44 => 1,
+                    45 => 1,
                 ];
 
             default:
@@ -120,6 +122,8 @@ public function getWarningList($testFile = '')
                     20 => 1,
                     32 => 1,
                     33 => 1,
+                    40 => 1,
+                    41 => 1,
                 ];
 
             default: