Merge remote-tracking branch 'origin/main' into muliple-annotations

Author: jackd248

README.md

@@ -138,4 +138,4 @@ Please have a look at [`CONTRIBUTING.md`](CONTRIBUTING.md).
 
 ## ⭐ License
 
-This project is licensed under [GNU General Public License 3.0 (or later)](LICENSE).
+This project is licensed under [GNU General Public License 3.0 (or later)](LICENSE.md).

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": {

composer.lock

@@ -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,
+    ])
+;