Fix AlphabeticalUseStatements sorting trait use statements

MO4/Sniffs/Formatting/AlphabeticalUseStatementsSniff.php

@@ -106,6 +106,10 @@ public function process(File $phpcsFile, $stackPtr): void
 
         parent::process($phpcsFile, $stackPtr);
 
+        if (true === $this->checkIsNonImportUse($phpcsFile, $stackPtr)) {
+            return;
+        }
+
         if ($this->currentFile !== $phpcsFile->getFilename()) {
             $this->lastLine    = -1;
             $this->lastImport  = '';
@@ -115,13 +119,6 @@ public function process(File $phpcsFile, $stackPtr): void
         $tokens = $phpcsFile->getTokens();
         $line   = $tokens[$stackPtr]['line'];
 
-        // Ignore function () use () {...}.
-        $isNonImportUse = $this->checkIsNonImportUse($phpcsFile, $stackPtr);
-
-        if (true === $isNonImportUse) {
-            return;
-        }
-
         $currentImportArr = $this->getUseImport($phpcsFile, $stackPtr);
 
         if (false === $currentImportArr) {
@@ -235,21 +232,14 @@ private function checkIsNonImportUse(File $phpcsFile, int $stackPtr): bool
     {
         $tokens = $phpcsFile->getTokens();
 
-        $prev = $phpcsFile->findPrevious(
-            PHP_CodeSniffer_Tokens::EMPTY_TOKENS,
-            ($stackPtr - 1),
-            0,
-            true,
-            null,
-            true
-        );
-
-        if (false !== $prev) {
-            $prevToken = $tokens[$prev];
+        // Ignore USE keywords for closures.
+        if (true === isset($tokens[$stackPtr]['parenthesis_owner'])) {
+            return true;
+        }
 
-            if (T_CLOSE_PARENTHESIS === $prevToken['code']) {
-                return true;
-            }
+        // Ignore USE keywords for traits (inside class/trait/enum bodies).
+        if (true === $phpcsFile->hasCondition($stackPtr, [T_CLASS, T_TRAIT, T_ENUM])) {
+            return true;
         }
 
         return false;

MO4/Tests/Formatting/AlphabeticalUseStatementsUnitTest.pass.2.inc

@@ -0,0 +1,19 @@
+<?php
+
+use A;
+use B;
+
+class Foo
+{
+    use ZebraTrait;
+    use AlphaTrait;
+}
+
+class Bar
+{
+    /** @use GenericTrait<string> */
+    use GenericTrait;
+    /** @use AnotherTrait<int> */
+    use AnotherTrait;
+}
+

MO4/Tests/Formatting/AlphabeticalUseStatementsUnitTest.pass.3.inc

@@ -0,0 +1,8 @@
+<?php
+
+use A;
+use B;
+
+$closure = function () use ($b, $a) {
+    return $a + $b;
+};

MO4/Tests/Formatting/AlphabeticalUseStatementsUnitTest.php

@@ -35,6 +35,8 @@ final class AlphabeticalUseStatementsUnitTest extends AbstractMo4SniffUnitTest
     protected $expectedErrorList = [
         'AlphabeticalUseStatementsUnitTest.pass.inc'   => [],
         'AlphabeticalUseStatementsUnitTest.pass.1.inc' => [],
+        'AlphabeticalUseStatementsUnitTest.pass.2.inc' => [],
+        'AlphabeticalUseStatementsUnitTest.pass.3.inc' => [],
         'AlphabeticalUseStatementsUnitTest.fail.1.inc' => [
             4  => 1,
             5  => 1,