remove deprecated rectors

Reviewed-on: #3

.forgejo/workflows/push.yml

@@ -0,0 +1,34 @@
+on: [push]
+jobs:
+  ls:
+    runs-on: docker
+    container:
+      image: git.php.fail/lubiana/container/php:ci
+    steps:
+      - name: Manually checkout
+        env:
+          REPO: '${{ github.repository }}'
+          TOKEN: '${{ secrets.GITHUB_TOKEN }}'
+          GIT_SERVER: 'git.php.fail'
+        run: |
+          git clone --branch $GITHUB_REF_NAME https://${TOKEN}@${GIT_SERVER}/${REPO}.git .
+          git fetch
+          git checkout ${{ github.head_ref }}
+      - name: composer install
+        env:
+          COMPOSER_CACHE_DIR: /opt/hostedtoolcache/.composer/cache/files
+        run: |
+          mkdir -p ${{ env.COMPOSER_CACHE_DIR }}
+          composer install
+      - run: composer lint
+      - name: GIT commit and push all changed files
+        env:
+          CI_COMMIT_MESSAGE: Continuous Integration Fixes
+          CI_COMMIT_AUTHOR: Continuous Integration
+        run: |
+          if [[ -n "$(git status -s)" ]]; then
+            git config --global user.name "${{ env.CI_COMMIT_AUTHOR }}"
+            git config --global user.email "gitbot@users.noreply.php.fail"
+            git commit -am "${{ env.CI_COMMIT_MESSAGE }}"
+            git push
+          fi

composer.json

@@ -8,13 +8,21 @@
     }
   },
   "require": {
-    "slevomat/coding-standard": "^8.9",
+    "php": "^8.3",
-    "symplify/easy-coding-standard": "^11.3.2",
+    "slevomat/coding-standard": "^8.15",
-    "rector/rector": "^0.15.23"
+    "symplify/easy-coding-standard": "^12.3.5",
+    "rector/rector": "^1.0.5"
   },
   "config": {
     "allow-plugins": {
       "dealerdirect/phpcodesniffer-composer-installer": true
     }
+  },
+  "scripts": {
+    "lint": [
+      "rector",
+      "ecs --fix",
+      "ecs --fix"
+    ]
   }
 }

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "959b2ea13afa4a341c7d2ad2cf7c38f8",
+    "content-hash": "6eb7806e6594ecc073d158d2f9b483f0",
     "packages": [
         {
             "name": "dealerdirect/phpcodesniffer-composer-installer",
@@ -86,22 +86,24 @@
         },
         {
             "name": "phpstan/phpdoc-parser",
-            "version": "1.16.1",
+            "version": "1.28.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpdoc-parser.git",
-                "reference": "e27e92d939e2e3636f0a1f0afaba59692c0bf571"
+                "reference": "cd06d6b1a1b3c75b0b83f97577869fd85a3cd4fb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/e27e92d939e2e3636f0a1f0afaba59692c0bf571",
+                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/cd06d6b1a1b3c75b0b83f97577869fd85a3cd4fb",
-                "reference": "e27e92d939e2e3636f0a1f0afaba59692c0bf571",
+                "reference": "cd06d6b1a1b3c75b0b83f97577869fd85a3cd4fb",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.2 || ^8.0"
             },
             "require-dev": {
+                "doctrine/annotations": "^2.0",
+                "nikic/php-parser": "^4.15",
                 "php-parallel-lint/php-parallel-lint": "^1.2",
                 "phpstan/extension-installer": "^1.0",
                 "phpstan/phpstan": "^1.5",
@@ -125,22 +127,22 @@
             "description": "PHPDoc parser with support for nullable, intersection and generic types",
             "support": {
                 "issues": "https://github.com/phpstan/phpdoc-parser/issues",
-                "source": "https://github.com/phpstan/phpdoc-parser/tree/1.16.1"
+                "source": "https://github.com/phpstan/phpdoc-parser/tree/1.28.0"
             },
-            "time": "2023-02-07T18:11:17+00:00"
+            "time": "2024-04-03T18:51:33+00:00"
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.10.8",
+            "version": "1.10.67",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "0166aef76e066f0dd2adc2799bdadfa1635711e9"
+                "reference": "16ddbe776f10da6a95ebd25de7c1dbed397dc493"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/0166aef76e066f0dd2adc2799bdadfa1635711e9",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/16ddbe776f10da6a95ebd25de7c1dbed397dc493",
-                "reference": "0166aef76e066f0dd2adc2799bdadfa1635711e9",
+                "reference": "16ddbe776f10da6a95ebd25de7c1dbed397dc493",
                 "shasum": ""
             },
             "require": {
@@ -183,31 +185,27 @@
                 {
                     "url": "https://github.com/phpstan",
                     "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/phpstan/phpstan",
-                    "type": "tidelift"
                 }
             ],
-            "time": "2023-03-24T10:28:16+00:00"
+            "time": "2024-04-16T07:22:02+00:00"
         },
         {
             "name": "rector/rector",
-            "version": "0.15.23",
+            "version": "1.0.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/rectorphp/rector.git",
-                "reference": "f4984ebd62b3613002869b0ddd6868261d62819e"
+                "reference": "73eb63e4f9011dba6b7c66c3262543014e352f34"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/rectorphp/rector/zipball/f4984ebd62b3613002869b0ddd6868261d62819e",
+                "url": "https://api.github.com/repos/rectorphp/rector/zipball/73eb63e4f9011dba6b7c66c3262543014e352f34",
-                "reference": "f4984ebd62b3613002869b0ddd6868261d62819e",
+                "reference": "73eb63e4f9011dba6b7c66c3262543014e352f34",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.2|^8.0",
-                "phpstan/phpstan": "^1.10.1"
+                "phpstan/phpstan": "^1.10.57"
             },
             "conflict": {
                 "rector/rector-doctrine": "*",
@@ -215,15 +213,13 @@
                 "rector/rector-phpunit": "*",
                 "rector/rector-symfony": "*"
             },
