diff --git a/e2e/applied-rule-change-docblock/rector.php b/e2e/applied-rule-change-docblock/rector.php index 85d4fe26fe9..e26e836789e 100644 --- a/e2e/applied-rule-change-docblock/rector.php +++ b/e2e/applied-rule-change-docblock/rector.php @@ -13,10 +13,12 @@ return static function (RectorConfig $rectorConfig): void { __DIR__ . '/src', ]); - $services = $rectorConfig->services(); - $services->set(RenameClassRector::class) - ->configure(['DateTime' => 'DateTimeInterface']); - $services->set(DowngradeAttributeToAnnotationRector::class) - ->configure([new DowngradeAttributeToAnnotation('Symfony\Component\Routing\Annotation\Route')]); - $services->set(RemoveUselessVarTagRector::class); + $rectorConfig->ruleWithConfiguration(RenameClassRector::class, [ + 'DateTime' => 'DateTimeInterface' + ]); + $rectorConfig->ruleWithConfiguration(DowngradeAttributeToAnnotationRector::class, [ + new DowngradeAttributeToAnnotation('Symfony\Component\Routing\Annotation\Route') + ]); + + $rectorConfig->rule(RemoveUselessVarTagRector::class); }; diff --git a/rules/Renaming/Rector/Name/RenameClassRector.php b/rules/Renaming/Rector/Name/RenameClassRector.php index 5cdf938e25c..5ed2e26c816 100644 --- a/rules/Renaming/Rector/Name/RenameClassRector.php +++ b/rules/Renaming/Rector/Name/RenameClassRector.php @@ -13,13 +13,12 @@ use PhpParser\Node\Stmt\Expression; use PhpParser\Node\Stmt\Namespace_; use PhpParser\Node\Stmt\Property; use PhpParser\Node\Stmt\Use_; -use Rector\Core\Configuration\Option; +use Rector\Core\Configuration\RectorConfigProvider; use Rector\Core\Configuration\RenamedClassesDataCollector; use Rector\Core\Contract\Rector\ConfigurableRectorInterface; use Rector\Core\PhpParser\Node\CustomNode\FileWithoutNamespace; use Rector\Core\Rector\AbstractRector; use Rector\Renaming\NodeManipulator\ClassRenamer; -use Symplify\PackageBuilder\Parameter\ParameterProvider; use Symplify\RuleDocGenerator\ValueObject\CodeSample\ConfiguredCodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; use Webmozart\Assert\Assert; @@ -32,7 +31,7 @@ final class RenameClassRector extends AbstractRector implements ConfigurableRect public function __construct( private readonly RenamedClassesDataCollector $renamedClassesDataCollector, private readonly ClassRenamer $classRenamer, - private readonly ParameterProvider $parameterProvider, + private readonly RectorConfigProvider $rectorConfigProvider, ) { } @@ -101,7 +100,7 @@ CODE_SAMPLE return $this->classRenamer->renameNode($node, $oldToNewClasses, $this->file); } - if (! $this->parameterProvider->provideBoolParameter(Option::AUTO_IMPORT_NAMES)) { + if (! $this->rectorConfigProvider->shouldImportNames()) { return null; } diff --git a/src/Configuration/RectorConfigProvider.php b/src/Configuration/RectorConfigProvider.php new file mode 100644 index 00000000000..e79a026e539 --- /dev/null +++ b/src/Configuration/RectorConfigProvider.php @@ -0,0 +1,24 @@ +parameterProvider->provideBoolParameter(Option::AUTO_IMPORT_NAMES); + } +} diff --git a/src/DependencyInjection/Loader/Configurator/RectorServiceConfigurator.php b/src/DependencyInjection/Loader/Configurator/RectorServiceConfigurator.php index 227980c5b0a..6975577b4a8 100644 --- a/src/DependencyInjection/Loader/Configurator/RectorServiceConfigurator.php +++ b/src/DependencyInjection/Loader/Configurator/RectorServiceConfigurator.php @@ -16,6 +16,7 @@ use Symfony\Component\DependencyInjection\Loader\Configurator\ServiceConfigurato final class RectorServiceConfigurator extends ServiceConfigurator { /** + * @deprecated Use @see \Rector\Config\RectorConfig instead * @param mixed[] $configuration */ public function configure(array $configuration): self diff --git a/utils/compiler/src/PhpScoper/StaticEasyPrefixer.php b/utils/compiler/src/PhpScoper/StaticEasyPrefixer.php index 7fb4d6a7037..4c4d4f90cb4 100644 --- a/utils/compiler/src/PhpScoper/StaticEasyPrefixer.php +++ b/utils/compiler/src/PhpScoper/StaticEasyPrefixer.php @@ -21,8 +21,6 @@ final class StaticEasyPrefixer 'Helmich\TypoScriptParser\Parser\Traverser\Traverser', // for usage in packages/Testing/PHPUnit/PlatformAgnosticAssertions.php 'PHPUnit\Framework\Constraint\IsEqual', - // part of public API - 'Symplify\PackageBuilder\Parameter\ParameterProvider', ]; /**