[Configuration] Use TwigSetProvider from rector-symfony (#5992)

* Remove new TwigSetProvider() on RectorConfig::configure() * register on twig
rectorphp · Jun 21, 2024 · 6b11f63 · 6b11f63
1 parent cecb60d
commit 6b11f63
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 32 deletions.
diff --git a/src/Config/RectorConfig.php b/src/Config/RectorConfig.php
@@ -14,7 +14,6 @@
 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;
@@ -42,10 +41,7 @@ final class RectorConfig extends Container
 
     public static function configure(): RectorConfigBuilder
     {
-        $rectorConfigBuilder = new RectorConfigBuilder();
-        $rectorConfigBuilder->withSetProviders([new TwigSetProvider()]);
-
-        return $rectorConfigBuilder;
+        return new RectorConfigBuilder();
     }
 
     /**

diff --git a/src/Configuration/RectorConfigBuilder.php b/src/Configuration/RectorConfigBuilder.php
@@ -27,6 +27,7 @@
 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 Symfony\Component\Finder\Finder;
@@ -659,6 +660,7 @@ public function withPreparedSets(
         // @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