[CodingStyle] Import plain partially qualified names again, keep Doctrine/Symfony aliases covered

rules-tests/CodingStyle/Rector/Namespace_/ImportFullyQualifiedNamesRector/Fixture/skip_instance_of.php.inc → rules-tests/CodingStyle/Rector/Namespace_/ImportFullyQualifiedNamesRector/Fixture/instance_of.php.inc

@@ -25,3 +25,31 @@ final class ImportPartialInstanceOf
 }
 
 ?>
+-----
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Tests\CodingStyle\Rector\Namespace_\ImportFullyQualifiedNamesRector\Fixture;
+
+use PhpParser\Node;
+use PhpParser\Node\Expr;
+use PhpParser\Node\Expr\FuncCall;
+
+final class ImportPartialInstanceOf
+{
+    /**
+     * @return string[]
+     */
+    public function getNodeTypes(): array
+    {
+        return [FuncCall::class];
+    }
+
+    public function isIteratorToArrayFuncCall(Expr $expr): bool
+    {
+        return $expr instanceof FuncCall;
+    }
+}
+
+?>

rules-tests/CodingStyle/Rector/Namespace_/ImportFullyQualifiedNamesRector/Fixture/skip_keep_static_method.php.inc → rules-tests/CodingStyle/Rector/Namespace_/ImportFullyQualifiedNamesRector/Fixture/keep_static_method.php.inc

@@ -18,3 +18,24 @@ abstract class KeepStaticMethod
 }
 
 ?>
+-----
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Tests\CodingStyle\Rector\Namespace_\ImportFullyQualifiedNamesRector\Fixture;
+
+use Rector\Tests\CodingStyle\Rector\Namespace_\ImportFullyQualifiedNamesRector\Source\Contract\Token;
+use Rector\Tests\CodingStyle\Rector\Namespace_\ImportFullyQualifiedNamesRector\Source\Contract;
+
+abstract class KeepStaticMethod
+{
+    public static function decode(string $token): Token
+    {
+        $parts = explode('|', (string) base64_decode($token, true));
+
+        return Token::create($parts[0] ?? '', $parts[1] ?? '');
+    }
+}
+
+?>

rules-tests/CodingStyle/Rector/Namespace_/ImportFullyQualifiedNamesRector/Fixture/prevent_duplication.php.inc

