[CodingStyle] Keep trait use adaptations in SeparateMultiUseImportsRector

rules-tests/CodingStyle/Rector/Use_/SeparateMultiUseImportsRector/Fixture/skip_trait_use_adaptation_of_other_statement.php.inc

@@ -0,0 +1,15 @@
+<?php
+
+namespace Rector\Tests\CodingStyle\Rector\Use_\SeparateMultiUseImportsRector\Fixture;
+
+use Rector\Tests\CodingStyle\Rector\Use_\SeparateMultiUseImportsRector\Source\FirstTrait;
+use Rector\Tests\CodingStyle\Rector\Use_\SeparateMultiUseImportsRector\Source\SecondTrait;
+use Rector\Tests\CodingStyle\Rector\Use_\SeparateMultiUseImportsRector\Source\ThirdTrait;
+
+class SkipTraitUseAdaptationOfOtherStatement
+{
+    use FirstTrait;
+    use SecondTrait, ThirdTrait {
+        FirstTrait::exec insteadof SecondTrait;
+    }
+}

rules-tests/CodingStyle/Rector/Use_/SeparateMultiUseImportsRector/Fixture/skip_unqualified_trait_use_adaptation.php.inc

@@ -0,0 +1,13 @@
+<?php
+
+namespace Rector\Tests\CodingStyle\Rector\Use_\SeparateMultiUseImportsRector\Fixture;
+
+use Rector\Tests\CodingStyle\Rector\Use_\SeparateMultiUseImportsRector\Source\FirstTrait;
+use Rector\Tests\CodingStyle\Rector\Use_\SeparateMultiUseImportsRector\Source\ThirdTrait;
+
+class SkipUnqualifiedTraitUseAdaptation
+{
+    use FirstTrait, ThirdTrait {
+        other as renamedOther;
+    }
+}

rules-tests/CodingStyle/Rector/Use_/SeparateMultiUseImportsRector/Fixture/with_trait_use_precedence.php.inc

@@ -0,0 +1,32 @@
+<?php
+
+namespace Rector\Tests\CodingStyle\Rector\Use_\SeparateMultiUseImportsRector\Fixture;
+
+use Rector\Tests\CodingStyle\Rector\Use_\SeparateMultiUseImportsRector\Source\FirstTrait;
+use Rector\Tests\CodingStyle\Rector\Use_\SeparateMultiUseImportsRector\Source\SecondTrait;
+
+class WithTraitUsePrecedence
+{
+    use FirstTrait, SecondTrait {
+        FirstTrait::exec insteadof SecondTrait;
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\CodingStyle\Rector\Use_\SeparateMultiUseImportsRector\Fixture;
+
+use Rector\Tests\CodingStyle\Rector\Use_\SeparateMultiUseImportsRector\Source\FirstTrait;
+use Rector\Tests\CodingStyle\Rector\Use_\SeparateMultiUseImportsRector\Source\SecondTrait;
+
+class WithTraitUsePrecedence
+{
+    use FirstTrait {
+        FirstTrait::exec insteadof SecondTrait;
+    }
+    use SecondTrait;
+}
+
+?>

rules-tests/CodingStyle/Rector/Use_/SeparateMultiUseImportsRector/Source/ThirdTrait.php

@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Tests\CodingStyle\Rector\Use_\SeparateMultiUseImportsRector\Source;
+
+trait ThirdTrait
+{
+    public function other(): string
+    {
+        return 'baz';
+    }
+}

rules/CodingStyle/Rector/Use_/SeparateMultiUseImportsRector.php

@@ -9,7 +9,6 @@
 use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\Namespace_;
 use PhpParser\Node\Stmt\TraitUse;
-use PhpParser\Node\Stmt\TraitUseAdaptation\Alias;
 use PhpParser\Node\Stmt\Use_;
 use Rector\PhpParser\Node\FileNode;
 use Rector\Rector\AbstractRector;
@@ -127,13 +126,30 @@ private function refactorTraitUse(TraitUse $traitUse): ?array
             return null;
         }
 
+        $traitNames = array_map(
+            static fn (Name $trait): string => $trait->toString(),
+            $traitUse->traits
+        );
+
+        foreach ($traitUse->adaptations as $traitAdaptation) {
+            // an adaptation that names no trait applies to all of them, and one that
+            // names a trait used elsewhere belongs to no statement here; either way it
+            // cannot follow a single trait, so the statement is left alone
+            if (! $traitAdaptation->trait instanceof Name) {
+                return null;
+            }
+
+            if (! in_array($traitAdaptation->trait->toString(), $traitNames, true)) {
+                return null;
+            }
+        }
+
         $traitUses = [];
         foreach ($traitUse->traits as $singleTraitUse) {
             $adaptation = [];
 
             foreach ($traitUse->adaptations as $traitAdaptation) {
-                if ($traitAdaptation instanceof Alias
-                    && $traitAdaptation->trait instanceof Name
+                if ($traitAdaptation->trait instanceof Name
                     && $traitAdaptation->trait->toString() === $singleTraitUse->toString()) {
                     $adaptation[] = $traitAdaptation;
                 }