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
2 changes: 0 additions & 2 deletions phpstan.neon
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 1 addition & 9 deletions src/Bridge/SetProviderCollector.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;

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

/**
Expand Down
34 changes: 16 additions & 18 deletions src/Set/SetManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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[]
Expand All @@ -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;
}
}
40 changes: 0 additions & 40 deletions src/Set/SetProvider/CoreSetProvider.php

This file was deleted.

46 changes: 0 additions & 46 deletions src/Set/SetProvider/PHPSetProvider.php

This file was deleted.

Loading