Enable Rector preset (#223)

* Enable Rector preset * [ci-review] Rector Rectify --------- Co-authored-by: GitHub Action <[email protected]>
rectorphp · May 30, 2024 · efef745 · efef745
1 parent 2661638
commit efef745
Show file tree

Hide file tree

Showing 20 changed files with 72 additions and 81 deletions.
diff --git a/rector.php b/rector.php
@@ -6,37 +6,29 @@
 use Rector\Config\RectorConfig;
 use Rector\Php55\Rector\String_\StringClassNameToClassConstantRector;
 use Rector\PHPUnit\Set\PHPUnitSetList;
-use Rector\Set\ValueObject\LevelSetList;
-use Rector\Set\ValueObject\SetList;
 
-return static function (RectorConfig $rectorConfig): void {
-    $rectorConfig->importNames();
-    $rectorConfig->removeUnusedImports();
-
-    $rectorConfig->sets([
-        LevelSetList::UP_TO_PHP_81,
-        PHPUnitSetList::PHPUNIT_100,
-        SetList::CODE_QUALITY,
-        SetList::CODING_STYLE,
-        SetList::DEAD_CODE,
-        SetList::PRIVATIZATION,
-        SetList::NAMING,
-        SetList::TYPE_DECLARATION,
-        SetList::EARLY_RETURN,
-        PHPUnitSetList::PHPUNIT_CODE_QUALITY,
-    ]);
-
-    $rectorConfig->paths([
+return RectorConfig::configure()
+    ->withImportNames(removeUnusedImports: true)
+    ->withPhpSets(php82: true)
+    ->withSets([PHPUnitSetList::PHPUNIT_100, PHPUnitSetList::PHPUNIT_CODE_QUALITY])
+    ->withPreparedSets(
+        codeQuality: true,
+        codingStyle: true,
+        deadCode: true,
+        privatization: true,
+        naming: true,
+        typeDeclarations: true,
+        earlyReturn: true,
+        rectorPreset: true
+    )->withPaths([
         __DIR__ . '/src',
         __DIR__ . '/rules',
         __DIR__ . '/tests',
         __DIR__ . '/rules-tests',
         __DIR__ . '/config',
-        __DIR__ . '/rector.php',
-        __DIR__ . '/ecs.php',
-    ]);
-
-    $rectorConfig->skip([
+    ])
+    ->withRootFiles()
+    ->withSkip([
         StringClassNameToClassConstantRector::class,
 
         UseClassKeywordForClassNameResolutionRector::class => [
@@ -50,4 +42,3 @@
         '**/Source/*',
         '**/Expected/*',
     ]);
-};
diff --git a/rules/DowngradePhp72/NodeAnalyzer/BuiltInMethodAnalyzer.php b/rules/DowngradePhp72/NodeAnalyzer/BuiltInMethodAnalyzer.php
@@ -8,10 +8,10 @@
 use PHPStan\Reflection\ClassReflection;
 use Rector\NodeNameResolver\NodeNameResolver;
 
-final class BuiltInMethodAnalyzer
+final readonly class BuiltInMethodAnalyzer
 {
     public function __construct(
-        private readonly NodeNameResolver $nodeNameResolver,
+        private NodeNameResolver $nodeNameResolver,
     ) {
     }
 

diff --git a/rules/DowngradePhp72/NodeAnalyzer/OverrideFromAnonymousClassMethodAnalyzer.php b/rules/DowngradePhp72/NodeAnalyzer/OverrideFromAnonymousClassMethodAnalyzer.php
@@ -16,12 +16,12 @@
 use Rector\NodeNameResolver\NodeNameResolver;
 use Rector\NodeTypeResolver\Node\AttributeKey;
 
-final class OverrideFromAnonymousClassMethodAnalyzer
+final readonly class OverrideFromAnonymousClassMethodAnalyzer
 {
     public function __construct(
-        private readonly ClassAnalyzer $classAnalyzer,
-        private readonly NodeNameResolver $nodeNameResolver,
-        private readonly ReflectionProvider $reflectionProvider
+        private ClassAnalyzer $classAnalyzer,
+        private NodeNameResolver $nodeNameResolver,
+        private ReflectionProvider $reflectionProvider
     ) {
     }
 

diff --git a/rules/DowngradePhp72/NodeAnalyzer/RegexFuncAnalyzer.php b/rules/DowngradePhp72/NodeAnalyzer/RegexFuncAnalyzer.php
@@ -10,15 +10,15 @@
 use Rector\NodeNameResolver\NodeNameResolver;
 use Rector\NodeTypeResolver\Node\AttributeKey;
 
-final class RegexFuncAnalyzer
+final readonly class RegexFuncAnalyzer
 {
     /**
      * @var string[]
      */
     private const REGEX_FUNCTION_NAMES = ['preg_match', 'preg_match_all'];
 
     public function __construct(
-        private readonly NodeNameResolver $nodeNameResolver,
+        private NodeNameResolver $nodeNameResolver,
     ) {
     }
 

diff --git a/rules/DowngradePhp72/NodeManipulator/BitwiseFlagCleaner.php b/rules/DowngradePhp72/NodeManipulator/BitwiseFlagCleaner.php
@@ -11,10 +11,10 @@
 use PhpParser\Node\Expr\FuncCall;
 use Rector\NodeNameResolver\NodeNameResolver;
 
-final class BitwiseFlagCleaner
+final readonly class BitwiseFlagCleaner
 {
     public function __construct(
-        private readonly NodeNameResolver $nodeNameResolver
+        private NodeNameResolver $nodeNameResolver
     ) {
     }
 

diff --git a/rules/DowngradePhp72/NodeManipulator/JsonConstCleaner.php b/rules/DowngradePhp72/NodeManipulator/JsonConstCleaner.php
@@ -13,10 +13,10 @@
 use Rector\NodeNameResolver\NodeNameResolver;
 use Rector\NodeTypeResolver\Node\AttributeKey;
 
-final class JsonConstCleaner
+final readonly class JsonConstCleaner
 {
     public function __construct(
-        private readonly NodeNameResolver $nodeNameResolver,
+        private NodeNameResolver $nodeNameResolver,
     ) {
     }
 

diff --git a/rules/DowngradePhp72/PhpDoc/NativeParamToPhpDocDecorator.php b/rules/DowngradePhp72/PhpDoc/NativeParamToPhpDocDecorator.php
@@ -16,14 +16,14 @@
 use Rector\PhpParser\Node\Value\ValueResolver;
 use Rector\StaticTypeMapper\StaticTypeMapper;
 
-final class NativeParamToPhpDocDecorator
+final readonly class NativeParamToPhpDocDecorator
 {
     public function __construct(
-        private readonly PhpDocInfoFactory $phpDocInfoFactory,
-        private readonly NodeNameResolver $nodeNameResolver,
-        private readonly StaticTypeMapper $staticTypeMapper,
-        private readonly PhpDocTypeChanger $phpDocTypeChanger,
-        private readonly ValueResolver $valueResolver
+        private PhpDocInfoFactory $phpDocInfoFactory,
+        private NodeNameResolver $nodeNameResolver,
+        private StaticTypeMapper $staticTypeMapper,
+        private PhpDocTypeChanger $phpDocTypeChanger,
+        private ValueResolver $valueResolver
     ) {
     }
 

diff --git a/rules/DowngradePhp80/NodeAnalyzer/EnumAnalyzer.php b/rules/DowngradePhp80/NodeAnalyzer/EnumAnalyzer.php
@@ -16,11 +16,11 @@
 use Rector\NodeTypeResolver\NodeTypeResolver;
 use Rector\PhpParser\AstResolver;
 
-final class EnumAnalyzer
+final readonly class EnumAnalyzer
 {
     public function __construct(
-        private readonly AstResolver $astResolver,
-        private readonly NodeTypeResolver $nodeTypeResolver
+        private AstResolver $astResolver,
+        private NodeTypeResolver $nodeTypeResolver
     ) {
     }
 

diff --git a/rules/DowngradePhp80/NodeAnalyzer/NamedToUnnamedArgs.php b/rules/DowngradePhp80/NodeAnalyzer/NamedToUnnamedArgs.php
@@ -16,11 +16,11 @@
 use Rector\NodeNameResolver\NodeNameResolver;
 use ReflectionFunction;
 
-final class NamedToUnnamedArgs
+final readonly class NamedToUnnamedArgs
 {
     public function __construct(
-        private readonly NodeNameResolver $nodeNameResolver,
-        private readonly DefaultParameterValueResolver $defaultParameterValueResolver
+        private NodeNameResolver $nodeNameResolver,
+        private DefaultParameterValueResolver $defaultParameterValueResolver
     ) {
     }
 

diff --git a/rules/DowngradePhp80/NodeAnalyzer/UnnamedArgumentResolver.php b/rules/DowngradePhp80/NodeAnalyzer/UnnamedArgumentResolver.php
@@ -13,11 +13,11 @@
 use Rector\NodeNameResolver\NodeNameResolver;
 use ReflectionFunction;
 
-final class UnnamedArgumentResolver
+final readonly class UnnamedArgumentResolver
 {
     public function __construct(
-        private readonly NodeNameResolver $nodeNameResolver,
-        private readonly NamedToUnnamedArgs $namedToUnnamedArgs
+        private NodeNameResolver $nodeNameResolver,
+        private NamedToUnnamedArgs $namedToUnnamedArgs
     ) {
     }
 

diff --git a/rules/DowngradePhp80/ValueObject/DowngradeAttributeToAnnotation.php b/rules/DowngradePhp80/ValueObject/DowngradeAttributeToAnnotation.php
@@ -4,15 +4,15 @@
 
 namespace Rector\DowngradePhp80\ValueObject;
 
-final class DowngradeAttributeToAnnotation
+final readonly class DowngradeAttributeToAnnotation
 {
     /**
      * @param class-string $attributeClass
      * @param class-string|string|null $tag
      */
     public function __construct(
-        private readonly string $attributeClass,
-        private readonly ?string $tag = null
+        private string $attributeClass,
+        private ?string $tag = null
     ) {
     }
 

diff --git a/rules/DowngradePhp81/NodeFactory/ArrayMergeFromArraySpreadFactory.php b/rules/DowngradePhp81/NodeFactory/ArrayMergeFromArraySpreadFactory.php
@@ -21,10 +21,10 @@
 use Rector\NodeNameResolver\NodeNameResolver;
 use Rector\NodeTypeResolver\Node\AttributeKey;
 
-final class ArrayMergeFromArraySpreadFactory
+final readonly class ArrayMergeFromArraySpreadFactory
 {
     public function __construct(
-        private readonly NodeNameResolver $nodeNameResolver
+        private NodeNameResolver $nodeNameResolver
     ) {
     }
 

diff --git a/rules/DowngradePhp81/NodeManipulator/ObjectToResourceReturn.php b/rules/DowngradePhp81/NodeManipulator/ObjectToResourceReturn.php
@@ -18,19 +18,19 @@
 use Rector\PhpParser\Node\BetterNodeFinder;
 use Rector\PhpParser\Node\NodeFactory;
 
-final class ObjectToResourceReturn
+final readonly class ObjectToResourceReturn
 {
     /**
      * @var string
      */
     private const IS_INSTANCEOF_IN_BINARYOP = 'is_instanceof_in_binaryop';
 
     public function __construct(
-        private readonly NodeNameResolver $nodeNameResolver,
-        private readonly NodeFactory $nodeFactory,
-        private readonly BetterNodeFinder $betterNodeFinder,
-        private readonly SimpleCallableNodeTraverser $simpleCallableNodeTraverser,
-        private readonly NodeComparator $nodeComparator
+        private NodeNameResolver $nodeNameResolver,
+        private NodeFactory $nodeFactory,
+        private BetterNodeFinder $betterNodeFinder,
+        private SimpleCallableNodeTraverser $simpleCallableNodeTraverser,
+        private NodeComparator $nodeComparator
     ) {
     }
 

diff --git a/src/NodeAnalyzer/DefineFuncCallAnalyzer.php b/src/NodeAnalyzer/DefineFuncCallAnalyzer.php
@@ -9,10 +9,10 @@
 use PhpParser\Node\Scalar\String_;
 use Rector\NodeNameResolver\NodeNameResolver;
 
-final class DefineFuncCallAnalyzer
+final readonly class DefineFuncCallAnalyzer
 {
     public function __construct(
-        private readonly NodeNameResolver $nodeNameResolver,
+        private NodeNameResolver $nodeNameResolver,
     ) {
     }
 

diff --git a/src/NodeAnalyzer/ExprInTopStmtMatcher.php b/src/NodeAnalyzer/ExprInTopStmtMatcher.php
@@ -25,10 +25,10 @@
  * To resolve Expr in top Stmt from early Expr attribute
  * so the usage can append code before the Stmt
  */
-final class ExprInTopStmtMatcher
+final readonly class ExprInTopStmtMatcher
 {
     public function __construct(
-        private readonly BetterNodeFinder $betterNodeFinder,
+        private BetterNodeFinder $betterNodeFinder,
     ) {
     }
 

diff --git a/src/NodeFactory/ClassFromEnumFactory.php b/src/NodeFactory/ClassFromEnumFactory.php
@@ -14,10 +14,10 @@
 use Rector\NodeNameResolver\NodeNameResolver;
 use Rector\ValueObject\Visibility;
 
-final class ClassFromEnumFactory
+final readonly class ClassFromEnumFactory
 {
     public function __construct(
-        private readonly NodeNameResolver $nodeNameResolver
+        private NodeNameResolver $nodeNameResolver
     ) {
     }
 

diff --git a/src/NodeFactory/DoctrineAnnotationFactory.php b/src/NodeFactory/DoctrineAnnotationFactory.php
@@ -13,10 +13,10 @@
 use Rector\NodeTypeResolver\Node\AttributeKey;
 use Rector\PhpParser\Printer\BetterStandardPrinter;
 
-final class DoctrineAnnotationFactory
+final readonly class DoctrineAnnotationFactory
 {
     public function __construct(
-        private readonly BetterStandardPrinter $betterStandardPrinter
+        private BetterStandardPrinter $betterStandardPrinter
     ) {
     }
 

diff --git a/src/NodeFactory/NamedVariableFactory.php b/src/NodeFactory/NamedVariableFactory.php
@@ -9,10 +9,10 @@
 use Rector\Naming\Naming\VariableNaming;
 use Rector\NodeTypeResolver\Node\AttributeKey;
 
-final class NamedVariableFactory
+final readonly class NamedVariableFactory
 {
     public function __construct(
-        private readonly VariableNaming $variableNaming,
+        private VariableNaming $variableNaming,
     ) {
     }
 

diff --git a/src/NodeManipulator/PropertyDecorator.php b/src/NodeManipulator/PropertyDecorator.php
@@ -14,12 +14,12 @@
 use Rector\BetterPhpDocParser\PhpDocManipulator\PhpDocTypeChanger;
 use Rector\StaticTypeMapper\StaticTypeMapper;
 
-final class PropertyDecorator
+final readonly class PropertyDecorator
 {
     public function __construct(
-        private readonly PhpDocInfoFactory $phpDocInfoFactory,
-        private readonly StaticTypeMapper $staticTypeMapper,
-        private readonly PhpDocTypeChanger $phpDocTypeChanger,
+        private PhpDocInfoFactory $phpDocInfoFactory,
+        private StaticTypeMapper $staticTypeMapper,
+        private PhpDocTypeChanger $phpDocTypeChanger,
     ) {
     }
 

diff --git a/src/ValueObject/ClassMethodWillChangeReturnType.php b/src/ValueObject/ClassMethodWillChangeReturnType.php
@@ -4,11 +4,11 @@
 
 namespace Rector\ValueObject;
 
-final class ClassMethodWillChangeReturnType
+final readonly class ClassMethodWillChangeReturnType
 {
     public function __construct(
-        private readonly string $className,
-        private readonly string $methodName,
+        private string $className,
+        private string $methodName,
     ) {
     }