+            "suggest": {
+                "ext-dom": "To manipulate phpunit.xml via the custom-rule command"
+            },
             "bin": [
                 "bin/rector"
             ],
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "0.15-dev"
-                }
-            },
             "autoload": {
                 "files": [
                     "bootstrap.php"
@@ -242,7 +238,7 @@
             ],
             "support": {
                 "issues": "https://github.com/rectorphp/rector/issues",
-                "source": "https://github.com/rectorphp/rector/tree/0.15.23"
+                "source": "https://github.com/rectorphp/rector/tree/1.0.5"
             },
             "funding": [
                 {
@@ -250,36 +246,36 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-03-22T15:22:45+00:00"
+            "time": "2024-05-10T05:31:15+00:00"
         },
         {
             "name": "slevomat/coding-standard",
-            "version": "8.9.0",
+            "version": "8.15.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/slevomat/coding-standard.git",
-                "reference": "8f11e0f5ff984d6862bb9d83aa513dc05a1773ef"
+                "reference": "7d1d957421618a3803b593ec31ace470177d7817"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/8f11e0f5ff984d6862bb9d83aa513dc05a1773ef",
+                "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/7d1d957421618a3803b593ec31ace470177d7817",
-                "reference": "8f11e0f5ff984d6862bb9d83aa513dc05a1773ef",
+                "reference": "7d1d957421618a3803b593ec31ace470177d7817",
                 "shasum": ""
             },
             "require": {
                 "dealerdirect/phpcodesniffer-composer-installer": "^0.6.2 || ^0.7 || ^1.0",
                 "php": "^7.2 || ^8.0",
-                "phpstan/phpdoc-parser": ">=1.16.0 <1.17.0",
+                "phpstan/phpdoc-parser": "^1.23.1",
-                "squizlabs/php_codesniffer": "^3.7.1"
+                "squizlabs/php_codesniffer": "^3.9.0"
             },
             "require-dev": {
                 "phing/phing": "2.17.4",
                 "php-parallel-lint/php-parallel-lint": "1.3.2",
-                "phpstan/phpstan": "1.4.10|1.10.8",
+                "phpstan/phpstan": "1.10.60",
-                "phpstan/phpstan-deprecation-rules": "1.1.3",
+                "phpstan/phpstan-deprecation-rules": "1.1.4",
-                "phpstan/phpstan-phpunit": "1.0.0|1.3.10",
+                "phpstan/phpstan-phpunit": "1.3.16",
-                "phpstan/phpstan-strict-rules": "1.5.0",
+                "phpstan/phpstan-strict-rules": "1.5.2",
-                "phpunit/phpunit": "7.5.20|8.5.21|9.6.5"
+                "phpunit/phpunit": "8.5.21|9.6.8|10.5.11"
             },
             "type": "phpcodesniffer-standard",
             "extra": {
@@ -303,7 +299,7 @@
             ],
             "support": {
                 "issues": "https://github.com/slevomat/coding-standard/issues",
-                "source": "https://github.com/slevomat/coding-standard/tree/8.9.0"
+                "source": "https://github.com/slevomat/coding-standard/tree/8.15.0"
             },
             "funding": [
                 {
@@ -315,20 +311,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-03-25T15:52:37+00:00"
+            "time": "2024-03-09T15:20:58+00:00"
         },
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "3.7.2",
+            "version": "3.9.2",
             "source": {
                 "type": "git",
-                "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
+                "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git",
-                "reference": "ed8e00df0a83aa96acf703f8c2979ff33341f879"
+                "reference": "aac1f6f347a5c5ac6bc98ad395007df00990f480"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/ed8e00df0a83aa96acf703f8c2979ff33341f879",
+                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/aac1f6f347a5c5ac6bc98ad395007df00990f480",
-                "reference": "ed8e00df0a83aa96acf703f8c2979ff33341f879",
+                "reference": "aac1f6f347a5c5ac6bc98ad395007df00990f480",
                 "shasum": ""
             },
             "require": {
@@ -338,11 +334,11 @@
                 "php": ">=5.4.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0"
+                "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.3.4"
             },
             "bin": [
-                "bin/phpcs",
+                "bin/phpcbf",
-                "bin/phpcbf"
+                "bin/phpcs"
             ],
             "type": "library",
             "extra": {
@@ -357,44 +353,70 @@
             "authors": [
                 {
                     "name": "Greg Sherwood",
-                    "role": "lead"
+                    "role": "Former lead"
+                },
+                {
+                    "name": "Juliette Reinders Folmer",
+                    "role": "Current lead"
+                },
+                {
+                    "name": "Contributors",
+                    "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer/graphs/contributors"
                 }
             ],
             "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.",
-            "homepage": "https://github.com/squizlabs/PHP_CodeSniffer",
+            "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer",
             "keywords": [
                 "phpcs",
                 "standards",
                 "static analysis"
             ],
             "support": {
-                "issues": "https://github.com/squizlabs/PHP_CodeSniffer/issues",
+                "issues": "https://github.com/PHPCSStandards/PHP_CodeSniffer/issues",
-                "source": "https://github.com/squizlabs/PHP_CodeSniffer",
+                "security": "https://github.com/PHPCSStandards/PHP_CodeSniffer/security/policy",
-                "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki"
+                "source": "https://github.com/PHPCSStandards/PHP_CodeSniffer",
+                "wiki": "https://github.com/PHPCSStandards/PHP_CodeSniffer/wiki"
             },
-            "time": "2023-02-22T23:07:41+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/PHPCSStandards",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/jrfnl",
+                    "type": "github"
+                },
+                {
+                    "url": "https://opencollective.com/php_codesniffer",
+                    "type": "open_collective"
+                }
+            ],
+            "time": "2024-04-23T20:25:34+00:00"
         },
         {
             "name": "symplify/easy-coding-standard",
-            "version": "11.3.2",
+            "version": "12.3.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/easy-coding-standard/easy-coding-standard.git",
-                "reference": "d4159e06c0970e71a2a58d350160241e7cb3994b"
+                "reference": "0d7c2cfee3debdf11c12135e90d69d1d9f4eef03"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/easy-coding-standard/easy-coding-standard/zipball/d4159e06c0970e71a2a58d350160241e7cb3994b",
+                "url": "https://api.github.com/repos/easy-coding-standard/easy-coding-standard/zipball/0d7c2cfee3debdf11c12135e90d69d1d9f4eef03",
-                "reference": "d4159e06c0970e71a2a58d350160241e7cb3994b",
+                "reference": "0d7c2cfee3debdf11c12135e90d69d1d9f4eef03",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.2"
             },
             "conflict": {
-                "friendsofphp/php-cs-fixer": "<3.0",
+                "friendsofphp/php-cs-fixer": "<3.46",
-                "squizlabs/php_codesniffer": "<3.6",
+                "phpcsstandards/php_codesniffer": "<3.8",
-                "symplify/coding-standard": "<11.3"
+                "symplify/coding-standard": "<12.1"
+            },
+            "suggest": {
+                "ext-dom": "Needed to support checkstyle output format in class CheckstyleOutputFormatter"
             },
             "bin": [
                 "bin/ecs"
@@ -418,7 +440,7 @@
             ],
             "support": {
                 "issues": "https://github.com/easy-coding-standard/easy-coding-standard/issues",
-                "source": "https://github.com/easy-coding-standard/easy-coding-standard/tree/11.3.2"
+                "source": "https://github.com/easy-coding-standard/easy-coding-standard/tree/12.3.5"
             },
             "funding": [
                 {
@@ -430,7 +452,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-03-22T15:28:51+00:00"
+            "time": "2024-08-08T08:43:50+00:00"
         }
     ],
     "packages-dev": [],
@@ -439,7 +461,9 @@
     "stability-flags": [],
     "prefer-stable": false,
     "prefer-lowest": false,
-    "platform": [],
+    "platform": {
+        "php": "^8.3"
+    },
     "platform-dev": [],
-    "plugin-api-version": "2.3.0"
+    "plugin-api-version": "2.6.0"
 }

