"squizlabs/php_codesniffer": "^4.0.0"

Author: dereuromark

PhpCollective/Sniffs/Commenting/DocBlockThrowsSniff.php

@@ -144,6 +144,12 @@ protected function extractExceptions(File $phpCsFile, int $stackPointer): array
                     continue;
                 }
 
+                // Handle the case where there's no namespace separator, string token, or fully qualified name token
+                // (e.g., for parenthesis after 'new')
+                if (!$this->isGivenKind([T_NS_SEPARATOR, T_STRING, T_NAME_FULLY_QUALIFIED], $tokens[$contentIndex])) {
+                    continue;
+                }
+
                 $exceptions[] = $this->extractException($phpCsFile, $contentIndex);
 
                 continue;
@@ -228,9 +234,17 @@ protected function extractException(File $phpCsFile, int $contentIndex): array
         $fullClass = '';
 
         $position = $contentIndex;
-        while ($this->isGivenKind([T_NS_SEPARATOR, T_STRING], $tokens[$position])) {
-            $fullClass .= $tokens[$position]['content'];
+
+        // Handle T_NAME_FULLY_QUALIFIED token (e.g., \BadMethodCallException)
+        // or separate tokens (T_NS_SEPARATOR and T_STRING)
+        if ($this->isGivenKind([T_NAME_FULLY_QUALIFIED], $tokens[$position])) {
+            $fullClass = $tokens[$position]['content'];
             ++$position;
+        } else {
+            while ($this->isGivenKind([T_NS_SEPARATOR, T_STRING], $tokens[$position])) {
+                $fullClass .= $tokens[$position]['content'];
+                ++$position;
+            }
         }
 
         $class = $fullClass = ltrim($fullClass, '\\');

PhpCollective/Sniffs/Namespaces/UseStatementSniff.php

@@ -639,32 +639,45 @@ protected function checkPropertyForInstanceOf(File $phpcsFile, int $stackPtr): v
             return;
         }
 
-        $lastIndex = null;
-        $j = $startIndex;
-        $extractedUseStatement = '';
-        $lastSeparatorIndex = null;
-        while (true) {
-            if (!$this->isGivenKind([T_NS_SEPARATOR, T_STRING], $tokens[$j])) {
-                break;
+        // Handle T_NAME_FULLY_QUALIFIED token (PHP CodeSniffer v4)
+        $className = '';
+        if ($tokens[$startIndex]['code'] === T_NAME_FULLY_QUALIFIED) {
+            $extractedUseStatement = ltrim($tokens[$startIndex]['content'], '\\');
+            if (strpos($extractedUseStatement, '\\') === false) {
+                return; // Not a namespaced class
             }
+            $lastSeparatorPos = strrpos($extractedUseStatement, '\\');
+            $className = substr($extractedUseStatement, $lastSeparatorPos + 1);
+            $lastIndex = $startIndex;
+            $lastSeparatorIndex = null; // No separate separator token in v4
+        } else {
+            // Handle separate tokens (T_NS_SEPARATOR and T_STRING)
+            $lastIndex = null;
+            $j = $startIndex;
+            $extractedUseStatement = '';
+            $lastSeparatorIndex = null;
+            while (true) {
+                if (!$this->isGivenKind([T_NS_SEPARATOR, T_STRING], $tokens[$j])) {
+                    break;
+                }
 
-            $lastIndex = $j;
-            $extractedUseStatement .= $tokens[$j]['content'];
-            if ($this->isGivenKind([T_NS_SEPARATOR], $tokens[$j])) {
-                $lastSeparatorIndex = $j;
+                $lastIndex = $j;
+                $extractedUseStatement .= $tokens[$j]['content'];
+                if ($this->isGivenKind([T_NS_SEPARATOR], $tokens[$j])) {
+                    $lastSeparatorIndex = $j;
+                }
+                ++$j;
             }
-            ++$j;
-        }
 
-        if ($lastIndex === null || $lastSeparatorIndex === null) {
-            return;
-        }
-
-        $extractedUseStatement = ltrim($extractedUseStatement, '\\');
+            if ($lastIndex === null || $lastSeparatorIndex === null) {
+                return;
+            }
 
-        $className = '';
-        for ($k = $lastSeparatorIndex + 1; $k <= $lastIndex; ++$k) {
-            $className .= $tokens[$k]['content'];
+            $extractedUseStatement = ltrim($extractedUseStatement, '\\');
+            $className = '';
+            for ($k = $lastSeparatorIndex + 1; $k <= $lastIndex; ++$k) {
+                $className .= $tokens[$k]['content'];
+            }
         }
 
         $error = 'Use statement ' . $extractedUseStatement . ' for class ' . $className . ' should be in use block.';
@@ -677,13 +690,23 @@ protected function checkPropertyForInstanceOf(File $phpcsFile, int $stackPtr): v
 
         $addedUseStatement = $this->addUseStatement($phpcsFile, $className, $extractedUseStatement);
 
-        for ($k = $lastSeparatorIndex; $k > $startIndex; --$k) {
-            $phpcsFile->fixer->replaceToken($k, '');
-        }
-        $phpcsFile->fixer->replaceToken($startIndex, '');
+        if ($lastSeparatorIndex !== null) {
+            // Legacy: remove individual tokens
+            for ($k = $lastSeparatorIndex; $k > $startIndex; --$k) {
+                $phpcsFile->fixer->replaceToken($k, '');
+            }
+            $phpcsFile->fixer->replaceToken($startIndex, '');
 
-        if ($addedUseStatement['alias'] !== null) {
-            $phpcsFile->fixer->replaceToken($lastIndex, $addedUseStatement['alias']);
+            if ($addedUseStatement['alias'] !== null) {
+                $phpcsFile->fixer->replaceToken($lastIndex, $addedUseStatement['alias']);
+            }
+        } else {
+            // PHP CodeSniffer v4: replace single T_NAME_FULLY_QUALIFIED token
+            if ($addedUseStatement['alias'] !== null) {
+                $phpcsFile->fixer->replaceToken($startIndex, $addedUseStatement['alias']);
+            } else {
+                $phpcsFile->fixer->replaceToken($startIndex, $className);
+            }
         }
 
         $phpcsFile->fixer->endChangeset();