From 184648d236062acd664e61e02d15a9f9599e15a5 Mon Sep 17 00:00:00 2001
From: Caleb White <cdwhite3@pm.me>
Date: Sun, 20 Sep 2026 23:07:31 -0500
Subject: [PATCH] fix(CodingStyle) keep trait use adaptations in
 SeparateMultiUseImportsRector

Splitting a grouped trait use only carried Alias adaptations across, so an
insteadof was dropped along with the statement it sat on:

    use A, B {
        A::collide insteadof B;
    }

became two plain uses with nothing left to resolve the conflict, and the
class could no longer be loaded at all. An alias naming no trait was
dropped just as silently, taking the aliased method with it.

Precedence adaptations now follow the trait they name, the same way an
alias already did. The two that cannot follow a single trait leave the
statement alone instead: one that names no trait applies to all of them,
and one that names a trait used in another statement belongs to none of
the ones being split.
---
 ..._use_adaptation_of_other_statement.php.inc | 15 +++++++++
 ...p_unqualified_trait_use_adaptation.php.inc | 13 ++++++++
 .../Fixture/with_trait_use_precedence.php.inc | 32 +++++++++++++++++++
 .../Source/ThirdTrait.php                     | 13 ++++++++
 .../Use_/SeparateMultiUseImportsRector.php    | 22 +++++++++++--
 5 files changed, 92 insertions(+), 3 deletions(-)
 create mode 100644 rules-tests/CodingStyle/Rector/Use_/SeparateMultiUseImportsRector/Fixture/skip_trait_use_adaptation_of_other_statement.php.inc
 create mode 100644 rules-tests/CodingStyle/Rector/Use_/SeparateMultiUseImportsRector/Fixture/skip_unqualified_trait_use_adaptation.php.inc
 create mode 100644 rules-tests/CodingStyle/Rector/Use_/SeparateMultiUseImportsRector/Fixture/with_trait_use_precedence.php.inc
 create mode 100644 rules-tests/CodingStyle/Rector/Use_/SeparateMultiUseImportsRector/Source/ThirdTrait.php

diff --git a/rules-tests/CodingStyle/Rector/Use_/SeparateMultiUseImportsRector/Fixture/skip_trait_use_adaptation_of_other_statement.php.inc b/rules-tests/CodingStyle/Rector/Use_/SeparateMultiUseImportsRector/Fixture/skip_trait_use_adaptation_of_other_statement.php.inc
new file mode 100644
index 00000000000..81ea1368205
--- /dev/null
+++ b/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;
+    }
+}
diff --git a/rules-tests/CodingStyle/Rector/Use_/SeparateMultiUseImportsRector/Fixture/skip_unqualified_trait_use_adaptation.php.inc b/rules-tests/CodingStyle/Rector/Use_/SeparateMultiUseImportsRector/Fixture/skip_unqualified_trait_use_adaptation.php.inc
new file mode 100644
index 00000000000..72f7a39f706
--- /dev/null
+++ b/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;
+    }
+}
diff --git a/rules-tests/CodingStyle/Rector/Use_/SeparateMultiUseImportsRector/Fixture/with_trait_use_precedence.php.inc b/rules-tests/CodingStyle/Rector/Use_/SeparateMultiUseImportsRector/Fixture/with_trait_use_precedence.php.inc
new file mode 100644
index 00000000000..76b6c67c6b7
--- /dev/null
+++ b/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;
+}
+
+?>
diff --git a/rules-tests/CodingStyle/Rector/Use_/SeparateMultiUseImportsRector/Source/ThirdTrait.php b/rules-tests/CodingStyle/Rector/Use_/SeparateMultiUseImportsRector/Source/ThirdTrait.php
new file mode 100644
index 00000000000..663f08840e4
--- /dev/null
+++ b/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';
+    }
+}
diff --git a/rules/CodingStyle/Rector/Use_/SeparateMultiUseImportsRector.php b/rules/CodingStyle/Rector/Use_/SeparateMultiUseImportsRector.php
index 06b5d7d3cac..ad3946c6f4e 100644
--- a/rules/CodingStyle/Rector/Use_/SeparateMultiUseImportsRector.php
+++ b/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;
                 }