config/ecs.php

@@ -1,8 +1,11 @@
 <?php declare(strict_types=1);
 
-use PhpCsFixer\Fixer\Basic\BracesFixer;
+use PhpCsFixer\Fixer\ClassNotation\ClassAttributesSeparationFixer;
 use PhpCsFixer\Fixer\Import\OrderedImportsFixer;
+use PhpCsFixer\Fixer\LanguageConstruct\FunctionToConstantFixer;
 use PhpCsFixer\Fixer\Operator\NewWithBracesFixer;
+use PhpCsFixer\Fixer\Operator\NewWithParenthesesFixer;
+use PhpCsFixer\Fixer\Operator\OperatorLinebreakFixer;
 use PhpCsFixer\Fixer\PhpTag\BlankLineAfterOpeningTagFixer;
 use PhpCsFixer\Fixer\Whitespace\NoExtraBlankLinesFixer;
 use PhpCsFixer\Fixer\Whitespace\NoWhitespaceInBlankLineFixer;
@@ -19,44 +22,38 @@ use SlevomatCodingStandard\Sniffs\TypeHints\DeclareStrictTypesSniff;
 use SlevomatCodingStandard\Sniffs\TypeHints\UnionTypeHintFormatSniff;
 use Symplify\CodingStandard\Fixer\LineLength\LineLengthFixer;
 use Symplify\EasyCodingStandard\Config\ECSConfig;
