From 1a8076ad1c1d9f9f05649cb942b605a07353968d Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Wed, 13 Sep 2023 16:58:02 +0700
Subject: [PATCH 1/4] [PostRector] Fix unused import not removed on generic
 class name exists

---
 packages/BetterPhpDocParser/PhpDocInfo/PhpDocInfo.php       | 4 +++-
 packages/Config/RectorConfig.php                            | 1 -
 .../PostRector/Rector/UnusedImportRemovingPostRector.php    | 6 ++++++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/packages/BetterPhpDocParser/PhpDocInfo/PhpDocInfo.php b/packages/BetterPhpDocParser/PhpDocInfo/PhpDocInfo.php
index ff65fa0e21f..386746a8be6 100644
--- a/packages/BetterPhpDocParser/PhpDocInfo/PhpDocInfo.php
+++ b/packages/BetterPhpDocParser/PhpDocInfo/PhpDocInfo.php
@@ -419,7 +419,9 @@ public function getGenericTagClassNames(): array
         $resolvedClasses = [];
 
         foreach ($genericTagValueNodes as $genericTagValueNode) {
-            $resolvedClasses[] = $genericTagValueNode->value;
+            if ($genericTagValueNode->value !== '') {
+                $resolvedClasses[] = $genericTagValueNode->value;
+            }
         }
 
         return $resolvedClasses;
diff --git a/packages/Config/RectorConfig.php b/packages/Config/RectorConfig.php
index acf01e4a6a9..1233a4ce06a 100644
--- a/packages/Config/RectorConfig.php
+++ b/packages/Config/RectorConfig.php
@@ -12,7 +12,6 @@
 use Rector\Core\Contract\Rector\RectorInterface;
 use Rector\Core\DependencyInjection\Laravel\ContainerMemento;
 use Rector\Core\Exception\ShouldNotHappenException;
-use Rector\Core\FileSystem\FilesystemTweaker;
 use Rector\Core\NodeAnalyzer\ScopeAnalyzer;
 use Rector\Core\Rector\AbstractScopeAwareRector;
 use Rector\Core\ValueObject\PhpVersion;
diff --git a/packages/PostRector/Rector/UnusedImportRemovingPostRector.php b/packages/PostRector/Rector/UnusedImportRemovingPostRector.php
index f4199435e47..048da5cff90 100644
--- a/packages/PostRector/Rector/UnusedImportRemovingPostRector.php
+++ b/packages/PostRector/Rector/UnusedImportRemovingPostRector.php
@@ -56,6 +56,7 @@ public function enterNode(Node $node): ?Node
 
             $useUse = $namespaceStmt->uses[0];
             if ($this->isUseImportUsed($useUse, $names)) {
+                print_node($useUse->name);
                 continue;
             }
 
@@ -173,6 +174,11 @@ private function isUseImportUsed(UseUse $useUse, array $names): bool
         // match partial import
         foreach ($names as $name) {
             if (str_ends_with($comparedName, $name)) {
+                if ($comparedName === 'Rector\Core\FileSystem\FilesystemTweaker') {
+                    var_dump($name);
+                    die('name is ' . $name);
+
+                }
                 return true;
             }
 

From 078bb2891eae9db8516a37ca542a7b112d39edb2 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Wed, 13 Sep 2023 16:58:43 +0700
Subject: [PATCH 2/4] [PostRector] Fix unused import not removed on generic
 class name exists

---
 .../PostRector/Rector/UnusedImportRemovingPostRector.php    | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/packages/PostRector/Rector/UnusedImportRemovingPostRector.php b/packages/PostRector/Rector/UnusedImportRemovingPostRector.php
index 048da5cff90..f4199435e47 100644
--- a/packages/PostRector/Rector/UnusedImportRemovingPostRector.php
+++ b/packages/PostRector/Rector/UnusedImportRemovingPostRector.php
@@ -56,7 +56,6 @@ public function enterNode(Node $node): ?Node
 
             $useUse = $namespaceStmt->uses[0];
             if ($this->isUseImportUsed($useUse, $names)) {
-                print_node($useUse->name);
                 continue;
             }
 
@@ -174,11 +173,6 @@ private function isUseImportUsed(UseUse $useUse, array $names): bool
         // match partial import
         foreach ($names as $name) {
             if (str_ends_with($comparedName, $name)) {
-                if ($comparedName === 'Rector\Core\FileSystem\FilesystemTweaker') {
-                    var_dump($name);
-                    die('name is ' . $name);
-
-                }
                 return true;
             }
 

From f43ede7184cfb425cc06b98d281611d9dadc33f3 Mon Sep 17 00:00:00 2001
From: GitHub Action <actions@github.com>
Date: Wed, 13 Sep 2023 10:00:32 +0000
Subject: [PATCH 3/4] [ci-review] Rector Rectify

---
 packages/NodeTypeResolver/Node/AttributeKey.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/NodeTypeResolver/Node/AttributeKey.php b/packages/NodeTypeResolver/Node/AttributeKey.php
index 296d3054b37..23df6f203a9 100644
--- a/packages/NodeTypeResolver/Node/AttributeKey.php
+++ b/packages/NodeTypeResolver/Node/AttributeKey.php
@@ -4,8 +4,6 @@
 
 namespace Rector\NodeTypeResolver\Node;
 
-use PHPStan\Analyser\Scope;
-
 /**
  * @enum
  */

From ac93c3e0599f48e263bc1a693419ae092add00ff Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Wed, 13 Sep 2023 17:50:03 +0700
Subject: [PATCH 4/4] not make @see as part of text

---
 packages/NodeTypeResolver/Node/AttributeKey.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/NodeTypeResolver/Node/AttributeKey.php b/packages/NodeTypeResolver/Node/AttributeKey.php
index 23df6f203a9..4dc977a7bbe 100644
--- a/packages/NodeTypeResolver/Node/AttributeKey.php
+++ b/packages/NodeTypeResolver/Node/AttributeKey.php
@@ -4,6 +4,8 @@
 
 namespace Rector\NodeTypeResolver\Node;
 
+use PHPStan\Analyser\Scope;
+
 /**
  * @enum
  */
@@ -21,7 +23,7 @@ final class AttributeKey
     public const VIRTUAL_NODE = 'virtual_node';
 
     /**
-     * Contains @see Scope
+     * @see Scope
      * @var string
      */
     public const SCOPE = 'scope';