[DX] Improve configuration objects + allow Symfony 6

composer.json

@@ -36,13 +36,13 @@
         "rector/rector-phpunit": "^0.11.23",
         "rector/rector-symfony": "^0.11.43",
         "sebastian/diff": "^4.0.4",
-        "ssch/typo3-rector": "^0.11.31",
-        "symfony/console": "^5.4|^6.0",
+        "ssch/typo3-rector": "dev-main",
+        "symfony/console": "^6.0",
         "symfony/contracts": "^2.5|^3.0",
         "symfony/dependency-injection": "^5.4|^6.0",
-        "symfony/finder": "^5.4|^6.0",
-        "symfony/process": "^5.4|^6.0",
-        "symfony/string": "^5.4|^6.0",
+        "symfony/finder": "^6.0",
+        "symfony/process": "^6.0",
+        "symfony/string": "^6.0",
         "symfony/yaml": "^5.4|^6.0",
         "symplify/astral": "^10.0.2",
         "symplify/autowire-array-parameter": "^10.0.2",
@@ -58,10 +58,11 @@
         "symplify/vendor-patches": "^10.0.2",
         "tracy/tracy": "^2.8",
         "webmozart/assert": "^1.10",
-        "helmich/typo3-typoscript-parser": "dev-master#0ccb3a6 as 2.3.1"
+        "helmich/typo3-typoscript-parser": "dev-master#0ccb3a6"
     },
     "require-dev": {
         "brianium/paratest": "^6.3",
+        "friendsofphp/php-cs-fixer": "dev-master as 3.3",
         "nategood/httpful": "^0.3.2",
         "phpstan/extension-installer": "^1.1",
         "phpstan/phpstan-nette": "^1.0",

packages/NodeCollector/ValueObject/ArrayCallable.php

@@ -5,6 +5,7 @@
 namespace Rector\NodeCollector\ValueObject;
 
 use PhpParser\Node\Expr;
+use Rector\Core\Validation\RectorAssert;
 
 final class ArrayCallable
 {
@@ -13,6 +14,7 @@ public function __construct(
         private readonly string $class,
         private readonly string $method
     ) {
+        RectorAssert::className($class);
     }
 
     public function getClass(): string

packages/NodeCollector/ValueObject/ArrayCallableDynamicMethod.php

@@ -5,6 +5,7 @@
 namespace Rector\NodeCollector\ValueObject;
 
 use PhpParser\Node\Expr;
+use Rector\Core\Validation\RectorAssert;
 
 final class ArrayCallableDynamicMethod
 {
@@ -13,6 +14,7 @@ public function __construct(
         private readonly string $class,
         private readonly Expr $method
     ) {
+        RectorAssert::className($class);
     }
 
     public function getClass(): string

rules/Arguments/Rector/ClassMethod/ReplaceArgumentDefaultValueRector.php

@@ -103,7 +103,9 @@ public function refactor(Node $node): MethodCall | StaticCall | ClassMethod
     public function configure(array $configuration): void
     {
         $replacedArguments = $configuration[self::REPLACED_ARGUMENTS] ?? $configuration;
+        Assert::isArray($replacedArguments);
         Assert::allIsAOf($replacedArguments, ReplaceArgumentDefaultValue::class);
+
         $this->replacedArguments = $replacedArguments;
     }
 }

rules/Arguments/ValueObject/ArgumentAdder.php

@@ -6,6 +6,7 @@
 
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\Type;
+use Rector\Core\Validation\RectorAssert;
 
 final class ArgumentAdder
 {
@@ -21,6 +22,7 @@ public function __construct(
         private readonly Type | null $argumentType = null,
         private readonly ?string $scope = null
     ) {
+        RectorAssert::className($class);
     }
 
     public function getObjectType(): ObjectType

rules/Arguments/ValueObject/ReplaceArgumentDefaultValue.php

@@ -6,6 +6,7 @@
 
 use PHPStan\Type\ObjectType;
 use Rector\Arguments\Contract\ReplaceArgumentDefaultValueInterface;
+use Rector\Core\Validation\RectorAssert;
 
 final class ReplaceArgumentDefaultValue implements ReplaceArgumentDefaultValueInterface
 {
@@ -15,6 +16,7 @@ final class ReplaceArgumentDefaultValue implements ReplaceArgumentDefaultValueIn
     final public const ANY_VALUE_BEFORE = '*ANY_VALUE_BEFORE*';
 
     /**
+     * @param int<0, max> $position
      * @param mixed $valueBefore
      * @param mixed $valueAfter
      */
@@ -25,6 +27,7 @@ public function __construct(
         private $valueBefore,
         private $valueAfter
     ) {
+        RectorAssert::className($class);
     }
 
     public function getObjectType(): ObjectType

rules/Privatization/ValueObject/ReplaceStringWithClassConstant.php

@@ -5,6 +5,7 @@
 namespace Rector\Privatization\ValueObject;
 
 use PHPStan\Type\ObjectType;
+use Rector\Core\Validation\RectorAssert;
 
 final class ReplaceStringWithClassConstant
 {
@@ -18,6 +19,7 @@ public function __construct(
         private readonly string $classWithConstants,
         private readonly bool $caseInsensitive = false
     ) {
+        RectorAssert::className($class);
     }
 
     public function getObjectType(): ObjectType

rules/Removing/ValueObject/ArgumentRemover.php

@@ -5,6 +5,7 @@
 namespace Rector\Removing\ValueObject;
 
 use PHPStan\Type\ObjectType;
+use Rector\Core\Validation\RectorAssert;
 
 final class ArgumentRemover
 {
@@ -17,6 +18,7 @@ public function __construct(
         private readonly int $position,
         private $value
     ) {
+        RectorAssert::className($class);
     }
 
     public function getObjectType(): ObjectType

rules/Renaming/ValueObject/MethodCallRename.php

@@ -5,6 +5,7 @@
 namespace Rector\Renaming\ValueObject;
 
 use PHPStan\Type\ObjectType;
+use Rector\Core\Validation\RectorAssert;
 use Rector\Renaming\Contract\MethodCallRenameInterface;
 
 final class MethodCallRename implements MethodCallRenameInterface
@@ -14,6 +15,7 @@ public function __construct(
         private readonly string $oldMethod,
         private readonly string $newMethod
     ) {
+        RectorAssert::className($class);
     }
 
     public function getClass(): string

rules/Renaming/ValueObject/MethodCallRenameWithArrayKey.php

@@ -5,6 +5,7 @@
 namespace Rector\Renaming\ValueObject;
 
 use PHPStan\Type\ObjectType;
+use Rector\Core\Validation\RectorAssert;
 use Rector\Renaming\Contract\MethodCallRenameInterface;
 
 final class MethodCallRenameWithArrayKey implements MethodCallRenameInterface
@@ -18,6 +19,7 @@ public function __construct(
         private readonly string $newMethod,
         private        $arrayKey
     ) {
+        RectorAssert::className($class);
     }
 
     public function getClass(): string

rules/Transform/ValueObject/ArgumentFuncCallToMethodCall.php

@@ -4,6 +4,7 @@
 
 namespace Rector\Transform\ValueObject;
 
+use Rector\Core\Validation\RectorAssert;
 use Rector\Transform\Contract\ValueObject\ArgumentFuncCallToMethodCallInterface;
 
 final class ArgumentFuncCallToMethodCall implements ArgumentFuncCallToMethodCallInterface
@@ -14,6 +15,7 @@ public function __construct(
         private readonly ?string $methodIfArgs = null,
         private readonly ?string $methodIfNoArgs = null
     ) {
+        RectorAssert::className($class);
     }
 
     public function getFunction(): string

rules/Transform/ValueObject/PropertyAssignToMethodCall.php

@@ -5,6 +5,7 @@
 namespace Rector\Transform\ValueObject;
 
 use PHPStan\Type\ObjectType;
+use Rector\Core\Validation\RectorAssert;
 
 final class PropertyAssignToMethodCall
 {
@@ -13,6 +14,7 @@ public function __construct(
         private readonly string $oldPropertyName,
         private readonly string $newMethodName
     ) {
+        RectorAssert::className($class);
     }
 
     public function getObjectType(): ObjectType

rules/Transform/ValueObject/ReplaceParentCallByPropertyCall.php

@@ -5,6 +5,7 @@
 namespace Rector\Transform\ValueObject;
 
 use PHPStan\Type\ObjectType;
+use Rector\Core\Validation\RectorAssert;
 
 final class ReplaceParentCallByPropertyCall
 {
@@ -13,6 +14,7 @@ public function __construct(
         private readonly string $method,
         private readonly string $property
     ) {
+        RectorAssert::className($class);
     }
 
     public function getObjectType(): ObjectType

rules/Transform/ValueObject/SingleToManyMethod.php

@@ -5,6 +5,7 @@
 namespace Rector\Transform\ValueObject;
 
 use PHPStan\Type\ObjectType;
+use Rector\Core\Validation\RectorAssert;
 
 final class SingleToManyMethod
 {
@@ -13,6 +14,7 @@ public function __construct(
         private readonly string $singleMethodName,
         private readonly string $manyMethodName
     ) {
+        RectorAssert::className($class);
     }
 
     public function getObjectType(): ObjectType

rules/Transform/ValueObject/StaticCallToFuncCall.php

@@ -5,6 +5,7 @@
 namespace Rector\Transform\ValueObject;
 
 use PHPStan\Type\ObjectType;
+use Rector\Core\Validation\RectorAssert;
 
 final class StaticCallToFuncCall
 {
@@ -13,6 +14,7 @@ public function __construct(
         private readonly string $method,
         private readonly string $function
     ) {
+        RectorAssert::className($class);
     }
 
     public function getObjectType(): ObjectType

rules/Transform/ValueObject/StaticCallToNew.php

@@ -4,12 +4,15 @@
 
 namespace Rector\Transform\ValueObject;
 
+use Rector\Core\Validation\RectorAssert;
+
 final class StaticCallToNew
 {
     public function __construct(
         private readonly string $class,
         private readonly string $method
     ) {
+        RectorAssert::className($class);
     }
 
     public function getClass(): string

rules/Transform/ValueObject/StringToClassConstant.php

@@ -4,13 +4,16 @@
 
 namespace Rector\Transform\ValueObject;
 
+use Rector\Core\Validation\RectorAssert;
+
 final class StringToClassConstant
 {
     public function __construct(
         private readonly string $string,
         private readonly string $class,
         private readonly string $constant
     ) {
+        RectorAssert::className($class);
     }
 
     public function getString(): string

rules/TypeDeclaration/ValueObject/AddParamTypeDeclaration.php

@@ -10,6 +10,9 @@
 
 final class AddParamTypeDeclaration
 {
+    /**
+     * @param int<0, max> $position
+     */
     public function __construct(
         private readonly string $className,
         private readonly string $methodName,

rules/TypeDeclaration/ValueObject/AddPropertyTypeDeclaration.php

@@ -5,6 +5,7 @@
 namespace Rector\TypeDeclaration\ValueObject;
 
 use PHPStan\Type\Type;
+use Rector\Core\Validation\RectorAssert;
 
 final class AddPropertyTypeDeclaration
 {
@@ -13,6 +14,7 @@ public function __construct(
         private readonly string $propertyName,
         private readonly Type $type
     ) {
+        RectorAssert::className($class);
     }
 
     public function getClass(): string

rules/TypeDeclaration/ValueObject/AddReturnTypeDeclaration.php

@@ -6,6 +6,7 @@
 
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\Type;
+use Rector\Core\Validation\RectorAssert;
 
 final class AddReturnTypeDeclaration
 {
@@ -14,6 +15,7 @@ public function __construct(
         private readonly string $method,
         private readonly Type $returnType
     ) {
+        RectorAssert::className($class);
     }
 
     public function getClass(): string

rules/Visibility/ValueObject/ChangeConstantVisibility.php

@@ -5,6 +5,7 @@
 namespace Rector\Visibility\ValueObject;
 
 use PHPStan\Type\ObjectType;
+use Rector\Core\Validation\RectorAssert;
 
 final class ChangeConstantVisibility
 {
@@ -13,6 +14,7 @@ public function __construct(
         private readonly string $constant,
         private readonly int $visibility
     ) {
+        RectorAssert::className($class);
     }
 
     public function getObjectType(): ObjectType

rules/Visibility/ValueObject/ChangeMethodVisibility.php

@@ -4,13 +4,16 @@
 
 namespace Rector\Visibility\ValueObject;
 
+use Rector\Core\Validation\RectorAssert;
+
 final class ChangeMethodVisibility
 {
     public function __construct(
         private readonly string $class,
         private readonly string $method,
         private readonly int $visibility
     ) {
+        RectorAssert::className($class);
     }
 
     public function getClass(): string

src/Rector/AbstractRector.php

@@ -19,7 +19,6 @@
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\Type;
 use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
-use Rector\ChangesReporting\Collector\RectorChangeCollector;
 use Rector\ChangesReporting\ValueObject\RectorWithLineChange;
 use Rector\Core\Application\FileSystem\RemovedAndAddedFilesCollector;
 use Rector\Core\Configuration\CurrentNodeProvider;
@@ -93,8 +92,6 @@ abstract class AbstractRector extends NodeVisitorAbstract implements PhpRectorIn
 
     protected NodeRemover $nodeRemover;
 
-    protected RectorChangeCollector $rectorChangeCollector;
-
     protected NodeComparator $nodeComparator;
 
     protected NodesToRemoveCollector $nodesToRemoveCollector;
@@ -134,7 +131,6 @@ abstract class AbstractRector extends NodeVisitorAbstract implements PhpRectorIn
     public function autowire(
         NodesToRemoveCollector $nodesToRemoveCollector,
         NodesToAddCollector $nodesToAddCollector,
-        RectorChangeCollector $rectorChangeCollector,
         NodeRemover $nodeRemover,
         RemovedAndAddedFilesCollector $removedAndAddedFilesCollector,
         BetterStandardPrinter $betterStandardPrinter,
@@ -161,7 +157,6 @@ public function autowire(
     ): void {
         $this->nodesToRemoveCollector = $nodesToRemoveCollector;
         $this->nodesToAddCollector = $nodesToAddCollector;
-        $this->rectorChangeCollector = $rectorChangeCollector;
         $this->nodeRemover = $nodeRemover;
         $this->removedAndAddedFilesCollector = $removedAndAddedFilesCollector;
         $this->betterStandardPrinter = $betterStandardPrinter;