[typed-collections] remove DefaultNewArrayCollectionRector as duplicate of InitializeCollectionInConstructorRector (#394)

* cleanup

* [rector] apply on rules-tests as wellfs

* make sure values are null in InitializeCollectionInConstructorRector, so we avoid assign and property type conflicts

* remove DefaultNewArrayCollectionRector  as duplicate of InitializeCollectionInConstructorRector

* split /ImproveDoctrineCollectionDocTypeInEntityRector into CompletePropertyDocblockFromToManyRector + CompleteParamDocblockFromToManyRector

* splitting

* fixing

* remove collection rules from code quality set, to keep them idempotent

Author: TomasVotruba

config/sets/doctrine-code-quality.php

@@ -9,9 +9,6 @@
 use Rector\Doctrine\CodeQuality\Rector\Property\CorrectDefaultTypesOnEntityPropertyRector;
 use Rector\Doctrine\CodeQuality\Rector\Property\TypedPropertyFromColumnTypeRector;
 use Rector\Doctrine\CodeQuality\Rector\Property\TypedPropertyFromToOneRelationTypeRector;
-use Rector\Doctrine\TypedCollections\Rector\Class_\InitializeCollectionInConstructorRector;
-use Rector\Doctrine\TypedCollections\Rector\Property\ImproveDoctrineCollectionDocTypeInEntityRector;
-use Rector\Doctrine\TypedCollections\Rector\Property\TypedPropertyFromToManyRelationTypeRector;
 use Rector\Transform\Rector\Attribute\AttributeKeyToClassConstFetchRector;
 use Rector\Transform\ValueObject\AttributeKeyToClassConstFetch;
 
@@ -20,15 +17,11 @@
         MoveCurrentDateTimeDefaultInEntityToConstructorRector::class,
         CorrectDefaultTypesOnEntityPropertyRector::class,
 
-        InitializeCollectionInConstructorRector::class,
-        ImproveDoctrineCollectionDocTypeInEntityRector::class,
-
         RemoveEmptyTableAttributeRector::class,
 
         // typed properties in entities from annotations/attributes
         TypedPropertyFromColumnTypeRector::class,
         TypedPropertyFromToOneRelationTypeRector::class,
-        TypedPropertyFromToManyRelationTypeRector::class,
 
         // annotations generics
         AddAnnotationToRepositoryRector::class,

config/sets/typed-collections.php

@@ -5,7 +5,8 @@
 use Rector\Config\RectorConfig;
 use Rector\Doctrine\TypedCollections\Rector\Assign\ArrayDimFetchAssignToAddCollectionCallRector;
 use Rector\Doctrine\TypedCollections\Rector\Class_\AddReturnDocBlockToCollectionPropertyGetterByToManyAnnotationRector;
-use Rector\Doctrine\TypedCollections\Rector\Class_\DefaultNewArrayCollectionRector;
+use Rector\Doctrine\TypedCollections\Rector\Class_\CompleteParamDocblockFromToManyRector;
+use Rector\Doctrine\TypedCollections\Rector\Class_\CompletePropertyDocblockFromToManyRector;
 use Rector\Doctrine\TypedCollections\Rector\Class_\InitializeCollectionInConstructorRector;
 use Rector\Doctrine\TypedCollections\Rector\ClassMethod\CollectionGetterNativeTypeRector;
 use Rector\Doctrine\TypedCollections\Rector\ClassMethod\CollectionParamTypeSetterToCollectionPropertyRector;
@@ -24,36 +25,45 @@
 use Rector\Doctrine\TypedCollections\Rector\If_\RemoveIfInstanceofCollectionRector;
 use Rector\Doctrine\TypedCollections\Rector\MethodCall\SetArrayToNewCollectionRector;
 use Rector\Doctrine\TypedCollections\Rector\New_\RemoveNewArrayCollectionWrapRector;
-use Rector\Doctrine\TypedCollections\Rector\Property\ImproveDoctrineCollectionDocTypeInEntityRector;
 use Rector\Doctrine\TypedCollections\Rector\Property\NarrowPropertyUnionToCollectionRector;
 use Rector\Doctrine\TypedCollections\Rector\Property\TypedPropertyFromToManyRelationTypeRector;
 
 return static function (RectorConfig $rectorConfig): void {
     $rectorConfig->rules([
-        ArrayDimFetchAssignToAddCollectionCallRector::class,
         AddReturnDocBlockToCollectionPropertyGetterByToManyAnnotationRector::class,
-        DefaultNewArrayCollectionRector::class,
+
+        // init
         InitializeCollectionInConstructorRector::class,
+        RemoveNewArrayCollectionOutsideConstructorRector::class,
+        RemoveCoalesceAssignOnCollectionRector::class,
+        RemoveIfInstanceofCollectionRector::class,
+
+        // collection method calls
+        ArrayDimFetchAssignToAddCollectionCallRector::class,
+        ArrayMapOnCollectionToArrayRector::class,
+        ArrayMergeOnCollectionToArrayRector::class,
+        EmptyOnCollectionToIsEmptyCallRector::class,
+        InArrayOnCollectionToContainsCallRector::class,
+
+        // native type declarations
         CollectionGetterNativeTypeRector::class,
         CollectionParamTypeSetterToCollectionPropertyRector::class,
+        TypedPropertyFromToManyRelationTypeRector::class,
+
+        // docblocks
         DefaultCollectionKeyRector::class,
         NarrowArrayCollectionToCollectionRector::class,
         NarrowParamUnionToCollectionRector::class,
         NarrowReturnUnionToCollectionRector::class,
-        RemoveNewArrayCollectionOutsideConstructorRector::class,
-        ReturnArrayToNewArrayCollectionRector::class,
+        NarrowPropertyUnionToCollectionRector::class,
+
+        CompletePropertyDocblockFromToManyRector::class,
+        CompleteParamDocblockFromToManyRector::class,
         ReturnCollectionDocblockRector::class,
-        EmptyOnCollectionToIsEmptyCallRector::class,
-        RemoveCoalesceAssignOnCollectionRector::class,
-        ArrayMapOnCollectionToArrayRector::class,
-        ArrayMergeOnCollectionToArrayRector::class,
-        InArrayOnCollectionToContainsCallRector::class,
-        RemoveIfInstanceofCollectionRector::class,
+
+        // new ArrayCollection() wraps
+        ReturnArrayToNewArrayCollectionRector::class,
         SetArrayToNewCollectionRector::class,
         RemoveNewArrayCollectionWrapRector::class,
-        ImproveDoctrineCollectionDocTypeInEntityRector::class,
-        NarrowPropertyUnionToCollectionRector::class,
-        TypedPropertyFromToManyRelationTypeRector::class,
-
     ]);
 };

rector.php

@@ -7,7 +7,9 @@
 
 return RectorConfig::configure()
     ->withImportNames(removeUnusedImports: true)
-    ->withPaths([__DIR__ . '/config', __DIR__ . '/src', __DIR__ . '/rules', __DIR__ . '/tests'])
+    ->withPaths(
+        [__DIR__ . '/config', __DIR__ . '/src', __DIR__ . '/rules', __DIR__ . '/tests', __DIR__ . '/rules-tests']
+    )
     ->withSkip(['*/Source/*', '*/Fixture/*'])
     ->withRootFiles()
     ->withPhpSets()

rules-tests/Orm30/Rector/MethodCall/CastDoctrineExprToStringRector/configured_rule.php

@@ -3,6 +3,7 @@
 declare(strict_types=1);
 
 use Rector\Config\RectorConfig;
+use Rector\Doctrine\Orm30\Rector\MethodCall\CastDoctrineExprToStringRector;
 
 return RectorConfig::configure()
-    ->withRules([\Rector\Doctrine\Orm30\Rector\MethodCall\CastDoctrineExprToStringRector::class]);
+    ->withRules([CastDoctrineExprToStringRector::class]);

rules-tests/Orm30/Rector/MethodCall/SetParametersArrayToCollectionRector/configured_rule.php

@@ -3,6 +3,7 @@
 declare(strict_types=1);
 
 use Rector\Config\RectorConfig;
+use Rector\Doctrine\Orm30\Rector\MethodCall\SetParametersArrayToCollectionRector;
 
 return RectorConfig::configure()
-    ->withRules([\Rector\Doctrine\Orm30\Rector\MethodCall\SetParametersArrayToCollectionRector::class]);
+    ->withRules([SetParametersArrayToCollectionRector::class]);

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

@@ -3,9 +3,8 @@
 declare(strict_types=1);
 
 use Rector\Config\RectorConfig;
+use Rector\Doctrine\TypedCollections\Rector\ClassMethod\CollectionParamTypeSetterToCollectionPropertyRector;
 
 return static function (RectorConfig $rectorConfig): void {
-    $rectorConfig->rule(
-        \Rector\Doctrine\TypedCollections\Rector\ClassMethod\CollectionParamTypeSetterToCollectionPropertyRector::class
-    );
+    $rectorConfig->rule(CollectionParamTypeSetterToCollectionPropertyRector::class);
 };

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

@@ -3,7 +3,8 @@
 declare(strict_types=1);
 
 use Rector\Config\RectorConfig;
+use Rector\Doctrine\TypedCollections\Rector\ClassMethod\DefaultCollectionKeyRector;
 
 return static function (RectorConfig $rectorConfig): void {
-    $rectorConfig->rule(\Rector\Doctrine\TypedCollections\Rector\ClassMethod\DefaultCollectionKeyRector::class);
+    $rectorConfig->rule(DefaultCollectionKeyRector::class);
 };

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

@@ -3,9 +3,8 @@
 declare(strict_types=1);
 
 use Rector\Config\RectorConfig;
+use Rector\Doctrine\TypedCollections\Rector\ClassMethod\NarrowArrayCollectionToCollectionRector;
 
 return static function (RectorConfig $rectorConfig): void {
-    $rectorConfig->rule(
-        \Rector\Doctrine\TypedCollections\Rector\ClassMethod\NarrowArrayCollectionToCollectionRector::class
-    );
+    $rectorConfig->rule(NarrowArrayCollectionToCollectionRector::class);
 };

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

@@ -3,7 +3,8 @@
 declare(strict_types=1);
 
 use Rector\Config\RectorConfig;
+use Rector\Doctrine\TypedCollections\Rector\ClassMethod\NarrowParamUnionToCollectionRector;
 
 return static function (RectorConfig $rectorConfig): void {
-    $rectorConfig->rule(\Rector\Doctrine\TypedCollections\Rector\ClassMethod\NarrowParamUnionToCollectionRector::class);
+    $rectorConfig->rule(NarrowParamUnionToCollectionRector::class);
 };

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

@@ -3,9 +3,8 @@
 declare(strict_types=1);
 
 use Rector\Config\RectorConfig;
+use Rector\Doctrine\TypedCollections\Rector\ClassMethod\NarrowReturnUnionToCollectionRector;
 
 return static function (RectorConfig $rectorConfig): void {
-    $rectorConfig->rule(
-        \Rector\Doctrine\TypedCollections\Rector\ClassMethod\NarrowReturnUnionToCollectionRector::class
-    );
+    $rectorConfig->rule(NarrowReturnUnionToCollectionRector::class);
 };