Apply remove unused imports on the rest of RenameClassRector test fix…

…tures (#3364)
rectorphp · Feb 8, 2023 · d762bce · d762bce
1 parent b9fef0f
commit d762bce
Show file tree

Hide file tree

Showing 18 changed files with 17 additions and 90 deletions.
diff --git a/...ming/Rector/Name/RenameClassRector/FixtureAutoImportNames/class_imported_as_alias.php.inc b/...ming/Rector/Name/RenameClassRector/FixtureAutoImportNames/class_imported_as_alias.php.inc
@@ -16,7 +16,6 @@ namespace Rector\Tests\Renaming\Rector\Name\RenameClassRector\FixtureAutoImportN
 
 use Rector\Tests\Renaming\Rector\Name\RenameClassRector\Source\SecondNamespace\SecondOriginalClass;
 use Rector\Tests\Renaming\Rector\Name\RenameClassRector\Source\FirstNamespace\FirstOriginalClass as AliasedClass;
-use Rector\Tests\Renaming\Rector\Name\RenameClassRector\Source\SecondNamespace;
 
 $aliasedClass = new AliasedClass();
 $secondClass = new SecondOriginalClass();

diff --git a/...me/RenameClassRector/FixtureAutoImportNames/conflict_with_use_statement_last_name.php.inc b/...me/RenameClassRector/FixtureAutoImportNames/conflict_with_use_statement_last_name.php.inc
@@ -12,8 +12,8 @@ $queue = app(\Queue::class);
 
 namespace Rector\Tests\Renaming\Rector\Name\RenameClassRector\FixtureAutoImportNames;
 
-use CompanyB\Queue;
+use Illuminate\Support\Facades\Queue;
 
-$queue = app(\Illuminate\Support\Facades\Queue::class);
+$queue = app(Queue::class);
 
 ?>
diff --git a/...e/RenameClassRector/FixtureAutoImportNames/conflict_with_use_statement_last_name2.php.inc b/...e/RenameClassRector/FixtureAutoImportNames/conflict_with_use_statement_last_name2.php.inc
diff --git a/...e/RenameClassRector/FixtureAutoImportNames/conflict_with_use_statement_last_name3.php.inc b/...e/RenameClassRector/FixtureAutoImportNames/conflict_with_use_statement_last_name3.php.inc
diff --git a/...r/FixtureAutoImportNames/do_not_rename_docblock_not_found_in_use_inside_namespace.php.inc b/...r/FixtureAutoImportNames/do_not_rename_docblock_not_found_in_use_inside_namespace.php.inc
@@ -18,8 +18,6 @@ class Foo2 extends FooBar
 
 namespace Foo2;
 
-use Foo\Bar;
-
 class Foo2 extends FooBar
 {
     /**

diff --git a/...lassRector/FixtureAutoImportNames/in_const_fetch_conflict_use_statement_last_name.php.inc b/...lassRector/FixtureAutoImportNames/in_const_fetch_conflict_use_statement_last_name.php.inc
@@ -12,8 +12,8 @@ $queue = \Queue::FOO;
 
 namespace Company\Commands\Queue;
 
-use CompanyB\Queue;
+use Illuminate\Support\Facades\Queue;
 
-$queue = \Illuminate\Support\Facades\Queue::FOO;
+$queue = Queue::FOO;
 
 ?>
diff --git a/...Rector/FixtureAutoImportNames/in_method_call_arg_conflict_use_statement_last_name.php.inc b/...Rector/FixtureAutoImportNames/in_method_call_arg_conflict_use_statement_last_name.php.inc
diff --git a/...Rector/FixtureAutoImportNames/in_static_call_arg_conflict_use_statement_last_name.php.inc b/...Rector/FixtureAutoImportNames/in_static_call_arg_conflict_use_statement_last_name.php.inc
diff --git a/.../Renaming/Rector/Name/RenameClassRector/FixtureAutoImportNames/partial_expression.php.inc b/.../Renaming/Rector/Name/RenameClassRector/FixtureAutoImportNames/partial_expression.php.inc
@@ -19,7 +19,6 @@ class PartialExpression
 namespace Rector\Tests\Renaming\Rector\Name\RenameClassRector\FixtureAutoImportNames;
 
 use PhpParser\Node\Stmt\Expression;
-use PhpParser\Node;
 
 class PartialExpression
 {

diff --git a/...ctor/Name/RenameClassRector/FixtureRenameMissingParent/missing_parent_with_method.php.inc b/...ctor/Name/RenameClassRector/FixtureRenameMissingParent/missing_parent_with_method.php.inc
@@ -21,8 +21,6 @@ declare(strict_types=1);
 
 namespace Rector\Tests\Renaming\Rector\Name\RenameClassRector\FixtureRenameMissingParent;
 
-use Missing\ParentClass;
-
 class MissingParent extends \Renamed\Missing\ParentWithMethod
 {
     public function foo(): void

diff --git a/.../Rector/Name/RenameClassRector/FixtureRenameParent/longer_class_name_with_slashes.php.inc b/.../Rector/Name/RenameClassRector/FixtureRenameParent/longer_class_name_with_slashes.php.inc
@@ -18,8 +18,6 @@ declare(strict_types=1);
 
 namespace Rector\Tests\Renaming\Rector\Name\RenameClassRector\FixtureRenameParent;
 
-use App\NotHereClass\AndNamespace;
-
 final class LongerClassNameWithSlashes extends \NewClassThatDoesNotExistEither
 {
 }

diff --git a/rules-tests/Renaming/Rector/Name/RenameClassRector/config/auto_import_names.php b/rules-tests/Renaming/Rector/Name/RenameClassRector/config/auto_import_names.php
@@ -11,6 +11,7 @@
 
 return static function (RectorConfig $rectorConfig): void {
     $rectorConfig->importNames();
+    $rectorConfig->removeUnusedImports();
 
     $rectorConfig->ruleWithConfiguration(RenameClassRector::class, [
         OldClass::class => NewClass::class,

diff --git a/rules-tests/Renaming/Rector/Name/RenameClassRector/config/callback.php b/rules-tests/Renaming/Rector/Name/RenameClassRector/config/callback.php
@@ -8,6 +8,8 @@
 use Rector\Tests\Renaming\Rector\Name\RenameClassRector\Source\EnforceInterfaceSuffixCallback;
 
 return static function (RectorConfig $rectorConfig): void {
+    $rectorConfig->removeUnusedImports();
+
     $rectorConfig
         ->ruleWithConfiguration(RenameClassRector::class, [
             RenameClassRector::CALLBACKS => [

diff --git a/rules-tests/Renaming/Rector/Name/RenameClassRector/config/complex_rename.php b/rules-tests/Renaming/Rector/Name/RenameClassRector/config/complex_rename.php
@@ -11,6 +11,8 @@
 
 return static function (RectorConfig $rectorConfig): void {
     $rectorConfig->importNames();
+    $rectorConfig->removeUnusedImports();
+
     $rectorConfig
         ->ruleWithConfiguration(RenameClassRector::class, [
             OldClassWithMethod::class => NewClassWithNewMethod::class,

diff --git a/rules-tests/Renaming/Rector/Name/RenameClassRector/config/non_php_config.php b/rules-tests/Renaming/Rector/Name/RenameClassRector/config/non_php_config.php
@@ -8,6 +8,8 @@
 use Rector\Tests\Renaming\Rector\Name\RenameClassRector\Source\OldClass;
 
 return static function (RectorConfig $rectorConfig): void {
+    $rectorConfig->removeUnusedImports();
+
     $rectorConfig
         ->ruleWithConfiguration(RenameClassRector::class, [
             OldClass::class => NewClass::class,

diff --git a/rules-tests/Renaming/Rector/Name/RenameClassRector/config/rename_missing_parent.php b/rules-tests/Renaming/Rector/Name/RenameClassRector/config/rename_missing_parent.php
@@ -6,6 +6,8 @@
 use Rector\Renaming\Rector\Name\RenameClassRector;
 
 return static function (RectorConfig $rectorConfig): void {
+    $rectorConfig->removeUnusedImports();
+
     $rectorConfig
         ->ruleWithConfiguration(RenameClassRector::class, [
             'Missing\\ParentClass' => 'Renamed\\Missing\\ParentWithMethod',

diff --git a/rules-tests/Renaming/Rector/Name/RenameClassRector/config/rename_parent.php b/rules-tests/Renaming/Rector/Name/RenameClassRector/config/rename_parent.php
@@ -6,6 +6,8 @@
 use Rector\Renaming\Rector\Name\RenameClassRector;
 
 return static function (RectorConfig $rectorConfig): void {
+    $rectorConfig->removeUnusedImports();
+
     $rectorConfig
         ->ruleWithConfiguration(RenameClassRector::class, [
             'ThisClassDoesNotExistAnymore' => 'NewClassThatDoesNotExistEither',

diff --git a/...ests/Renaming/Rector/Name/RenameClassRector/config/skip_after_defined_configured_rule.php b/...ests/Renaming/Rector/Name/RenameClassRector/config/skip_after_defined_configured_rule.php
@@ -8,6 +8,8 @@
 use Rector\Tests\Renaming\Rector\Name\RenameClassRector\Source\OldClass;
 
 return static function (RectorConfig $rectorConfig): void {
+    $rectorConfig->removeUnusedImports();
+
     $rectorConfig
         ->ruleWithConfiguration(RenameClassRector::class, [
             OldClass::class => NewClass::class,