@@ -0,0 +1,32 @@
+<?php
+
+namespace Rector\Tests\CodingStyle\Rector\Namespace_\ImportFullyQualifiedNamesRector\Fixture;
+
+use PhpParser\Node;
+
+class PreventDuplication
+{
+    public function getNodeTypes(): array
+    {
+        return [Node\Stmt\Expression::class];
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\CodingStyle\Rector\Namespace_\ImportFullyQualifiedNamesRector\Fixture;
+
+use PhpParser\Node\Stmt\Expression;
+use PhpParser\Node;
+
+class PreventDuplication
+{
+    public function getNodeTypes(): array
+    {
+        return [Expression::class];
+    }
+}
+
+?>

rules-tests/Renaming/Rector/Name/RenameClassRector/FixtureAutoImportNames/class_imported_as_alias.php.inc

@@ -0,0 +1,23 @@
+<?php
+
+namespace Rector\Tests\Renaming\Rector\Name\RenameClassRector\FixtureAutoImportNames;
+
+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 SecondNamespace\SecondOriginalClass();
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\Renaming\Rector\Name\RenameClassRector\FixtureAutoImportNames;
+
+use Rector\Tests\Renaming\Rector\Name\RenameClassRector\Source\SecondNamespace\SecondOriginalClass;
+use Rector\Tests\Renaming\Rector\Name\RenameClassRector\Source\FirstNamespace\FirstOriginalClass as AliasedClass;
+
+$aliasedClass = new AliasedClass();
+$secondClass = new SecondOriginalClass();
+
+?>

rules-tests/Renaming/Rector/Name/RenameClassRector/FixtureAutoImportNames/partial_expression.php.inc

@@ -0,0 +1,31 @@
+<?php
+
+namespace Rector\Tests\Renaming\Rector\Name\RenameClassRector\FixtureAutoImportNames;
+
+use PhpParser\Node;
+
+class PartialExpression
+{
+    public function getNodeTypes(): array
+    {
+        return [Node\Stmt\Expression::class];
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\Renaming\Rector\Name\RenameClassRector\FixtureAutoImportNames;
+
+use PhpParser\Node\Stmt\Expression;
+
+class PartialExpression
+{
+    public function getNodeTypes(): array
+    {
+        return [Expression::class];
+    }
+}
+
+?>

rules/CodingStyle/ClassNameImport/ClassNameImportSkipper.php

@@ -69,10 +69,6 @@ public function shouldSkipNameForFullyQualifiedObjectType(File $file, Node $node
      */
     public function shouldSkipName(FullyQualified $fullyQualified, array $uses): bool
     {
-        if ($this->isWrittenPartiallyQualified($fullyQualified)) {
-            return true;
-        }
-
         if (substr_count($fullyQualified->toCodeString(), '\\') === 1) {
             return $this->isFunctionOrConstantImport($fullyQualified);
         }
@@ -103,19 +99,6 @@ public function shouldSkipName(FullyQualified $fullyQualified, array $uses): boo
         return false;
     }
 
-    /**
-     * Keep names written as "Field\TextField" or "namespace\Sub\Foo" as they are
-     */
-    private function isWrittenPartiallyQualified(FullyQualified $fullyQualified): bool
-    {
-        $originalName = $fullyQualified->getAttribute(AttributeKey::ORIGINAL_NAME);
-        if (! $originalName instanceof Name) {
-            return false;
-        }
-
-        return $originalName->isQualified() || $originalName->isRelative();
-    }
-
     private function isFunctionOrConstantImport(FullyQualified $fullyQualified): bool
     {
         if ($fullyQualified->getAttribute(AttributeKey::IS_CONSTFETCH_NAME) === true) {

tests/Issues/AutoImport/Fixture/do_not_rename_different_namespaced_function.php.inc

@@ -0,0 +1,23 @@
+<?php
+
+final class DontRenameDifferentNamespacedFunction
+{
+    public function run(): void
+    {
+        $addressParts = Psl\Str\split($addressLine, $houseNumber);
+    }
+}
+
+?>
+-----
+<?php
+
+use function Psl\Str\split;
+
+final class DontRenameDifferentNamespacedFunction
+{
+    public function run(): void
+    {
+        $addressParts = split($addressLine, $houseNumber);
+    }
+}

tests/Issues/AutoImport/Fixture/inner_with_subnamespace.php.inc

@@ -0,0 +1,29 @@
+<?php
+
+namespace helpers;
+
+/**
+ * @see https://3v4l.org/WMUjV0
+ * it read with "helpers" as prefix: helpers\Sub\VarDumper
+ */
+class InnerWithSubnamespace extends Sub\VarDumper
+{
+}
+
+?>
+-----
+<?php
+
+namespace helpers;
+
+use helpers\Sub\VarDumper;
+
+/**
+ * @see https://3v4l.org/WMUjV0
+ * it read with "helpers" as prefix: helpers\Sub\VarDumper
+ */
+class InnerWithSubnamespace extends VarDumper
+{
+}
+
+?>

tests/Issues/AutoImport/Fixture/inner_with_subnamespace2.php.inc

@@ -0,0 +1,29 @@
+<?php
+
+namespace helpers;
+
+/**
+ * @see https://3v4l.org/PsIsB
+ * it read as double "helpers" as sub sub: helpers\helpers\Sub\VarDumper
+ */
+class InnerWithSubnamespace extends helpers\Sub\VarDumper
+{
+}
+
+?>
+-----
+<?php
+
+namespace helpers;
+
+use helpers\helpers\Sub\VarDumper;
+
+/**
+ * @see https://3v4l.org/PsIsB
+ * it read as double "helpers" as sub sub: helpers\helpers\Sub\VarDumper
+ */
+class InnerWithSubnamespace extends VarDumper
+{
+}
+
+?>