-use Symplify\EasyCodingStandard\ValueObject\Set\SetList;
 
-return static function (ECSConfig $c): void {
+return ECSConfig::configure()
-    $c->skip([
+    ->withPreparedSets(
-        BlankLineAfterOpeningTagFixer::class,
+        symplify: true,
-        NewWithBracesFixer::class,
+        arrays: true,
-        OrderedImportsFixer::class,
+        comments: true,
-    ]);
+        docblocks: true,
-
+        spaces: true,
-    $c->sets([
+        namespaces: true,
-        SetList::ARRAY,
+        controlStructures: true,
-        SetList::CLEAN_CODE,
+        strict: true,
-        SetList::COMMENTS,
+        cleanCode: true
-        SetList::COMMON,
+    )
-        SetList::CONTROL_STRUCTURES,
+    ->withPhpCsFixerSets(
-        SetList::DOCBLOCK,
+        perCS: true,
-        SetList::NAMESPACES,
+        perCSRisky: true,
-        SetList::PSR_12,
+        php80MigrationRisky: true,
-        SetList::SPACES,
+        php83Migration: true,
-        SetList::STRICT,
+    )
-        SetList::SYMPLIFY,
+    ->withRules([
-    ]);
-
-    // force visibility declaration on class constants
-    $c->ruleWithConfiguration(ClassConstantVisibilitySniff::class, [
-        'fixable' => true,
-    ]);
-
-    // sort all use statements
-    $c->rules([
         AlphabeticallySortedUsesSniff::class,
         DisallowGroupUseSniff::class,
         MultipleUsesPerLineSniff::class,
         NamespaceSpacingSniff::class,
-    ]);
+        OperatorLinebreakFixer::class,
-
+        NoWhitespaceInBlankLineFixer::class,
-    // import all namespaces, and event php core functions and classes
+        NewWithoutParenthesesSniff::class,
-    $c->ruleWithConfiguration(
+    ])
+    ->withConfiguredRule(ClassConstantVisibilitySniff::class, [
+        'fixable' => true,
+    ])
+    ->withConfiguredRule(
         ReferenceUsedNamesOnlySniff::class,
         [
             'allowFallbackGlobalConstants' => false,
@@ -69,51 +66,57 @@ return static function (ECSConfig $c): void {
             'allowFullyQualifiedNameForCollidingFunctions' => true,
             'searchAnnotations' => true,
         ]
-    );
+    )
 
     // define newlines between use statements
-    $c->ruleWithConfiguration(UseSpacingSniff::class, [
+    ->withConfiguredRule(
+        UseSpacingSniff::class,
+        [
             'linesCountAfterLastUse' => 1,
             'linesCountBeforeFirstUse' => 1,
             'linesCountBetweenUseTypes' => 1,
-    ]);
+        ]
-
+    )
-    // strict types declaration should be on same line as opening tag
+    ->withConfiguredRule(
-    $c->ruleWithConfiguration(
+        ClassAttributesSeparationFixer::class,
+        [
+            'elements' => [
+                'const' => 'none',
+                'method' => 'one',
+                'property' => 'none',
+                'trait_import' => 'none',
+                'case' => 'none',
+            ],
+        ],
+    )->withConfiguredRule(
         DeclareStrictTypesSniff::class,
         [
             'declareOnFirstLine' => true,
             'spacesCountAroundEqualsSign' => 0,
         ]
-    );
+    )
-
+    ->withConfiguredRule(
-    // disallow ?Foo typehint in favor of Foo|null
+        UnionTypeHintFormatSniff::class,
-    $c->ruleWithConfiguration(UnionTypeHintFormatSniff::class, [
+        [
             'nullPosition' => 'last',
             'shortNullable' => 'no',
             'withSpaces' => 'no',
-    ]);
+        ]
-
+    )
-    // Remove useless parentheses in new statements
+    ->withConfiguredRule(
-    $c->rule(BracesFixer::class);
-    $c->rule(NewWithoutParenthesesSniff::class);
-
-    // do not inline short multilinestatements
-    $c->ruleWithConfiguration(LineLengthFixer::class, [
-        LineLengthFixer::INLINE_SHORT_LINES => false,
-    ]);
-
-    $c->ruleWithConfiguration(
         NoExtraBlankLinesFixer::class,
         [
             'tokens' => ['square_brace_block', 'return', 'extra'],
         ]
-    );
+    )
-
+    ->withConfiguredRule(AttributeAndTargetSpacingSniff::class, [
-    $c->rule(NoWhitespaceInBlankLineFixer::class);
-
-    // make sure that the attribute target is on the line after the attribute
-    $c->ruleWithConfiguration(AttributeAndTargetSpacingSniff::class, [
         'linesCount' => 0,
+    ])
+    ->withSkip([
+        BlankLineAfterOpeningTagFixer::class,
+        OrderedImportsFixer::class,
+        FunctionToConstantFixer::class,
+        NewWithParenthesesFixer::class,
+        NewWithBracesFixer::class,
+        LineLengthFixer::class,
     ]);
-};

config/rector.php

@@ -14,19 +14,15 @@ use Rector\CodingStyle\Rector\ClassMethod\NewlineBeforeNewAssignSetRector;
 use Rector\CodingStyle\Rector\Closure\StaticClosureRector;
 use Rector\CodingStyle\Rector\FuncCall\CountArrayToEmptyArrayComparisonRector;
 use Rector\CodingStyle\Rector\If_\NullableCompareToNullRector;
-use Rector\CodingStyle\Rector\Stmt\NewlineAfterStatementRector;
 use Rector\Config\RectorConfig;
 use Rector\EarlyReturn\Rector\Foreach_\ChangeNestedForeachIfsToEarlyContinueRector;
-use Rector\EarlyReturn\Rector\If_\ChangeAndIfToEarlyReturnRector;
 use Rector\EarlyReturn\Rector\If_\ChangeNestedIfsToEarlyReturnRector;
 use Rector\EarlyReturn\Rector\If_\ChangeOrIfContinueToMultiContinueRector;
-use Rector\EarlyReturn\Rector\If_\ChangeOrIfReturnToEarlyReturnRector;
+use Rector\EarlyReturn\Rector\If_\RemoveAlwaysElseRector;
 use Rector\EarlyReturn\Rector\Return_\PreparedValueToEarlyReturnRector;
-use Rector\EarlyReturn\Rector\Return_\ReturnBinaryAndToEarlyReturnRector;
 use Rector\EarlyReturn\Rector\Return_\ReturnBinaryOrToEarlyReturnRector;
 use Rector\EarlyReturn\Rector\StmtsAwareInterface\ReturnEarlyIfVariableRector;
 use Rector\Php80\Rector\ClassConstFetch\ClassOnThisVariableObjectRector;
-use Rector\Set\ValueObject\LevelSetList;
 use Rector\TypeDeclaration\Rector\ArrowFunction\AddArrowFunctionReturnTypeRector;
 use Rector\TypeDeclaration\Rector\ClassMethod\AddMethodCallBasedStrictParamTypeRector;
 use Rector\TypeDeclaration\Rector\ClassMethod\AddParamTypeFromPropertyTypeRector;
@@ -35,54 +31,50 @@ use Rector\TypeDeclaration\Rector\ClassMethod\ParamTypeByMethodCallTypeRector;
 use Rector\TypeDeclaration\Rector\ClassMethod\ParamTypeByParentCallTypeRector;
 use Rector\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromReturnDirectArrayRector;
 use Rector\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromReturnNewRector;
-use Rector\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictBoolReturnExprRector;
 use Rector\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictConstantReturnRector;
 use Rector\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictNativeCallRector;
 use Rector\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictNewArrayRector;
 use Rector\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictTypedCallRector;
 use Rector\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictTypedPropertyRector;
-use Rector\TypeDeclaration\Rector\Closure\AddClosureReturnTypeRector;
 use Rector\TypeDeclaration\Rector\FunctionLike\AddParamTypeSplFixedArrayRector;
 use Rector\TypeDeclaration\Rector\FunctionLike\AddReturnTypeDeclarationFromYieldsRector;
-use Rector\TypeDeclaration\Rector\Param\ParamTypeFromStrictTypedPropertyRector;
 use Rector\TypeDeclaration\Rector\Property\TypedPropertyFromStrictConstructorRector;
-use Rector\TypeDeclaration\Rector\Property\TypedPropertyFromStrictGetterMethodReturnTypeRector;
 
-return static function (RectorConfig $c): void {
+return RectorConfig::configure()
-    $c->sets([LevelSetList::UP_TO_PHP_82]);
+    ->withPhpSets(php83: true)
-    $c->rules([
+    ->withPreparedSets(
+        deadCode: true,
+        codeQuality: true,
+        typeDeclarations: true,
+        earlyReturn: true,
+        strictBooleans: true,
+    )
+    ->withRules([
         AddArrowFunctionReturnTypeRector::class,
-        AddClosureReturnTypeRector::class,
         AddMethodCallBasedStrictParamTypeRector::class,
         AddParamTypeFromPropertyTypeRector::class,
         AddParamTypeSplFixedArrayRector::class,
         AddReturnTypeDeclarationBasedOnParentClassMethodRector::class,
         AddReturnTypeDeclarationFromYieldsRector::class,
         BooleanNotIdenticalToNotIdenticalRector::class,
-        ChangeAndIfToEarlyReturnRector::class,
         ChangeNestedForeachIfsToEarlyContinueRector::class,
         ChangeNestedIfsToEarlyReturnRector::class,
         ChangeOrIfContinueToMultiContinueRector::class,
-        ChangeOrIfReturnToEarlyReturnRector::class,
         ClassOnThisVariableObjectRector::class,
         CountArrayToEmptyArrayComparisonRector::class,
         ExplicitBoolCompareRector::class,
         InlineArrayReturnAssignRector::class,
         InlineIsAInstanceOfRector::class,
-        NewlineAfterStatementRector::class,
         NewlineBeforeNewAssignSetRector::class,
         NullableCompareToNullRector::class,
         ParamTypeByMethodCallTypeRector::class,
         ParamTypeByParentCallTypeRector::class,
-        ParamTypeFromStrictTypedPropertyRector::class,
         PreparedValueToEarlyReturnRector::class,
         ReplaceMultipleBooleanNotRector::class,
-        ReturnBinaryAndToEarlyReturnRector::class,
         ReturnBinaryOrToEarlyReturnRector::class,
         ReturnEarlyIfVariableRector::class,
         ReturnTypeFromReturnDirectArrayRector::class,
         ReturnTypeFromReturnNewRector::class,
-        ReturnTypeFromStrictBoolReturnExprRector::class,
         ReturnTypeFromStrictConstantReturnRector::class,
         ReturnTypeFromStrictNativeCallRector::class,
         ReturnTypeFromStrictNewArrayRector::class,
@@ -95,6 +87,6 @@ return static function (RectorConfig $c): void {
         StaticClosureRector::class,
         ThrowWithPreviousExceptionRector::class,
         TypedPropertyFromStrictConstructorRector::class,
-        TypedPropertyFromStrictGetterMethodReturnTypeRector::class,
+        RemoveAlwaysElseRector::class,
-    ]);
+    ])
-};
+;

ecs.php

@@ -3,13 +3,11 @@
 use Lubiana\CodeQuality\LubiSetList;
 use Symplify\EasyCodingStandard\Config\ECSConfig;
 
-return static function (ECSConfig $c): void {
+return ECSConfig::configure()
-    $c->paths([
+    ->withSets([LubiSetList::ECS])
+    ->withPaths(
+        [
             __DIR__ . '/src',
             __DIR__ . '/config',
-        __DIR__ . '/rector.php',
+        ]
-        __DIR__ . '/ecs.php',
+    )->withRootFiles();
-    ]);
-
-    $c->sets([LubiSetList::ECS]);
-};

rector.php

@@ -3,13 +3,11 @@
 use Lubiana\CodeQuality\LubiSetList;
 use Rector\Config\RectorConfig;
 
-return static function (RectorConfig $c): void {
+return RectorConfig::configure()
-    $c->paths([
+    ->withPaths([
         __DIR__ . '/src',
         __DIR__ . '/config',
-        __DIR__ . '/rector.php',
+    ])
-        __DIR__ . '/ecs.php',
+    ->withSets([LubiSetList::RECTOR])
-    ]);
+    ->withRootFiles()
-
+;
-    $c->sets([LubiSetList::RECTOR]);
-};

src/LubiSetList.php

@@ -4,7 +4,6 @@ namespace Lubiana\CodeQuality;
 
 final class LubiSetList
 {
-    public const RECTOR = __DIR__ . '/../config/rector.php';
+    public const string RECTOR = __DIR__ . '/../config/rector.php';
-
+    public const string ECS = __DIR__ . '/../config/ecs.php';
-    public const ECS = __DIR__ . '/../config/ecs.php';
 }

src/SetList.php

@@ -1,17 +0,0 @@
-<?php declare(strict_types=1);
-
-namespace Lubiana\CodeQuality;
-
-/** @deprecated use LubiSetList */
-final class SetList
-{
-    /**
-     * @deprecated use LubiSetList::RECTOR
-     */
-    public const RECTOR = LubiSetList::RECTOR;
-
-    /**
-     * @deprecated use LubiSetList::ECS
-     */
-    public const ECS = LubiSetList::ECS;
-}