fix double import of function names

packages/CodingStyle/src/Application/UseAddingCommander.php

@@ -198,6 +198,13 @@ public function isImportShortable(Node $node, FullyQualifiedObjectType $fullyQua
             }
         }
 
+        $functionImports = $this->functionUseImportTypesInFilePath[$filePath] ?? [];
+        foreach ($functionImports as $useImportType) {
+            if ($fullyQualifiedObjectType->equals($useImportType)) {
+                return true;
+            }
+        }
+
         return false;
     }
 

packages/CodingStyle/src/Imports/ImportSkipper.php

@@ -36,8 +36,10 @@ public function __construct(
         $this->shortNameResolver = $shortNameResolver;
     }
 
-    public function shouldSkipName(Node $node, FullyQualifiedObjectType $fullyQualifiedObjectType): bool
-    {
+    public function shouldSkipNameForFullyQualifiedObjectType(
+        Node $node,
+        FullyQualifiedObjectType $fullyQualifiedObjectType
+    ): bool {
         if ($this->isShortNameAlreadyUsedForDifferentFullyQualifiedName($node, $fullyQualifiedObjectType)) {
             return true;
         }

packages/CodingStyle/src/Node/NameImporter.php

@@ -67,11 +67,7 @@ public function importName(Name $name): ?Name
             return null;
         }
 
-        if ($this->isNamespaceOrUseImportName($name)) {
-            return null;
-        }
-
-        if ($this->isFunctionOrConstantImportWithSingleName($name)) {
+        if ($this->shouldSkipName($name)) {
             return null;
         }
 
@@ -110,7 +106,7 @@ private function importNameAndCollectNewUseStatement(
         FullyQualifiedObjectType $fullyQualifiedObjectType
     ): ?Name {
         // the same end is already imported → skip
-        if ($this->importSkipper->shouldSkipName($name, $fullyQualifiedObjectType)) {
+        if ($this->importSkipper->shouldSkipNameForFullyQualifiedObjectType($name, $fullyQualifiedObjectType)) {
             return null;
         }
 
@@ -147,4 +143,13 @@ private function addUseImport(Name $name, FullyQualifiedObjectType $fullyQualifi
             $this->useAddingCommander->addUseImport($name, $fullyQualifiedObjectType);
         }
     }
+
+    private function shouldSkipName(Name $name): bool
+    {
+        if ($this->isNamespaceOrUseImportName($name)) {
+            return true;
+        }
+
+        return $this->isFunctionOrConstantImportWithSingleName($name);
+    }
 }

packages/CodingStyle/src/Rector/Namespace_/ImportFullyQualifiedNamesRector.php

@@ -14,6 +14,8 @@
 
 /**
  * @see \Rector\CodingStyle\Tests\Rector\Namespace_\ImportFullyQualifiedNamesRector\ImportFullyQualifiedNamesRectorTest
+ * @see \Rector\CodingStyle\Tests\Rector\Namespace_\ImportFullyQualifiedNamesRector\NonNamespacedTest
+ * @see \Rector\CodingStyle\Tests\Rector\Namespace_\ImportFullyQualifiedNamesRector\ImportRootNamespaceClassesDisabledTest
  */
 final class ImportFullyQualifiedNamesRector extends AbstractRector
 {

packages/CodingStyle/tests/Rector/Namespace_/ImportFullyQualifiedNamesRector/FixtureFunction/double_import_function.php.inc

@@ -0,0 +1,38 @@
+<?php
+
+namespace Rector\CodingStyle\Tests\Rector\Namespace_\ImportFullyQualifiedNamesRector\FixtureFunction;
+
+class DoubleImportFunction
+{
+    public function create()
+    {
+        return \Safe\substr(1, 2);
+    }
+
+    public function emulate()
+    {
+        return \Safe\substr(4, 5);
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\CodingStyle\Tests\Rector\Namespace_\ImportFullyQualifiedNamesRector\FixtureFunction;
+
+use function Safe\substr;
+class DoubleImportFunction
+{
+    public function create()
+    {
+        return substr(1, 2);
+    }
+
+    public function emulate()
+    {
+        return substr(4, 5);
+    }
+}
+
+?>

packages/CodingStyle/tests/Rector/Namespace_/ImportFullyQualifiedNamesRector/ImportFullyQualifiedNamesRectorTest.php

@@ -12,6 +12,7 @@ final class ImportFullyQualifiedNamesRectorTest extends AbstractRectorTestCase
 {
     /**
      * @dataProvider provideDataForTest()
+     * @dataProvider provideDataForTestFunction()
      */
     public function test(string $file): void
     {
@@ -23,6 +24,11 @@ public function provideDataForTest(): Iterator
         return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture');
     }
 
+    public function provideDataForTestFunction(): Iterator
+    {
+        return $this->yieldFilesFromDirectory(__DIR__ . '/FixtureFunction');
+    }
+
     public function skippedProviderPartials(): Iterator
     {
         // @todo fix later

packages/NodeTypeResolver/src/PhpDoc/NodeAnalyzer/DocBlockNameImporter.php

@@ -122,7 +122,7 @@ private function processFqnNameImport(
             return $identifierTypeNode;
         }
 
-        if ($this->importSkipper->shouldSkipName($node, $fullyQualifiedObjectType)) {
+        if ($this->importSkipper->shouldSkipNameForFullyQualifiedObjectType($node, $fullyQualifiedObjectType)) {
             return $identifierTypeNode;
         }
 

packages/Renaming/tests/Rector/Class_/RenameClassRector/FixtureAutoImportNames/double_funciton_import.php.inc

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