[tests] Improve resetable interface call (#4834)

rectorphp · Aug 23, 2023 · c73bc29 · c73bc29
1 parent 37be2c2
commit c73bc29
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/packages-tests/Skipper/Skipper/SkipperRectorRuleTest.php b/packages-tests/Skipper/Skipper/SkipperRectorRuleTest.php
@@ -20,7 +20,6 @@ protected function setUp(): void
         self::$rectorConfig = null;
     }
 
-
     protected function tearDown(): void
     {
         // cleanup configuration

diff --git a/packages/Testing/PHPUnit/AbstractRectorTestCase.php b/packages/Testing/PHPUnit/AbstractRectorTestCase.php
@@ -16,7 +16,7 @@
 use Rector\Core\Configuration\ConfigurationFactory;
 use Rector\Core\Configuration\Option;
 use Rector\Core\Configuration\Parameter\SimpleParameterProvider;
-use Rector\Core\Configuration\RenamedClassesDataCollector;
+use Rector\Core\Contract\DependencyInjection\ResetableInterface;
 use Rector\Core\Contract\Rector\RectorInterface;
 use Rector\Core\Exception\ShouldNotHappenException;
 use Rector\Core\PhpParser\NodeTraverser\RectorNodeTraverser;
@@ -70,9 +70,13 @@ protected function setUp(): void
         $cacheKey = sha1($configFile . static::class);
 
         if (! isset(self::$cacheByRuleAndConfig[$cacheKey])) {
-            // reset class rename
-            $renamedClassesDataCollector = $rectorConfig->make(RenamedClassesDataCollector::class);
-            $renamedClassesDataCollector->reset();
+            // reset
+            /** @var RewindableGenerator<int, ResetableInterface> $resetables */
+            $resetables = $rectorConfig->tagged(ResetableInterface::class);
+            foreach ($resetables as $resetable) {
+                /** @var ResetableInterface $resetable */
+                $resetable->reset();
+            }
 
             $this->forgetRectorsRules();