From 6780cf762611e2c26b93b00ee8ca26410597bc4d Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Sat, 8 Aug 2026 06:34:30 +0200 Subject: [PATCH] [deprecated] remove php + core set provider, no longer used --- phpstan.neon | 2 -- src/Bridge/SetProviderCollector.php | 10 +----- src/Set/SetManager.php | 34 +++++++++--------- src/Set/SetProvider/CoreSetProvider.php | 40 --------------------- src/Set/SetProvider/PHPSetProvider.php | 46 ------------------------- 5 files changed, 17 insertions(+), 115 deletions(-) delete mode 100644 src/Set/SetProvider/CoreSetProvider.php delete mode 100644 src/Set/SetProvider/PHPSetProvider.php diff --git a/phpstan.neon b/phpstan.neon index 4f4285e8116..aa10f8f83ad 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -326,8 +326,6 @@ parameters: message: '#deprecated (class|interface) Rector\\(Set|Bridge)\\#' paths: - src/Set/SetManager.php - - src/Set/SetProvider/CoreSetProvider.php - - src/Set/SetProvider/PHPSetProvider.php - src/Bridge/SetProviderCollector.php - src/Configuration/RectorConfigBuilder.php - tests/Set/ValueObject/ComposerTriggeredSetTest.php diff --git a/src/Bridge/SetProviderCollector.php b/src/Bridge/SetProviderCollector.php index 0580e8ef1f4..04d27a3353f 100644 --- a/src/Bridge/SetProviderCollector.php +++ b/src/Bridge/SetProviderCollector.php @@ -6,8 +6,6 @@ use Rector\Set\Contract\SetInterface; use Rector\Set\Contract\SetProviderInterface; -use Rector\Set\SetProvider\CoreSetProvider; -use Rector\Set\SetProvider\PHPSetProvider; use Rector\Set\ValueObject\ComposerTriggeredSet; /** @@ -34,13 +32,7 @@ */ public function __construct(array $extraSetProviders = []) { - $setProviders = [ - // register all known set providers here - new PHPSetProvider(), - new CoreSetProvider(), - ]; - - $this->setProviders = array_merge($setProviders, $extraSetProviders); + $this->setProviders = $extraSetProviders; } /** diff --git a/src/Set/SetManager.php b/src/Set/SetManager.php index 22d6f04fdea..f8cdb37f936 100644 --- a/src/Set/SetManager.php +++ b/src/Set/SetManager.php @@ -10,8 +10,6 @@ use Rector\Set\ValueObject\ComposerTriggeredSet; /** - * @see \Rector\Tests\Set\SetManager\SetManagerTest - * * @deprecated Bond the rules themselves instead, by implementing the ComposerPackageConstraintInterface. A set * described as an object only existed to be matched against the installed packages; a bonded rule states the exact * package version its target API is available from and applies from there upwards, so a plain set file is enough. @@ -27,22 +25,6 @@ public function __construct( ) { } - /** - * @return ComposerTriggeredSet[] - */ - public function matchComposerTriggered(string $groupName): array - { - $matchedSets = []; - - foreach ($this->setProviderCollector->provideComposerTriggeredSets() as $composerTriggeredSet) { - if ($composerTriggeredSet->getGroupName() === $groupName) { - $matchedSets[] = $composerTriggeredSet; - } - } - - return $matchedSets; - } - /** * @param SetGroup::*[] $setGroups * @return string[] @@ -65,4 +47,20 @@ public function matchBySetGroups(array $setGroups): array return $groupLoadedSets; } + + /** + * @return ComposerTriggeredSet[] + */ + private function matchComposerTriggered(string $groupName): array + { + $matchedSets = []; + + foreach ($this->setProviderCollector->provideComposerTriggeredSets() as $composerTriggeredSet) { + if ($composerTriggeredSet->getGroupName() === $groupName) { + $matchedSets[] = $composerTriggeredSet; + } + } + + return $matchedSets; + } } diff --git a/src/Set/SetProvider/CoreSetProvider.php b/src/Set/SetProvider/CoreSetProvider.php deleted file mode 100644 index 04b80d582f8..00000000000 --- a/src/Set/SetProvider/CoreSetProvider.php +++ /dev/null @@ -1,40 +0,0 @@ -