From 2047101cf7ea3348122e7b9b7a5c6eeda22c8512 Mon Sep 17 00:00:00 2001
From: Kathryn Reeve <67553+BinaryKitten@users.noreply.github.com>
Date: Tue, 6 Jan 2026 11:49:37 +0000
Subject: [PATCH 1/4] Add test case for issue with Carbon import

---
 .../error_merged_import_carbon.php.inc        | 43 +++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 rules-tests/Renaming/Rector/Name/RenameClassRector/FixtureAutoImportNames/error_merged_import_carbon.php.inc

diff --git a/rules-tests/Renaming/Rector/Name/RenameClassRector/FixtureAutoImportNames/error_merged_import_carbon.php.inc b/rules-tests/Renaming/Rector/Name/RenameClassRector/FixtureAutoImportNames/error_merged_import_carbon.php.inc
new file mode 100644
index 00000000000..d78ed1c4383
--- /dev/null
+++ b/rules-tests/Renaming/Rector/Name/RenameClassRector/FixtureAutoImportNames/error_merged_import_carbon.php.inc
@@ -0,0 +1,43 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Tests\Renaming\Rector\Name\RenameClassRector\Source;
+
+use Carbon\Carbon;
+use Carbon\CarbonInterface;
+
+/**
+ * @property \Carbon\CarbonInterface|null $deleted_at
+ */
+class MergedImportError
+{
+    public function demoFunction(): array
+    {
+        return [Carbon::parse('2026-01-01 11:16:01')];
+    }
+}
+
+?>
+-----
+    <?php
+
+declare(strict_types=1);
+
+namespace Rector\Tests\Renaming\Rector\Name\RenameClassRector\Source;
+
+use Carbon\Carbon;
+use Carbon\CarbonInterface;
+
+/**
+ * @property CarbonInterface|null $deleted_at
+ */
+class MergedImportError
+{
+    public function demoFunction(): array
+    {
+        return [Carbon::parse('2026-01-01 11:16:01')];
+    }
+}
+
+?>

From 273dd595ff0480e520c2b0da62c612777cd621f5 Mon Sep 17 00:00:00 2001
From: Kathryn Reeve <67553+BinaryKitten@users.noreply.github.com>
Date: Tue, 6 Jan 2026 11:55:15 +0000
Subject: [PATCH 2/4] fix fixture php line to enable clearer error showing

---
 .../FixtureAutoImportNames/error_merged_import_carbon.php.inc   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules-tests/Renaming/Rector/Name/RenameClassRector/FixtureAutoImportNames/error_merged_import_carbon.php.inc b/rules-tests/Renaming/Rector/Name/RenameClassRector/FixtureAutoImportNames/error_merged_import_carbon.php.inc
index d78ed1c4383..f93ee89c693 100644
--- a/rules-tests/Renaming/Rector/Name/RenameClassRector/FixtureAutoImportNames/error_merged_import_carbon.php.inc
+++ b/rules-tests/Renaming/Rector/Name/RenameClassRector/FixtureAutoImportNames/error_merged_import_carbon.php.inc
@@ -20,7 +20,7 @@ class MergedImportError
 
 ?>
 -----
-    <?php
+<?php
 
 declare(strict_types=1);
 

From 69b8163a92214aa9ea7ff6842eab67d0f5de732a Mon Sep 17 00:00:00 2001
From: Kathryn Reeve <67553+BinaryKitten@users.noreply.github.com>
Date: Tue, 6 Jan 2026 12:31:29 +0000
Subject: [PATCH 3/4] Second example with Illuminate\Support\Carbon

---
 .../error_merged_import_carbon_2.php.inc      | 43 +++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 rules-tests/Renaming/Rector/Name/RenameClassRector/FixtureAutoImportNames/error_merged_import_carbon_2.php.inc

diff --git a/rules-tests/Renaming/Rector/Name/RenameClassRector/FixtureAutoImportNames/error_merged_import_carbon_2.php.inc b/rules-tests/Renaming/Rector/Name/RenameClassRector/FixtureAutoImportNames/error_merged_import_carbon_2.php.inc
new file mode 100644
index 00000000000..89063dbb117
--- /dev/null
+++ b/rules-tests/Renaming/Rector/Name/RenameClassRector/FixtureAutoImportNames/error_merged_import_carbon_2.php.inc
@@ -0,0 +1,43 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Tests\Renaming\Rector\Name\RenameClassRector\Source;
+
+use Illuminate\Support\Carbon;
+use Carbon\CarbonInterface;
+
+/**
+ * @property \Carbon\CarbonInterface|null $deleted_at
+ */
+class MergedImportErrorOtherVariety
+{
+    public function demoFunction(): array
+    {
+        return [Carbon::parse('2026-01-01 11:16:01')];
+    }
+}
+
+?>
+-----
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Tests\Renaming\Rector\Name\RenameClassRector\Source;
+
+use Illuminate\Support\Carbon;
+use Carbon\CarbonInterface;
+
+/**
+ * @property CarbonInterface|null $deleted_at
+ */
+class MergedImportErrorOtherVariety
+{
+    public function demoFunction(): array
+    {
+        return [Carbon::parse('2026-01-01 11:16:01')];
+    }
+}
+
+?>

From db15f5cf76b56d5b6fd95277ebce763cc43d0442 Mon Sep 17 00:00:00 2001
From: Kathryn Reeve <67553+BinaryKitten@users.noreply.github.com>
Date: Tue, 6 Jan 2026 12:42:05 +0000
Subject: [PATCH 4/4] rename test files after discussion

---
 ...on.php.inc => error_merged_import_property_annotation.php.inc} | 0
 ....php.inc => error_merged_import_property_annotation_2.php.inc} | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename rules-tests/Renaming/Rector/Name/RenameClassRector/FixtureAutoImportNames/{error_merged_import_carbon.php.inc => error_merged_import_property_annotation.php.inc} (100%)
 rename rules-tests/Renaming/Rector/Name/RenameClassRector/FixtureAutoImportNames/{error_merged_import_carbon_2.php.inc => error_merged_import_property_annotation_2.php.inc} (100%)

diff --git a/rules-tests/Renaming/Rector/Name/RenameClassRector/FixtureAutoImportNames/error_merged_import_carbon.php.inc b/rules-tests/Renaming/Rector/Name/RenameClassRector/FixtureAutoImportNames/error_merged_import_property_annotation.php.inc
similarity index 100%
rename from rules-tests/Renaming/Rector/Name/RenameClassRector/FixtureAutoImportNames/error_merged_import_carbon.php.inc
rename to rules-tests/Renaming/Rector/Name/RenameClassRector/FixtureAutoImportNames/error_merged_import_property_annotation.php.inc
diff --git a/rules-tests/Renaming/Rector/Name/RenameClassRector/FixtureAutoImportNames/error_merged_import_carbon_2.php.inc b/rules-tests/Renaming/Rector/Name/RenameClassRector/FixtureAutoImportNames/error_merged_import_property_annotation_2.php.inc
similarity index 100%
rename from rules-tests/Renaming/Rector/Name/RenameClassRector/FixtureAutoImportNames/error_merged_import_carbon_2.php.inc
rename to rules-tests/Renaming/Rector/Name/RenameClassRector/FixtureAutoImportNames/error_merged_import_property_annotation_2.php.inc