Minor - Update ecs.php rector.php

ecs.php

@@ -36,21 +36,15 @@ use Symplify\EasyCodingStandard\ValueObject\Set\SetList;
 
 return static function (ContainerConfigurator $containerConfigurator): void {
     $services = $containerConfigurator->services();
-
     $parameters = $containerConfigurator->parameters();
 
-    $parameters->set(
-        Option::SETS,
-        [
-            SetList::COMMON,
-            SetList::CLEAN_CODE,
-            //SetList::SYMFONY,
-            SetList::PSR_12,
-            //SetList::PHP_CS_FIXER,
-            SetList::DOCTRINE_ANNOTATIONS,
-            SetList::SYMFONY_RISKY,
-        ]
-    );
+    $containerConfigurator->import(SetList::COMMON);
+    $containerConfigurator->import(SetList::CLEAN_CODE);
+    $containerConfigurator->import(SetList::SYMFONY);
+    $containerConfigurator->import(SetList::PSR_12);
+    $containerConfigurator->import(SetList::PHP_CS_FIXER);
+    //$containerConfigurator->import(SetList::DOCTRINE_ANNOTATIONS);
+    $containerConfigurator->import(SetList::SYMFONY_RISKY);
 
     $services->set(DisallowLongArraySyntaxSniff::class);
     $services->set(TrailingCommaInMultilineFixer::class);

rector.php

@@ -3,6 +3,7 @@
 declare(strict_types=1);
 
 use Rector\Core\Configuration\Option;
+use Rector\Doctrine\Set\DoctrineSetList;
 use Rector\Php74\Rector\Property\TypedPropertyRector;
 use Rector\Set\ValueObject\SetList;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
@@ -22,7 +23,7 @@ return static function (ContainerConfigurator $containerConfigurator): void {
         SetList::CODING_STYLE,
         SetList::CODE_QUALITY,
         SetList::PHP_74,
-        SetList::DOCTRINE_CODE_QUALITY,
+        DoctrineSetList::DOCTRINE_CODE_QUALITY,
     ]);
 
     // register single rule
@@ -40,8 +41,6 @@ return static function (ContainerConfigurator $containerConfigurator): void {
     $services->set(\Rector\Php52\Rector\Property\VarToPublicPropertyRector::class);
     //$services->set(\Rector\DeadCode\Rector\Property\RemoveUnusedPrivatePropertyRector::class);
 
-
-
     //$services->set(Rector\DoctrineCodeQuality\Rector\ClassMethod\MakeEntitySetterNullabilityInSyncWithPropertyRector::class);
     //$services->set(\Rector\DoctrineCodeQuality\Rector\Property\CorrectDefaultTypesOnEntityPropertyRector::class);
     //$services->set(\Rector\DoctrineCodeQuality\Rector\Property\ImproveDoctrineCollectionDocTypeInEntityRector::class);
@@ -75,11 +74,11 @@ return static function (ContainerConfigurator $containerConfigurator): void {
             \Rector\Php74\Rector\Closure\ClosureToArrowFunctionRector::class,
             \Rector\CodeQuality\Rector\ClassMethod\DateTimeToDateTimeInterfaceRector::class,
             \Rector\CodeQuality\Rector\Array_\CallableThisArrayToAnonymousFunctionRector::class,
-            Rector\DoctrineCodeQuality\Rector\Property\CorrectDefaultTypesOnEntityPropertyRector::class,
+            \Rector\Doctrine\Rector\Property\CorrectDefaultTypesOnEntityPropertyRector::class,
             Rector\TypeDeclaration\Rector\FunctionLike\ReturnTypeDeclarationRector::class,
-            Rector\DoctrineCodeQuality\Rector\Property\RemoveRedundantDefaultPropertyAnnotationValuesRector::class,
-            Rector\DoctrineCodeQuality\Rector\Property\ImproveDoctrineCollectionDocTypeInEntityRector::class,
-            Rector\DoctrineCodeQuality\Rector\Class_\MoveCurrentDateTimeDefaultInEntityToConstructorRector::class,
+            \Rector\Doctrine\Rector\Property\RemoveRedundantDefaultPropertyAnnotationValuesRector::class,
+            \Rector\Doctrine\Rector\Property\ImproveDoctrineCollectionDocTypeInEntityRector::class,
+            \Rector\Doctrine\Rector\Class_\MoveCurrentDateTimeDefaultInEntityToConstructorRector::class,
             Rector\CodingStyle\Rector\Switch_\BinarySwitchToIfElseRector::class,
             Rector\CodingStyle\Rector\ClassConst\VarConstantCommentRector::class,
             Rector\CodingStyle\Rector\String_\SplitStringClassConstantToClassConstFetchRector::class,