From cb2514bdca3d5683677095325071a08beb9754f0 Mon Sep 17 00:00:00 2001
From: Konrad Michalik <km@move-elevator.de>
Date: Mon, 13 Oct 2025 13:21:09 +0200
Subject: [PATCH] fix: remove unused rector-config dependency and update rector
 configuration

---
 composer.json |  4 ++--
 composer.lock | 63 +--------------------------------------------------
 rector.php    | 37 +++++++++++++-----------------
 3 files changed, 19 insertions(+), 85 deletions(-)

diff --git a/composer.json b/composer.json
index 6761da6..97a8c6c 100644
--- a/composer.json
+++ b/composer.json
@@ -27,13 +27,13 @@
 	},
 	"require-dev": {
 		"armin/editorconfig-cli": "^1.0 || ^2.0",
-		"eliashaeussler/rector-config": "^3.0",
 		"ergebnis/composer-normalize": "^2.44",
 		"konradmichalik/php-cs-fixer-preset": "^0.1.0",
 		"phpstan/phpstan": "^2.0",
 		"phpstan/phpstan-phpunit": "^2.0",
 		"phpstan/phpstan-symfony": "^2.0",
-		"phpunit/phpunit": "^10.2 || ^11.0 || ^12.0"
+		"phpunit/phpunit": "^10.2 || ^11.0 || ^12.0",
+		"rector/rector": "^2.2"
 	},
 	"autoload": {
 		"psr-4": {
diff --git a/composer.lock b/composer.lock
index dbc2f51..bd512f6 100644
--- a/composer.lock
+++ b/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": "e63b7e8921fcc49a712d4db0445a772b",
+    "content-hash": "edc0558c6c3d3937bc80aa6e9829e9a3",
     "packages": [
         {
             "name": "clue/ndjson-react",
@@ -2723,67 +2723,6 @@
             },
             "time": "2025-06-02T17:23:31+00:00"
         },
-        {
-            "name": "eliashaeussler/rector-config",
-            "version": "3.1.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/eliashaeussler/rector-config.git",
-                "reference": "7b560e5b99f6bbfa806b8e3f338e8314925f70cb"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/eliashaeussler/rector-config/zipball/7b560e5b99f6bbfa806b8e3f338e8314925f70cb",
-                "reference": "7b560e5b99f6bbfa806b8e3f338e8314925f70cb",
-                "shasum": ""
-            },
-            "require": {
-                "composer-runtime-api": "^2.0",
-                "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
-                "rector/rector": "^1.2.9 || ^2.0"
-            },
-            "require-dev": {
-                "armin/editorconfig-cli": "^1.8 || ^2.0",
-                "composer/composer": "^2.0",
-                "eliashaeussler/php-cs-fixer-config": "^2.0",
-                "eliashaeussler/phpstan-config": "^2.6",
-                "eliashaeussler/phpunit-attributes": "^1.0",
-                "ergebnis/composer-normalize": "^2.30",
-                "illuminate/container": "^10.39 || ^11.0 || ^12.0",
-                "phpstan/extension-installer": "^1.2",
-                "phpunit/phpunit": "^10.5.10 || ^11.0 || ^12.0",
-                "ssch/typo3-rector": "^2.0 || ^3.0",
-                "symfony/config": "^5.4 || ^6.0 || ^7.0",
-                "typo3/cms-core": "^12.4 || ^13.0"
-            },
-            "suggest": {
-                "ssch/typo3-rector": "Configures additional Rector rules for TYPO3 CMS projects (^2.0 || ^3.0)"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "EliasHaeussler\\RectorConfig\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "GPL-3.0-or-later"
-            ],
-            "authors": [
-                {
-                    "name": "Elias Häußler",
-                    "email": "elias@haeussler.dev",
-                    "homepage": "https://haeussler.dev",
-                    "role": "Maintainer"
-                }
-            ],
-            "description": "My personal configuration for Rector",
-            "support": {
-                "issues": "https://github.com/eliashaeussler/rector-config/issues",
-                "source": "https://github.com/eliashaeussler/rector-config/tree/3.1.1"
-            },
-            "time": "2025-03-19T06:55:11+00:00"
-        },
         {
             "name": "ergebnis/composer-normalize",
             "version": "2.48.2",
diff --git a/rector.php b/rector.php
index 2f07642..a732645 100644
--- a/rector.php
+++ b/rector.php
@@ -11,27 +11,22 @@
  * file that was distributed with this source code.
  */
 
-use EliasHaeussler\RectorConfig\Config\Config;
 use Rector\Config\RectorConfig;
-use Rector\Php81\Rector\FuncCall\NullToStrictStringFuncCallArgRector;
-use Rector\PHPUnit\PHPUnit60\Rector\ClassMethod\AddDoesNotPerformAssertionToNonAssertingTestRector;
+use Rector\Set\ValueObject\LevelSetList;
+use Rector\TypeDeclaration\Rector\ClassMethod\AddVoidReturnTypeWhereNoReturnRector;
 use Rector\ValueObject\PhpVersion;
 
-return static function (RectorConfig $rectorConfig): void {
-    Config::create($rectorConfig, PhpVersion::PHP_81)
-        ->in(
-            __DIR__.'/src',
-            __DIR__.'/tests',
-        )
-        ->not(
-            __DIR__.'/tests/vendor',
-        )
-        ->withSymfony()
-        ->withPHPUnit()
-        ->skip(NullToStrictStringFuncCallArgRector::class, [
-            'src/Command/ValidateTranslationCommand.php',
-        ])
-        ->skip(AddDoesNotPerformAssertionToNonAssertingTestRector::class)
-        ->apply()
-    ;
-};
+return RectorConfig::configure()
+    ->withPaths([
+        __DIR__.'/src',
+        __DIR__.'/tests',
+    ])
+    ->withPhpVersion(PhpVersion::PHP_81)
+    ->withSets([
+        LevelSetList::UP_TO_PHP_81,
+    ])
+    ->withComposerBased(symfony: true)
+    ->withRules([
+        AddVoidReturnTypeWhereNoReturnRector::class,
+    ])
+;