Merge pull request #3077 from rectorphp/fix-auto-import

Fix auto import

composer.json

@@ -220,7 +220,11 @@
             "rules/renaming/tests/Rector/Class_/RenameClassRector/Source/TwigFilter.php",
             "rules/renaming/tests/Rector/Class_/RenameClassRector/Source/Manual_Twig_Filter.php",
             "rules/solid/tests/Rector/ClassMethod/UseInterfaceOverImplementationInConstructorRector/Source/Apple.php",
-            "tests/Rector/Namespace_/PseudoNamespaceToNamespaceRector/Source/ChangeMeAnotherNamespace.php"
+            "tests/Rector/Namespace_/PseudoNamespaceToNamespaceRector/Source/ChangeMeAnotherNamespace.php",
+            "rules/coding-style/tests/Rector/Namespace_/ImportFullyQualifiedNamesRector/Source/Foo.php",
+            "rules/coding-style/tests/Rector/Namespace_/ImportFullyQualifiedNamesRector/Source/safe_count.php",
+            "rules/coding-style/tests/Rector/Namespace_/ImportFullyQualifiedNamesRector/Source/AnotherClass.php",
+            "rules/coding-style/tests/Rector/Namespace_/ImportFullyQualifiedNamesRector/Source/YetAnotherClass.php"
         ]
     },
     "scripts": {

docs/AllRectorsOverview.md

@@ -7464,7 +7464,7 @@ Changes property `@var` annotations from annotation to type.
 - class: [`Rector\Php80\Rector\NotIdentical\StrContainsRector`](/../master/rules/php80/src/Rector/NotIdentical/StrContainsRector.php)
 - [test fixtures](/../master/rules/php80/tests/Rector/NotIdentical/StrContainsRector/Fixture)
 
-Replace strpos() !== false, strstr and preg_match() with str_contains()
+Replace strpos() !== false and strstr()  with str_contains()
 
 ```diff
  class SomeClass

rules/coding-style/src/Node/NameImporter.php

@@ -7,13 +7,15 @@
 use PhpParser\Node\Expr\ConstFetch;
 use PhpParser\Node\Expr\FuncCall;
 use PhpParser\Node\Name;
+use PhpParser\Node\Name\FullyQualified;
 use PhpParser\Node\Stmt\Namespace_;
 use PhpParser\Node\Stmt\UseUse;
 use Rector\CodingStyle\Application\UseAddingCommander;
 use Rector\CodingStyle\Imports\AliasUsesResolver;
 use Rector\CodingStyle\Imports\ImportSkipper;
 use Rector\Core\Configuration\Option;
 use Rector\NodeNameResolver\NodeNameResolver;
+use Rector\NodeTypeResolver\ClassExistenceStaticHelper;
 use Rector\NodeTypeResolver\Node\AttributeKey;
 use Rector\PHPStan\Type\FullyQualifiedObjectType;
 use Rector\StaticTypeMapper\StaticTypeMapper;
@@ -95,7 +97,7 @@ private function shouldSkipName(Name $name): bool
         }
 
         // is scalar name?
-        if (in_array($name->toString(), ['true', 'false', 'bool'], true)) {
+        if (in_array($name->toLowerString(), ['true', 'false', 'bool'], true)) {
             return true;
         }
 
@@ -107,9 +109,12 @@ private function shouldSkipName(Name $name): bool
             return true;
         }
 
+        if ($this->isNonExistingClassLikeAndFunctionFullyQualifiedName($name)) {
+            return true;
+        }
+
         // Importing root namespace classes (like \DateTime) is optional
         $importShortClasses = $this->parameterProvider->provideParameter(Option::IMPORT_SHORT_CLASSES_PARAMETER);
-
         if (! $importShortClasses) {
             $name = $this->nodeNameResolver->getName($name);
             if ($name !== null && substr_count($name, '\\') === 0) {
@@ -187,4 +192,18 @@ private function addUseImport(Name $name, FullyQualifiedObjectType $fullyQualifi
             $this->useAddingCommander->addUseImport($name, $fullyQualifiedObjectType);
         }
     }
+
+    private function isNonExistingClassLikeAndFunctionFullyQualifiedName(Name $name): bool
+    {
+        if (! $name instanceof FullyQualified) {
+            return false;
+        }
+
+        // skip-non existing class-likes and functions
+        if (ClassExistenceStaticHelper::doesClassLikeExist($name->toString())) {
+            return false;
+        }
+
+        return ! function_exists($name->toString());
+    }
 }

rules/coding-style/tests/Rector/Namespace_/ImportFullyQualifiedNamesRector/Fixture/bootstrap_names.php.inc

@@ -1,30 +1,42 @@
 <?php
 
-declare(strict_types=1);
+namespace {
+    function run_me_never()
+    {
+        // silent deprecations, since we test them
+        error_reporting(E_ALL ^ E_DEPRECATED);
+
+        // performance boost
+        \SomeNamespace\gc_disable();
+    }
+}
 
-function run_me_never()
+namespace SomeNamespace
 {
-    // silent deprecations, since we test them
-    error_reporting(E_ALL ^ E_DEPRECATED);
-
-    // performance boost
-    \SomeNamespace\gc_disable();
+    function gc_disable()
+    {}
 }
 
 ?>
 -----
 <?php
 
-declare(strict_types=1);
-use function SomeNamespace\gc_disable;
+namespace {
+    use function SomeNamespace\gc_disable;
+    function run_me_never()
+    {
+        // silent deprecations, since we test them
+        error_reporting(E_ALL ^ E_DEPRECATED);
 
-function run_me_never()
-{
-    // silent deprecations, since we test them
-    error_reporting(E_ALL ^ E_DEPRECATED);
+        // performance boost
+        gc_disable();
+    }
+}
 
-    // performance boost
-    gc_disable();
+namespace SomeNamespace
+{
+    function gc_disable()
+    {}
 }
 
 ?>

rules/coding-style/tests/Rector/Namespace_/ImportFullyQualifiedNamesRector/Source/AnotherClass.php

@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SomeAnother;
+
+final class AnotherClass
+{
+
+}

rules/coding-style/tests/Rector/Namespace_/ImportFullyQualifiedNamesRector/Source/Foo.php

@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Foo;
+
+final class Bar
+{
+
+}

rules/coding-style/tests/Rector/Namespace_/ImportFullyQualifiedNamesRector/Source/YetAnotherClass.php

@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SomeAnother;
+
+final class YetAnotherClass
+{
+
+}

rules/coding-style/tests/Rector/Namespace_/ImportFullyQualifiedNamesRector/Source/safe_count.php

@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Safe;
+
+function count()
+{
+
+}
+
+function substr()
+{
+
+}

rules/renaming/tests/Rector/Class_/RenameClassRector/FixtureAutoImportNames/class_imported_as_alias.php.inc

@@ -16,6 +16,7 @@ namespace Rector\Renaming\Tests\Rector\Class_\RenameClassRector\Fixture\AutoImpo
 
 use Rector\Renaming\Tests\Rector\Class_\RenameClassRector\Source\SecondNamespace\SecondOriginalClass;
 use Rector\Renaming\Tests\Rector\Class_\RenameClassRector\Source\FirstNamespace\FirstOriginalClass as AliasedClass;
+use Rector\Renaming\Tests\Rector\Class_\RenameClassRector\Source\SecondNamespace;
 
 $aliasedClass = new AliasedClass();
 $secondClass = new SecondOriginalClass();

rules/renaming/tests/Rector/Class_/RenameClassRector/FixtureAutoImportNamesFunction/double_funciton_import.php.inc

@@ -0,0 +1,38 @@
+<?php
+
+namespace Rector\Renaming\Tests\Rector\Class_\RenameClassRector\Fixture\FixtureAutoImportNamesParameter;
+
+class DoubleFunctionImport
+{
+    public function create()
+    {
+        return \Rector\Renaming\Tests\Rector\Class_\RenameClassRector\Source\some_another_function(1, 2);
+    }
+
+    public function emulate()
+    {
+        return \Rector\Renaming\Tests\Rector\Class_\RenameClassRector\Source\some_another_function(4, 5);
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Renaming\Tests\Rector\Class_\RenameClassRector\Fixture\FixtureAutoImportNamesParameter;
+
+use function Rector\Renaming\Tests\Rector\Class_\RenameClassRector\Source\some_another_function;
+class DoubleFunctionImport
+{
+    public function create()
+    {
+        return some_another_function(1, 2);
+    }
+
+    public function emulate()
+    {
+        return some_another_function(4, 5);
+    }
+}
+
+?>

rules/renaming/tests/Rector/Class_/RenameClassRector/FunctionAutoImportNamesParameterTest.php

@@ -0,0 +1,49 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Renaming\Tests\Rector\Class_\RenameClassRector;
+
+use Iterator;
+use Rector\Core\Testing\PHPUnit\AbstractRectorTestCase;
+use Rector\Renaming\Rector\Class_\RenameClassRector;
+use Rector\Renaming\Tests\Rector\Class_\RenameClassRector\Source\NewClass;
+use Rector\Renaming\Tests\Rector\Class_\RenameClassRector\Source\OldClass;
+
+/**
+ * @see \Rector\CodingStyle\Application\NameImportingCommander
+ */
+final class FunctionAutoImportNamesParameterTest extends AbstractRectorTestCase
+{
+    /**
+     * @dataProvider provideData()
+     */
+    public function test(string $filePath): void
+    {
+        $this->doTestFile($filePath);
+    }
+
+    public function provideData(): Iterator
+    {
+        return $this->yieldFilesFromDirectory(__DIR__ . '/FixtureAutoImportNamesFunction');
+    }
+
+    protected function getAutoImportNames(): ?bool
+    {
+        return true;
+    }
+
+    /**
+     * @return mixed[]
+     */
+    protected function getRectorsWithConfiguration(): array
+    {
+        return [
+            RenameClassRector::class => [
+                '$oldToNewClasses' => [
+                    OldClass::class => NewClass::class,
+                ],
+            ],
+        ];
+    }
+}

rules/renaming/tests/Rector/Class_/RenameClassRector/Source/some_another_function.php

@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Renaming\Tests\Rector\Class_\RenameClassRector\Source;
+
+if (! function_exists('Rector\Renaming\Tests\Rector\Class_\RenameClassRector\Source\some_another_function')) {
+    function some_another_function()
+    {
+    }
+}
+
+