Merge autoImport() tests (#4050)

rectorphp · Jun 2, 2023 · 6dd57a9 · 6dd57a9
1 parent 88eed98
commit 6dd57a9
Show file tree

Hide file tree

Showing 39 changed files with 67 additions and 473 deletions.
diff --git a/tests/Issues/AnnotationImport/AnnotationImportTest.php b/tests/Issues/AnnotationImport/AnnotationImportTest.php
diff --git a/...toImportInAlias/AutoImportInAliasTest.php → tests/Issues/AutoImport/AutoImportTest.php b/...toImportInAlias/AutoImportInAliasTest.php → tests/Issues/AutoImport/AutoImportTest.php
@@ -2,13 +2,13 @@
 
 declare(strict_types=1);
 
-namespace Rector\Core\Tests\Issues\AutoImportInAlias;
+namespace Rector\Core\Tests\Issues\AutoImport;
 
 use Iterator;
 use PHPUnit\Framework\Attributes\DataProvider;
 use Rector\Testing\PHPUnit\AbstractRectorTestCase;
 
-final class AutoImportInAliasTest extends AbstractRectorTestCase
+final class AutoImportTest extends AbstractRectorTestCase
 {
     #[DataProvider('provideData')]
     public function test(string $filePath): void

diff --git a/tests/Issues/AutoImport/Fixture/auto_import_in_alias.php.inc b/tests/Issues/AutoImport/Fixture/auto_import_in_alias.php.inc
@@ -0,0 +1,23 @@
+<?php
+
+namespace Rector\Core\Tests\Issues\AutoImport\Fixture;
+
+use stdClass as SomeObject;
+
+final class AutoImport extends \stdClass
+{
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Core\Tests\Issues\AutoImport\Fixture;
+
+use stdClass as SomeObject;
+
+final class AutoImport extends SomeObject
+{
+}
+
+?>
diff --git a/...to_import_in_alias_same_last_name.php.inc → ...to_import_in_alias_same_last_name.php.inc b/...to_import_in_alias_same_last_name.php.inc → ...to_import_in_alias_same_last_name.php.inc
@@ -1,11 +1,11 @@
 <?php
 
-namespace Rector\Core\Tests\Issues\AutoImportInAlias\Fixture;
+namespace Rector\Core\Tests\Issues\AutoImport\Fixture;
 
 use PhpParser\Node\Expr\BinaryOp\Plus;
 use PhpParser\Node\Expr\AssignOp\Plus as AssignPlus;
 
-final class AutoImportInAliasSameLastName
+final class AutoImportSameLastName
 {
     public function run(\PhpParser\Node\Expr\BinaryOp\Plus $plus)
     {
@@ -20,12 +20,12 @@ final class AutoImportInAliasSameLastName
 -----
 <?php
 
-namespace Rector\Core\Tests\Issues\AutoImportInAlias\Fixture;
+namespace Rector\Core\Tests\Issues\AutoImport\Fixture;
 
 use PhpParser\Node\Expr\BinaryOp\Plus;
 use PhpParser\Node\Expr\AssignOp\Plus as AssignPlus;
 
-final class AutoImportInAliasSameLastName
+final class AutoImportSameLastName
 {
     public function run(Plus $plus)
     {

diff --git a/...e/Fixture/auto_import_in_groupuse.php.inc → ...t/Fixture/auto_import_in_groupuse.php.inc b/...e/Fixture/auto_import_in_groupuse.php.inc → ...t/Fixture/auto_import_in_groupuse.php.inc
diff --git a/...tationImport/Fixture/no_namespace.php.inc → ...ort/Fixture/doctrine_no_namespace.php.inc b/...tationImport/Fixture/no_namespace.php.inc → ...ort/Fixture/doctrine_no_namespace.php.inc
diff --git a/...ortBeforeDocblock/Fixture/fixture.php.inc → ...Issues/AutoImport/Fixture/fixture.php.inc b/...ortBeforeDocblock/Fixture/fixture.php.inc → ...Issues/AutoImport/Fixture/fixture.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Core\Tests\Issues\AutoImportBeforeDocblock\Fixture;
+namespace Rector\Core\Tests\Issues\AutoImport\Fixture;
 
 /**
  * License
@@ -24,7 +24,7 @@ final class DemoFile
 -----
 <?php
 
-namespace Rector\Core\Tests\Issues\AutoImportBeforeDocblock\Fixture;
+namespace Rector\Core\Tests\Issues\AutoImport\Fixture;
 
 /**
  * License

diff --git a/...re/no_namespace_with_strict_types.php.inc → ...re/no_namespace_with_strict_types.php.inc b/...re/no_namespace_with_strict_types.php.inc → ...re/no_namespace_with_strict_types.php.inc
diff --git a/...with_strict_types_no_existing_use.php.inc → ...with_strict_types_no_existing_use.php.inc b/...with_strict_types_no_existing_use.php.inc → ...with_strict_types_no_existing_use.php.inc
diff --git a/..._auto_import_doc_in_use_namespace.php.inc → ..._auto_import_doc_in_use_namespace.php.inc b/..._auto_import_doc_in_use_namespace.php.inc → ..._auto_import_doc_in_use_namespace.php.inc
@@ -2,14 +2,14 @@
 
 declare(strict_types=1);
 
-namespace Rector\Core\Tests\Issues\AutoImportDocInUse\Fixture;
+namespace Rector\Core\Tests\Issues\AutoImport\Fixture;
 
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
-use Rector\Core\Tests\Issues\AutoImportDocInUse\Source\Annotation;
+use Rector\Core\Tests\Issues\AutoImport\Source\Annotation;
 
-final class SkipAutoImportDocInUseNamespace extends AbstractController
+final class SkipAutoImportNamespace extends AbstractController
 {
     /**
      * @Annotation\SomeEnum()

diff --git a/...Issues/AutoImport/Fixture/skip_auto_import_in_alias_same_last_name_different_fqcn.php.inc b/...Issues/AutoImport/Fixture/skip_auto_import_in_alias_same_last_name_different_fqcn.php.inc
@@ -0,0 +1,17 @@
+<?php
+
+namespace Rector\Core\Tests\Issues\AutoImport\Fixture;
+
+use PhpParser\Node\Expr\BinaryOp\Plus;
+use PhpParser\Node\Expr\AssignOp\Plus as AssignPlus;
+
+final class SkipAutoImportSameLastNameDifferentFqcn
+{
+    public function run(\Rector\Core\Tests\Issues\AutoImport\Source\Plus $plus)
+    {
+    }
+
+    public function run2(AssignPlus $plus)
+    {
+    }
+}
diff --git a/...s/Fixture/skip_multiple_namespace.php.inc → ...t/Fixture/skip_multiple_namespace.php.inc b/...s/Fixture/skip_multiple_namespace.php.inc → ...t/Fixture/skip_multiple_namespace.php.inc
diff --git a/...rtDocInUse/Source/Annotation/SomeEnum.php → ...AutoImport/Source/Annotation/SomeEnum.php b/...rtDocInUse/Source/Annotation/SomeEnum.php → ...AutoImport/Source/Annotation/SomeEnum.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Rector\Core\Tests\Issues\AutoImportDocInUse\Source\Annotation;
+namespace Rector\Core\Tests\Issues\AutoImport\Source\Annotation;
 
 use Doctrine\Common\Annotations\Annotation\Target;
 

diff --git a/...tDocInUse/Source/Annotation/SomeEnum2.php → ...utoImport/Source/Annotation/SomeEnum2.php b/...tDocInUse/Source/Annotation/SomeEnum2.php → ...utoImport/Source/Annotation/SomeEnum2.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Rector\Core\Tests\Issues\AutoImportDocInUse\Source\Annotation;
+namespace Rector\Core\Tests\Issues\AutoImport\Source\Annotation;
 
 use Doctrine\Common\Annotations\Annotation\Target;
 

diff --git a/tests/Issues/AutoImport/Source/SomeClass.php b/tests/Issues/AutoImport/Source/SomeClass.php
@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Core\Tests\Issues\AutoImport\Source;
+
+class SomeClass
+{
+}
diff --git a/...notationImport/config/configured_rule.php → ...ues/AutoImport/config/configured_rule.php b/...notationImport/config/configured_rule.php → ...ues/AutoImport/config/configured_rule.php
diff --git a/tests/Issues/AutoImportBeforeDocblock/AutoImportBeforeDocblockTest.php b/tests/Issues/AutoImportBeforeDocblock/AutoImportBeforeDocblockTest.php
diff --git a/tests/Issues/AutoImportBeforeDocblock/Fixture/no_namespace.php.inc b/tests/Issues/AutoImportBeforeDocblock/Fixture/no_namespace.php.inc
diff --git a/tests/Issues/AutoImportBeforeDocblock/config/configured_rule.php b/tests/Issues/AutoImportBeforeDocblock/config/configured_rule.php
diff --git a/tests/Issues/AutoImportDocInUse/AutoImportDocInUseTest.php b/tests/Issues/AutoImportDocInUse/AutoImportDocInUseTest.php
diff --git a/tests/Issues/AutoImportDocInUse/Fixture/skip_auto_import_doc_in_use_namespace2.php.inc b/tests/Issues/AutoImportDocInUse/Fixture/skip_auto_import_doc_in_use_namespace2.php.inc
diff --git a/tests/Issues/AutoImportDocInUse/Fixture/skip_auto_import_doc_in_use_namespace3.php.inc b/tests/Issues/AutoImportDocInUse/Fixture/skip_auto_import_doc_in_use_namespace3.php.inc
diff --git a/tests/Issues/AutoImportDocInUse/config/configured_rule.php b/tests/Issues/AutoImportDocInUse/config/configured_rule.php
diff --git a/tests/Issues/AutoImportGroupUse/AutoImportGroupUseTest.php b/tests/Issues/AutoImportGroupUse/AutoImportGroupUseTest.php