Universal/NoUselessAliases: update for PHPCS 4.0

The tokenization of (namespaced) "names" has changed in PHP 8.0 and this new tokenization will come into effect for PHP_CodeSniffer as of version 4.0.0.

This commit adds handling for this new tokenization to this sniff.

Includes some additional tests.

Author: jrfnl

Universal/Sniffs/UseStatements/NoUselessAliasesSniff.php

@@ -13,6 +13,7 @@
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;
 use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\Tokens\Collections;
 use PHPCSUtils\Utils\NamingConventions;
 use PHPCSUtils\Utils\UseStatements;
 
@@ -117,8 +118,21 @@ public function process(File $phpcsFile, $stackPtr)
 
                     // Make sure this is really the right one.
                     $prev = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($asPtr - 1), null, true);
-                    if ($tokens[$prev]['code'] !== \T_STRING
-                        || $tokens[$prev]['content'] !== $unqualifiedName
+                    if (isset(Collections::nameTokens()[$tokens[$prev]['code']]) === false) {
+                        // Shouldn't be possible.
+                        continue; // @codeCoverageIgnore
+                    } elseif ($tokens[$prev]['code'] === \T_STRING
+                        && $tokens[$prev]['content'] !== $unqualifiedName
+                    ) {
+                        continue;
+                    } elseif ($tokens[$prev]['code'] === \T_NAME_QUALIFIED
+                        && $tokens[$prev]['content'] !== $qualifiedName
+                        && \substr($qualifiedName, -(\strlen($tokens[$prev]['content']))) !== $tokens[$prev]['content']
+                    ) {
+                        continue;
+                    } elseif ($tokens[$prev]['code'] === \T_NAME_FULLY_QUALIFIED
+                        && $tokens[$prev]['content'] !== '\\' . $qualifiedName
+                        && \substr($qualifiedName, -(\strlen($tokens[$prev]['content']))) !== $tokens[$prev]['content']
                     ) {
                         continue;
                     }

Universal/Tests/UseStatements/NoUselessAliasesUnitTest.inc

@@ -64,7 +64,7 @@ use Some\NS\ {
 
 // Verify handling of non-ascii names.
 use Vendor\Package\Déjàvü as Dejavu; // OK.
-use Vendor\Package\Déjàvü as DÉJÀVÜ; // Ok.
+use Vendor\Package\Déjàvü as DÉJÀVÜ; // OK.
 use Vendor\Package\Déjàvü as Déjàvü; // Error.
 use Vendor\Package\Déjàvü as déJàVü; // Error.
 
@@ -75,6 +75,23 @@ use function 💩💩 as 💩💩; // Error.
 use function foo\math\sin as Cos, // OK.
     foo\math\cos as Cos; // Error.
 
+// Duplicate aliases, but that's not our concern - this test is about flagging the correct alias pointer.
+use function foo,
+    bar as baz,
+    baz as baz; // Error.
+
+use function partial\foo,
+    partial\bar as baz,
+    partial\baz as baz; // Error.
+
+use function \foo,
+    \bar as baz,
+    \baz as baz; // Error.
+
+use function \full\foo,
+    \full\bar as baz,
+    \full\baz as baz; // Error.
+
 // Intentional parse error.
 use function as ;
 

Universal/Tests/UseStatements/NoUselessAliasesUnitTest.inc.fixed

@@ -62,7 +62,7 @@ use Some\NS\ {
 
 // Verify handling of non-ascii names.
 use Vendor\Package\Déjàvü as Dejavu; // OK.
-use Vendor\Package\Déjàvü as DÉJÀVÜ; // Ok.
+use Vendor\Package\Déjàvü as DÉJÀVÜ; // OK.
 use Vendor\Package\Déjàvü; // Error.
 use Vendor\Package\Déjàvü; // Error.
 
@@ -73,6 +73,23 @@ use function 💩💩; // Error.
 use function foo\math\sin as Cos, // OK.
     foo\math\cos; // Error.
 
+// Duplicate aliases, but that's not our concern - this test is about flagging the correct alias pointer.
+use function foo,
+    bar as baz,
+    baz; // Error.
+
+use function partial\foo,
+    partial\bar as baz,
+    partial\baz; // Error.
+
+use function \foo,
+    \bar as baz,
+    \baz; // Error.
+
+use function \full\foo,
+    \full\bar as baz,
+    \full\baz; // Error.
+
 // Intentional parse error.
 use function as ;
 

Universal/Tests/UseStatements/NoUselessAliasesUnitTest.php

@@ -48,6 +48,10 @@ public function getErrorList()
             69 => 1,
             72 => 1,
             76 => 1,
+            81 => 1,
+            85 => 1,
+            89 => 1,
+            93 => 1,
         ];
     }