diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php index 46e39a54bbf..efb9a0ce7bb 100644 --- a/src/Application/VersionResolver.php +++ b/src/Application/VersionResolver.php @@ -19,12 +19,12 @@ final class VersionResolver * @api * @var string */ - public const PACKAGE_VERSION = 'cecb60da20dfbe57e70ac43d606eba711aed4e8c'; + public const PACKAGE_VERSION = '6b11f63e63fc75ea80a4ee609f3e175863305b6f'; /** * @api * @var string */ - public const RELEASE_DATE = '2024-06-21 00:15:57'; + public const RELEASE_DATE = '2024-06-21 02:25:42'; /** * @var int */ diff --git a/src/Config/RectorConfig.php b/src/Config/RectorConfig.php index 47f0a3a0a65..dc8bf3d62bf 100644 --- a/src/Config/RectorConfig.php +++ b/src/Config/RectorConfig.php @@ -13,7 +13,6 @@ use Rector\Contract\Rector\ConfigurableRectorInterface; use Rector\Contract\Rector\RectorInterface; use Rector\DependencyInjection\Laravel\ContainerMemento; use Rector\Exception\ShouldNotHappenException; -use Rector\Set\SetProvider\TwigSetProvider; use Rector\Skipper\SkipCriteriaResolver\SkippedClassResolver; use Rector\Validation\RectorConfigValidator; use Rector\ValueObject\PhpVersion; @@ -38,9 +37,7 @@ final class RectorConfig extends Container private $autotagInterfaces = [Command::class]; public static function configure() : RectorConfigBuilder { - $rectorConfigBuilder = new RectorConfigBuilder(); - $rectorConfigBuilder->withSetProviders([new TwigSetProvider()]); - return $rectorConfigBuilder; + return new RectorConfigBuilder(); } /** * @param string[] $paths diff --git a/src/Configuration/RectorConfigBuilder.php b/src/Configuration/RectorConfigBuilder.php index d084985147f..12e1dbb3a9f 100644 --- a/src/Configuration/RectorConfigBuilder.php +++ b/src/Configuration/RectorConfigBuilder.php @@ -26,6 +26,7 @@ use Rector\Set\ValueObject\SetList; use Rector\Symfony\Set\FOSRestSetList; use Rector\Symfony\Set\JMSSetList; use Rector\Symfony\Set\SensiolabsSetList; +use Rector\Symfony\Set\SetProvider\TwigSetProvider; use Rector\Symfony\Set\SymfonySetList; use Rector\ValueObject\PhpVersion; use RectorPrefix202406\Symfony\Component\Finder\Finder; @@ -539,6 +540,7 @@ final class RectorConfigBuilder // @experimental 2024-06 if ($twig) { $this->setGroups[] = SetGroup::TWIG; + $this->withSetProviders([new TwigSetProvider()]); } return $this; } diff --git a/src/Set/SetProvider/TwigSetProvider.php b/src/Set/SetProvider/TwigSetProvider.php deleted file mode 100644 index a9cbe82fe8e..00000000000 --- a/src/Set/SetProvider/TwigSetProvider.php +++ /dev/null @@ -1,25 +0,0 @@ - $baseDir . '/src/Set/Contract/SetProviderInterface.php', 'Rector\\Set\\Enum\\SetGroup' => $baseDir . '/src/Set/Enum/SetGroup.php', 'Rector\\Set\\SetManager' => $baseDir . '/src/Set/SetManager.php', - 'Rector\\Set\\SetProvider\\TwigSetProvider' => $baseDir . '/src/Set/SetProvider/TwigSetProvider.php', 'Rector\\Set\\ValueObject\\ComposerTriggeredSet' => $baseDir . '/src/Set/ValueObject/ComposerTriggeredSet.php', 'Rector\\Set\\ValueObject\\DowngradeLevelSetList' => $vendorDir . '/rector/rector-downgrade-php/src/Set/ValueObject/DowngradeLevelSetList.php', 'Rector\\Set\\ValueObject\\DowngradeSetList' => $vendorDir . '/rector/rector-downgrade-php/src/Set/ValueObject/DowngradeSetList.php', diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index 619d06906b3..e1871ee1943 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -2288,7 +2288,6 @@ class ComposerStaticInitc6bcdb63495c7f1cc77baa21ee134e8a 'Rector\\Set\\Contract\\SetProviderInterface' => __DIR__ . '/../..' . '/src/Set/Contract/SetProviderInterface.php', 'Rector\\Set\\Enum\\SetGroup' => __DIR__ . '/../..' . '/src/Set/Enum/SetGroup.php', 'Rector\\Set\\SetManager' => __DIR__ . '/../..' . '/src/Set/SetManager.php', - 'Rector\\Set\\SetProvider\\TwigSetProvider' => __DIR__ . '/../..' . '/src/Set/SetProvider/TwigSetProvider.php', 'Rector\\Set\\ValueObject\\ComposerTriggeredSet' => __DIR__ . '/../..' . '/src/Set/ValueObject/ComposerTriggeredSet.php', 'Rector\\Set\\ValueObject\\DowngradeLevelSetList' => __DIR__ . '/..' . '/rector/rector-downgrade-php/src/Set/ValueObject/DowngradeLevelSetList.php', 'Rector\\Set\\ValueObject\\DowngradeSetList' => __DIR__ . '/..' . '/rector/rector-downgrade-php/src/Set/ValueObject/DowngradeSetList.php',