[rector] Rector fixes

Author: actions-user

rules-tests/TypedCollections/Rector/ClassMethod/CollectionDocblockGenericTypeRector/config/configured_rule.php

@@ -2,10 +2,11 @@
 
 declare(strict_types=1);
 
+use Rector\Doctrine\TypedCollections\Rector\ClassMethod\CollectionDocblockGenericTypeRector;
 use Rector\Config\RectorConfig;
 
 return static function (RectorConfig $rectorConfig): void {
     $rectorConfig->rule(
-        \Rector\Doctrine\TypedCollections\Rector\ClassMethod\CollectionDocblockGenericTypeRector::class
+        CollectionDocblockGenericTypeRector::class
     );
 };

rules/TypedCollections/Rector/ClassMethod/CollectionDocblockGenericTypeRector.php

@@ -4,15 +4,13 @@
 
 namespace Rector\Doctrine\TypedCollections\Rector\ClassMethod;
 
+use PhpParser\Node\Expr\MethodCall;
 use PhpParser\Node;
 use PhpParser\Node\Stmt\ClassMethod;
 use PHPStan\PhpDocParser\Ast\PhpDoc\ReturnTagValueNode;
 use PHPStan\PhpDocParser\Ast\Type\GenericTypeNode;
-use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode;
 use PHPStan\Type\ObjectType;
 use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
-use Rector\BetterPhpDocParser\ValueObject\Type\FullyQualifiedIdentifierTypeNode;
-use Rector\Comments\NodeDocBlock\DocBlockUpdater;
 use Rector\Doctrine\Enum\DoctrineClass;
 use Rector\Doctrine\TypedCollections\NodeAnalyzer\FreshArrayCollectionAnalyzer;
 use Rector\PhpParser\Node\BetterNodeFinder;
@@ -28,8 +26,7 @@ final class CollectionDocblockGenericTypeRector extends AbstractRector
     public function __construct(
         private readonly BetterNodeFinder $betterNodeFinder,
         private readonly FreshArrayCollectionAnalyzer $freshArrayCollectionAnalyzer,
-        private readonly PhpDocInfoFactory $phpDocInfoFactory,
-        private readonly DocBlockUpdater $docBlockUpdater
+        private readonly PhpDocInfoFactory $phpDocInfoFactory
     ) {
     }
 
@@ -117,9 +114,9 @@ public function refactor(Node $node): ?ClassMethod
 
         // resolve type added to collection
 
-        $methodCalls = $this->betterNodeFinder->findInstancesOfScoped([$node], Node\Expr\MethodCall::class);
+        $methodCalls = $this->betterNodeFinder->findInstancesOfScoped([$node], MethodCall::class);
 
-        $collectionAddMethodCalls = array_filter($methodCalls, function (Node\Expr\MethodCall $methodCall): bool {
+        $collectionAddMethodCalls = array_filter($methodCalls, function (MethodCall $methodCall): bool {
             if (! $this->isName($methodCall->name, 'add')) {
                 return false;
             }
@@ -134,21 +131,5 @@ public function refactor(Node $node): ?ClassMethod
 
         dump($collectionAddMethodCalls);
         die;
-
-        // add a new one with generic type
-        // find return
-        // find new ArrayCollection()
-        // improve return type
-        $genericTypeNode = new GenericTypeNode(
-            new FullyQualifiedIdentifierTypeNode(DoctrineClass::COLLECTION),
-            [new IdentifierTypeNode('int'), new IdentifierTypeNode('SomeClass')] // @todo resolve the class name
-        );
-        $returnTagValueNode = new ReturnTagValueNode($genericTypeNode, '');
-
-        $phpDocInfo->addTagValueNode($returnTagValueNode);
-
-        $this->docBlockUpdater->updateRefactoredNodeWithPhpDocInfo($node);
-
-        return null;
     }
 }