Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 0 additions & 62 deletions packages/Config/RectorConfig.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand All @@ -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);
}

Expand All @@ -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);
}

Expand All @@ -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);
}

Expand All @@ -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);
}

Expand Down Expand Up @@ -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);
}

Expand All @@ -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);
}

Expand All @@ -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);
}

Expand All @@ -265,19 +219,13 @@ public function fileExtensions(array $extensions): void
{
Assert::allString($extensions);

$parameters = $this->parameters();
$parameters->set(Option::FILE_EXTENSIONS, $extensions);

SimpleParameterProvider::setParameter(Option::FILE_EXTENSIONS, $extensions);
}

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);
}

Expand All @@ -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);
}

Expand All @@ -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);
}

Expand All @@ -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);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
9 changes: 6 additions & 3 deletions rules/Privatization/Guard/OverrideByParentClassGuard.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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) {
Expand All @@ -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));
}
Expand Down
5 changes: 3 additions & 2 deletions src/NodeAnalyzer/MagicClassMethodAnalyzer.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down