diff --git a/packages/Config/RectorConfig.php b/packages/Config/RectorConfig.php index 117c2f647a5..d9fc4160b27 100644 --- a/packages/Config/RectorConfig.php +++ b/packages/Config/RectorConfig.php @@ -35,9 +35,6 @@ public function paths(array $paths): void { Assert::allString($paths); - $parameters = $this->parameters(); - $parameters->set(Option::PATHS, $paths); - SimpleParameterProvider::setParameter(Option::PATHS, $paths); } @@ -56,42 +53,24 @@ public function sets(array $sets): void public function disableParallel(): void { - $parameters = $this->parameters(); - - $parameters->set(Option::PARALLEL, false); SimpleParameterProvider::setParameter(Option::PARALLEL, false); } public function parallel(int $seconds = 120, int $maxNumberOfProcess = 16, int $jobSize = 20): void { - $parameters = $this->parameters(); - - $parameters->set(Option::PARALLEL, true); SimpleParameterProvider::setParameter(Option::PARALLEL, true); - - $parameters->set(Option::PARALLEL_JOB_TIMEOUT_IN_SECONDS, $seconds); SimpleParameterProvider::setParameter(Option::PARALLEL_JOB_TIMEOUT_IN_SECONDS, $seconds); - - $parameters->set(Option::PARALLEL_MAX_NUMBER_OF_PROCESSES, $maxNumberOfProcess); SimpleParameterProvider::setParameter(Option::PARALLEL_MAX_NUMBER_OF_PROCESSES, $maxNumberOfProcess); - - $parameters->set(Option::PARALLEL_JOB_SIZE, $jobSize); SimpleParameterProvider::setParameter(Option::PARALLEL_JOB_SIZE, $jobSize); } public function noDiffs(): void { - $parameters = $this->parameters(); - $parameters->set(Option::NO_DIFFS, true); - SimpleParameterProvider::setParameter(Option::NO_DIFFS, true); } public function memoryLimit(string $memoryLimit): void { - $parameters = $this->parameters(); - $parameters->set(Option::MEMORY_LIMIT, $memoryLimit); - SimpleParameterProvider::setParameter(Option::MEMORY_LIMIT, $memoryLimit); } @@ -100,9 +79,6 @@ public function memoryLimit(string $memoryLimit): void */ public function skip(array $criteria): void { - $parameters = $this->parameters(); - $parameters->set(Option::SKIP, $criteria); - SimpleParameterProvider::addParameter(Option::SKIP, $criteria); } @@ -113,11 +89,7 @@ public function removeUnusedImports(bool $removeUnusedImports = true): void public function importNames(bool $importNames = true, bool $importDocBlockNames = true): void { - $parameters = $this->parameters(); - - $parameters->set(Option::AUTO_IMPORT_NAMES, $importNames); SimpleParameterProvider::setParameter(Option::AUTO_IMPORT_NAMES, $importNames); - SimpleParameterProvider::setParameter(Option::AUTO_IMPORT_DOC_BLOCK_NAMES, $importDocBlockNames); } @@ -134,9 +106,6 @@ public function phpstanConfig(string $filePath): void { Assert::fileExists($filePath); - $parameters = $this->parameters(); - $parameters->set(Option::PHPSTAN_FOR_RECTOR_PATH, $filePath); - SimpleParameterProvider::setParameter(Option::PHPSTAN_FOR_RECTOR_PATH, $filePath); } @@ -210,9 +179,6 @@ public function rules(array $rectorClasses): void */ public function phpVersion(int $phpVersion): void { - $parameters = $this->parameters(); - $parameters->set(Option::PHP_VERSION_FEATURES, $phpVersion); - SimpleParameterProvider::setParameter(Option::PHP_VERSION_FEATURES, $phpVersion); } @@ -223,9 +189,6 @@ public function autoloadPaths(array $autoloadPaths): void { Assert::allString($autoloadPaths); - $parameters = $this->parameters(); - $parameters->set(Option::AUTOLOAD_PATHS, $autoloadPaths); - SimpleParameterProvider::setParameter(Option::AUTOLOAD_PATHS, $autoloadPaths); } @@ -236,25 +199,16 @@ public function bootstrapFiles(array $bootstrapFiles): void { Assert::allString($bootstrapFiles); - $parameters = $this->parameters(); - $parameters->set(Option::BOOTSTRAP_FILES, $bootstrapFiles); - SimpleParameterProvider::setParameter(Option::BOOTSTRAP_FILES, $bootstrapFiles); } public function symfonyContainerXml(string $filePath): void { - $parameters = $this->parameters(); - $parameters->set(Option::SYMFONY_CONTAINER_XML_PATH_PARAMETER, $filePath); - SimpleParameterProvider::setParameter(Option::SYMFONY_CONTAINER_XML_PATH_PARAMETER, $filePath); } public function symfonyContainerPhp(string $filePath): void { - $parameters = $this->parameters(); - $parameters->set(Option::SYMFONY_CONTAINER_PHP_PATH_PARAMETER, $filePath); - SimpleParameterProvider::setParameter(Option::SYMFONY_CONTAINER_PHP_PATH_PARAMETER, $filePath); } @@ -265,9 +219,6 @@ public function fileExtensions(array $extensions): void { Assert::allString($extensions); - $parameters = $this->parameters(); - $parameters->set(Option::FILE_EXTENSIONS, $extensions); - SimpleParameterProvider::setParameter(Option::FILE_EXTENSIONS, $extensions); } @@ -275,9 +226,6 @@ public function cacheDirectory(string $directoryPath): void { // cache directory path is created via mkdir in CacheFactory // when not exists, so no need to validate $directoryPath is a directory - $parameters = $this->parameters(); - $parameters->set(Option::CACHE_DIR, $directoryPath); - SimpleParameterProvider::setParameter(Option::CACHE_DIR, $directoryPath); } @@ -286,9 +234,6 @@ public function containerCacheDirectory(string $directoryPath): void // container cache directory path must be a directory on the first place Assert::directory($directoryPath); - $parameters = $this->parameters(); - $parameters->set(Option::CONTAINER_CACHE_DIRECTORY, $directoryPath); - SimpleParameterProvider::setParameter(Option::CONTAINER_CACHE_DIRECTORY, $directoryPath); } @@ -299,9 +244,6 @@ public function cacheClass(string $cacheClass): void { Assert::isAOf($cacheClass, CacheStorageInterface::class); - $parameters = $this->parameters(); - $parameters->set(Option::CACHE_CLASS, $cacheClass); - SimpleParameterProvider::setParameter(Option::CACHE_CLASS, $cacheClass); } @@ -310,12 +252,8 @@ public function cacheClass(string $cacheClass): void */ public function indent(string $character, int $count): void { - $parameters = $this->parameters(); - - $parameters->set(Option::INDENT_CHAR, $character); SimpleParameterProvider::setParameter(Option::INDENT_CHAR, $character); - $parameters->set(Option::INDENT_SIZE, $count); SimpleParameterProvider::setParameter(Option::INDENT_SIZE, $count); } diff --git a/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/config/configured_rule.php b/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/config/configured_rule.php index fc93a42aaa1..ad181130f33 100644 --- a/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/config/configured_rule.php +++ b/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/config/configured_rule.php @@ -2,8 +2,8 @@ declare(strict_types=1); -use Rector\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector; use Rector\Config\RectorConfig; +use Rector\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector; return static function (RectorConfig $rectorConfig): void { $rectorConfig->rule(ReturnTypeFromStrictScalarReturnExprRector::class); diff --git a/rules/Privatization/Guard/OverrideByParentClassGuard.php b/rules/Privatization/Guard/OverrideByParentClassGuard.php index cea1fe5a784..fed93fa9bac 100644 --- a/rules/Privatization/Guard/OverrideByParentClassGuard.php +++ b/rules/Privatization/Guard/OverrideByParentClassGuard.php @@ -13,13 +13,16 @@ */ final class OverrideByParentClassGuard { - public function __construct(private readonly ReflectionProvider $reflectionProvider) - { + public function __construct( + private readonly ReflectionProvider $reflectionProvider + ) { } public function isLegal(Class_ $class): bool { - if ($class->extends instanceof FullyQualified && ! $this->reflectionProvider->hasClass($class->extends->toString())) { + if ($class->extends instanceof FullyQualified && ! $this->reflectionProvider->hasClass( + $class->extends->toString() + )) { return false; } diff --git a/rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictTypedCallRector.php b/rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictTypedCallRector.php index 9204d50602a..eb14de7e3cf 100644 --- a/rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictTypedCallRector.php +++ b/rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictTypedCallRector.php @@ -166,7 +166,10 @@ private function shouldSkip(ClassMethod | Function_ | Closure $node, Scope $scop return true; } - if ($node instanceof ClassMethod && $this->classMethodReturnTypeOverrideGuard->shouldSkipClassMethod($node, $scope)) { + if ($node instanceof ClassMethod && $this->classMethodReturnTypeOverrideGuard->shouldSkipClassMethod( + $node, + $scope + )) { return true; } diff --git a/src/DependencyInjection/CompilerPass/RemoveSkippedRectorsCompilerPass.php b/src/DependencyInjection/CompilerPass/RemoveSkippedRectorsCompilerPass.php index a8bb5ec47b0..106109d8145 100644 --- a/src/DependencyInjection/CompilerPass/RemoveSkippedRectorsCompilerPass.php +++ b/src/DependencyInjection/CompilerPass/RemoveSkippedRectorsCompilerPass.php @@ -5,6 +5,7 @@ namespace Rector\Core\DependencyInjection\CompilerPass; use Rector\Core\Configuration\Option; +use Rector\Core\Configuration\Parameter\SimpleParameterProvider; use Rector\Core\Contract\Rector\RectorInterface; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; use Symfony\Component\DependencyInjection\ContainerBuilder; @@ -17,7 +18,7 @@ final class RemoveSkippedRectorsCompilerPass implements CompilerPassInterface { public function process(ContainerBuilder $containerBuilder): void { - $skippedRectorClasses = $this->resolveSkippedRectorClasses($containerBuilder); + $skippedRectorClasses = $this->resolveSkippedRectorClasses(); foreach ($containerBuilder->getDefinitions() as $id => $definition) { if ($definition->getClass() === null) { @@ -35,9 +36,9 @@ public function process(ContainerBuilder $containerBuilder): void /** * @return string[] */ - private function resolveSkippedRectorClasses(ContainerBuilder $containerBuilder): array + private function resolveSkippedRectorClasses(): array { - $skipParameters = (array) $containerBuilder->getParameter(Option::SKIP); + $skipParameters = SimpleParameterProvider::provideArrayParameter(Option::SKIP); return array_filter($skipParameters, fn ($element): bool => $this->isRectorClass($element)); } diff --git a/src/NodeAnalyzer/MagicClassMethodAnalyzer.php b/src/NodeAnalyzer/MagicClassMethodAnalyzer.php index ddd69598037..ceff91abf31 100644 --- a/src/NodeAnalyzer/MagicClassMethodAnalyzer.php +++ b/src/NodeAnalyzer/MagicClassMethodAnalyzer.php @@ -10,8 +10,9 @@ final class MagicClassMethodAnalyzer { - public function __construct(private readonly NodeNameResolver $nodeNameResolver) - { + public function __construct( + private readonly NodeNameResolver $nodeNameResolver + ) { } public function isUnsafeOverridden(ClassMethod $classMethod): bool