diff --git a/config/set/php-polyfills.php b/config/set/php-polyfills.php index 53794b4824f..75f4759d898 100644 --- a/config/set/php-polyfills.php +++ b/config/set/php-polyfills.php @@ -11,7 +11,6 @@ use Rector\Php80\Rector\NotIdentical\StrContainsRector; use Rector\Php80\Rector\Ternary\GetDebugTypeRector; use Rector\Php83\Rector\BooleanAnd\JsonValidateRector; -use Rector\Php83\Rector\ClassMethod\AddOverrideAttributeToOverriddenMethodsRector; use Rector\Php84\Rector\Class_\DeprecatedAnnotationToDeprecatedAttributeRector; use Rector\Php84\Rector\Foreach_\ForeachToArrayAllRector; use Rector\Php84\Rector\Foreach_\ForeachToArrayAnyRector; @@ -34,7 +33,6 @@ // PHP 8.3 JsonValidateRector::class, - AddOverrideAttributeToOverriddenMethodsRector::class, // PHP 8.4 ForeachToArrayAllRector::class, diff --git a/config/set/php83.php b/config/set/php83.php index 1a056a87c05..76f9f7f7226 100644 --- a/config/set/php83.php +++ b/config/set/php83.php @@ -6,14 +6,12 @@ use Rector\Php83\Rector\BooleanAnd\JsonValidateRector; use Rector\Php83\Rector\Class_\ReadOnlyAnonymousClassRector; use Rector\Php83\Rector\ClassConst\AddTypeToConstRector; -use Rector\Php83\Rector\ClassMethod\AddOverrideAttributeToOverriddenMethodsRector; use Rector\Php83\Rector\FuncCall\CombineHostPortLdapUriRector; use Rector\Php83\Rector\FuncCall\DynamicClassConstFetchRector; use Rector\Php83\Rector\FuncCall\RemoveGetClassGetParentClassNoArgsRector; return static function (RectorConfig $rectorConfig): void { $rectorConfig->rules([ - AddOverrideAttributeToOverriddenMethodsRector::class, AddTypeToConstRector::class, CombineHostPortLdapUriRector::class, RemoveGetClassGetParentClassNoArgsRector::class, diff --git a/rules/Php83/Rector/ClassMethod/AddOverrideAttributeToOverriddenMethodsRector.php b/rules/Php83/Rector/ClassMethod/AddOverrideAttributeToOverriddenMethodsRector.php index 81b3ee9902e..b8399f26300 100644 --- a/rules/Php83/Rector/ClassMethod/AddOverrideAttributeToOverriddenMethodsRector.php +++ b/rules/Php83/Rector/ClassMethod/AddOverrideAttributeToOverriddenMethodsRector.php @@ -29,9 +29,7 @@ use Rector\Rector\AbstractRector; use Rector\ValueObject\MethodName; use Rector\ValueObject\PhpVersionFeature; -use Rector\ValueObject\PolyfillPackage; use Rector\VersionBonding\Contract\MinPhpVersionInterface; -use Rector\VersionBonding\Contract\RelatedPolyfillInterface; use Symplify\RuleDocGenerator\ValueObject\CodeSample\ConfiguredCodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; @@ -40,7 +38,7 @@ * * @see \Rector\Tests\Php83\Rector\ClassMethod\AddOverrideAttributeToOverriddenMethodsRector\AddOverrideAttributeToOverriddenMethodsRectorTest */ -final class AddOverrideAttributeToOverriddenMethodsRector extends AbstractRector implements MinPhpVersionInterface, RelatedPolyfillInterface, ConfigurableRectorInterface +final class AddOverrideAttributeToOverriddenMethodsRector extends AbstractRector implements MinPhpVersionInterface, ConfigurableRectorInterface { /** * @api @@ -228,11 +226,6 @@ public function provideMinPhpVersion(): int return PhpVersionFeature::OVERRIDE_ATTRIBUTE; } - public function providePolyfillPackage(): string - { - return PolyfillPackage::PHP_83; - } - /** * @param ClassReflection[] $parentClassReflections */ diff --git a/src/Bridge/SetProviderCollector.php b/src/Bridge/SetProviderCollector.php index 04d27a3353f..5d96f7342fc 100644 --- a/src/Bridge/SetProviderCollector.php +++ b/src/Bridge/SetProviderCollector.php @@ -23,16 +23,10 @@ final readonly class SetProviderCollector { /** - * @var SetProviderInterface[] + * @param SetProviderInterface[] $setProviders */ - private array $setProviders; - - /** - * @param SetProviderInterface[] $extraSetProviders - */ - public function __construct(array $extraSetProviders = []) + public function __construct(private array $setProviders = []) { - $this->setProviders = $extraSetProviders; } /**