Fix scoper Doctrine class in use statement prefixed with RectorPrefix (#393)

Author: samsonasik

rules/TypedCollections/Rector/ClassMethod/NarrowArrayCollectionToCollectionRector.php

@@ -4,7 +4,6 @@
 
 namespace Rector\Doctrine\TypedCollections\Rector\ClassMethod;
 
-use Doctrine\Common\Collections\ArrayCollection;
 use PhpParser\Node;
 use PhpParser\Node\Identifier;
 use PhpParser\Node\Name;
@@ -155,7 +154,7 @@ private function refactorClassMethodNativeTypes(ClassMethod $classMethod): bool
                 }
             }
 
-            if ($node instanceof Name && $this->isName($node, ArrayCollection::class)) {
+            if ($node instanceof Name && $this->isName($node, DoctrineClass::ARRAY_COLLECTION)) {
                 $hasChanged = true;
                 if ($hasReturnCollectionType) {
                     // we already have Collection, and can remove it
@@ -168,7 +167,7 @@ private function refactorClassMethodNativeTypes(ClassMethod $classMethod): bool
             return null;
         });
 
-        if ($this->isName($classMethod->returnType, ArrayCollection::class)) {
+        if ($this->isName($classMethod->returnType, DoctrineClass::ARRAY_COLLECTION)) {
             $classMethod->returnType = new FullyQualified(DoctrineClass::COLLECTION);
             $hasChanged = true;
         }
@@ -217,7 +216,7 @@ private function processNativeType(Param|Property $paramOrProperty): bool
         $hasCollectionName = $this->hasCollectionName($paramOrProperty);
 
         $hasChanged = false;
-        if ($this->isName($paramOrProperty->type, ArrayCollection::class)) {
+        if ($this->isName($paramOrProperty->type, DoctrineClass::ARRAY_COLLECTION)) {
             $paramOrProperty->type = new FullyQualified(DoctrineClass::COLLECTION);
             return true;
         }
@@ -230,7 +229,7 @@ private function processNativeType(Param|Property $paramOrProperty): bool
                 return null;
             }
 
-            if (! $this->isName($node, ArrayCollection::class)) {
+            if (! $this->isName($node, DoctrineClass::ARRAY_COLLECTION)) {
                 return null;
             }
 

rules/TypedCollections/Rector/ClassMethod/ReturnArrayToNewArrayCollectionRector.php

@@ -4,7 +4,6 @@
 
 namespace Rector\Doctrine\TypedCollections\Rector\ClassMethod;
 
-use Doctrine\Common\Collections\ArrayCollection;
 use PhpParser\Node;
 use PhpParser\Node\Arg;
 use PhpParser\Node\Expr;
@@ -100,7 +99,7 @@ public function refactor(Node $node): ?ClassMethod
                 return null;
             }
 
-            $node->expr = new New_(new FullyQualified(ArrayCollection::class), [new Arg($node->expr)]);
+            $node->expr = new New_(new FullyQualified(DoctrineClass::ARRAY_COLLECTION), [new Arg($node->expr)]);
             $hasChanged = true;
 
             return $node;

rules/TypedCollections/Rector/Class_/DefaultNewArrayCollectionRector.php

@@ -4,8 +4,6 @@
 
 namespace Rector\Doctrine\TypedCollections\Rector\Class_;
 
-use Doctrine\Common\Collections\ArrayCollection;
-use Doctrine\Common\Collections\Collection;
 use PhpParser\Modifiers;
 use PhpParser\Node;
 use PhpParser\Node\Expr\Assign;
@@ -17,6 +15,7 @@
 use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\Node\Stmt\Expression;
 use PHPStan\Type\ObjectType;
+use Rector\Doctrine\Enum\DoctrineClass;
 use Rector\NodeManipulator\ClassInsertManipulator;
 use Rector\PHPUnit\NodeAnalyzer\TestsNodeAnalyzer;
 use Rector\Rector\AbstractRector;
@@ -185,7 +184,7 @@ private function createDefaultPropertyAssigns(array $missingDefaultProperties):
         foreach ($missingDefaultProperties as $missingDefaultProperty) {
             $propertyFetch = new PropertyFetch(new Variable('this'), $missingDefaultProperty);
             $missingDefaultPropertyAssign = new Assign($propertyFetch, new New_(new FullyQualified(
-                ArrayCollection::class
+                DoctrineClass::ARRAY_COLLECTION
             )));
 
             $propertyDefaultAssigns[] = new Expression($missingDefaultPropertyAssign);
@@ -207,7 +206,7 @@ private function resolveCollectionPropertyNames(Class_ $class): array
                 continue;
             }
 
-            if ($propertyType->getClassName() !== Collection::class) {
+            if ($propertyType->getClassName() !== DoctrineClass::COLLECTION) {
                 continue;
             }
 

rules/TypedCollections/Rector/New_/RemoveNewArrayCollectionWrapRector.php

@@ -4,10 +4,10 @@
 
 namespace Rector\Doctrine\TypedCollections\Rector\New_;
 
-use Doctrine\Common\Collections\ArrayCollection;
 use PhpParser\Node;
 use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\New_;
+use Rector\Doctrine\Enum\DoctrineClass;
 use Rector\Doctrine\TypedCollections\TypeAnalyzer\CollectionTypeDetector;
 use Rector\Rector\AbstractRector;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
@@ -77,7 +77,7 @@ public function refactor(Node $node): ?Expr
             return null;
         }
 
-        if (! $this->isName($node->class, ArrayCollection::class)) {
+        if (! $this->isName($node->class, DoctrineClass::ARRAY_COLLECTION)) {
             return null;
         }