refactor(upgrade): move Priority fixer to Tempest 3.10 ruleset (#2125)

innocenzi · web-flow · commit 43592b7c5788 · 2026-04-22T18:03:35.000+02:00
diff --git a/packages/upgrade/config/sets/level/up-to-tempest-310.php b/packages/upgrade/config/sets/level/up-to-tempest-310.php
@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+use Rector\Config\RectorConfig;
+use Tempest\Upgrade\Set\TempestSetList;
+
+return static function (RectorConfig $config): void {
+    $config->sets([
+        TempestSetList::TEMPEST_20,
+        TempestSetList::TEMPEST_28,
+        TempestSetList::TEMPEST_30,
+        TempestSetList::TEMPEST_34,
+        TempestSetList::TEMPEST_310,
+    ]);
+};
diff --git a/packages/upgrade/config/sets/tempest310.php b/packages/upgrade/config/sets/tempest310.php
@@ -0,0 +1,13 @@
+<?php
+
+use Rector\Config\RectorConfig;
+use Rector\Configuration\Option;
+use Rector\Configuration\Parameter\SimpleParameterProvider;
+use Tempest\Upgrade\Tempest310\UpdatePriorityImportsRector;
+
+return static function (RectorConfig $config): void {
+    SimpleParameterProvider::setParameter(Option::AUTO_IMPORT_NAMES, value: true);
+    SimpleParameterProvider::setParameter(Option::IMPORT_SHORT_CLASSES, value: true);
+
+    $config->rule(UpdatePriorityImportsRector::class);
+};
diff --git a/packages/upgrade/config/sets/tempest34.php b/packages/upgrade/config/sets/tempest34.php
@@ -5,13 +5,11 @@
 use Rector\Configuration\Parameter\SimpleParameterProvider;
 use Tempest\Upgrade\Tempest34\UpdateDiscoveryImportsRector;
 use Tempest\Upgrade\Tempest34\UpdateKernelDiscoveryPropertiesRector;
-use Tempest\Upgrade\Tempest34\UpdatePriorityImportsRector;
 
 return static function (RectorConfig $config): void {
     SimpleParameterProvider::setParameter(Option::AUTO_IMPORT_NAMES, value: true);
     SimpleParameterProvider::setParameter(Option::IMPORT_SHORT_CLASSES, value: true);
 
     $config->rule(UpdateDiscoveryImportsRector::class);
     $config->rule(UpdateKernelDiscoveryPropertiesRector::class);
-    $config->rule(UpdatePriorityImportsRector::class);
 };
diff --git a/packages/upgrade/src/Set/TempestLevelSetList.php b/packages/upgrade/src/Set/TempestLevelSetList.php
@@ -13,4 +13,6 @@ final class TempestLevelSetList
     public const string UP_TO_TEMPEST_30 = __DIR__ . '/../../config/sets/level/up-to-tempest-30.php';
 
     public const string UP_TO_TEMPEST_34 = __DIR__ . '/../../config/sets/level/up-to-tempest-34.php';
+
+    public const string UP_TO_TEMPEST_310 = __DIR__ . '/../../config/sets/level/up-to-tempest-310.php';
 }
diff --git a/packages/upgrade/src/Set/TempestSetList.php b/packages/upgrade/src/Set/TempestSetList.php
@@ -13,4 +13,6 @@ final class TempestSetList
     public const string TEMPEST_30 = __DIR__ . '/../../config/sets/tempest30.php';
 
     public const string TEMPEST_34 = __DIR__ . '/../../config/sets/tempest34.php';
+
+    public const string TEMPEST_310 = __DIR__ . '/../../config/sets/tempest310.php';
 }
diff --git a/packages/upgrade/src/Tempest310/UpdatePriorityImportsRector.php b/packages/upgrade/src/Tempest310/UpdatePriorityImportsRector.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tempest\Upgrade\Tempest34;
+namespace Tempest\Upgrade\Tempest310;
 
 use PhpParser\Node;
 use PhpParser\Node\Name;
diff --git a/packages/upgrade/tests/Tempest310/Fixtures/FullyQualifiedPriority.input.php b/packages/upgrade/tests/Tempest310/Fixtures/FullyQualifiedPriority.input.php
diff --git a/packages/upgrade/tests/Tempest310/Fixtures/PriorityNamespaceChange.input.php b/packages/upgrade/tests/Tempest310/Fixtures/PriorityNamespaceChange.input.php
diff --git a/packages/upgrade/tests/Tempest310/Tempest310RectorTest.php b/packages/upgrade/tests/Tempest310/Tempest310RectorTest.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace Tempest\Upgrade\Tests\Tempest310;
+
+use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses;
+use PHPUnit\Framework\TestCase;
+use Tempest\Upgrade\Tests\RectorTester;
+
+#[RunTestsInSeparateProcesses]
+final class Tempest310RectorTest extends TestCase
+{
+    private RectorTester $rector {
+        get => new RectorTester(__DIR__ . '/tempest310_rector.php');
+    }
+
+    public function test_priority_namespace_change(): void
+    {
+        $this->rector
+            ->runFixture(__DIR__ . '/Fixtures/PriorityNamespaceChange.input.php')
+            ->assertContains('use Tempest\Support\Priority;')
+            ->assertNotContains('use Tempest\Core\Priority;');
+    }
+
+    public function test_fully_qualified_priority(): void
+    {
+        $this->rector
+            ->runFixture(__DIR__ . '/Fixtures/FullyQualifiedPriority.input.php')
+            ->assertContains('Tempest\Support\Priority')
+            ->assertNotContains('Tempest\Core\Priority');
+    }
+}
diff --git a/packages/upgrade/tests/Tempest310/tempest310_rector.php b/packages/upgrade/tests/Tempest310/tempest310_rector.php
@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+use Rector\Config\RectorConfig;
+use Tempest\Upgrade\Set\TempestSetList;
+
+return RectorConfig::configure()
+    ->withSets([TempestSetList::TEMPEST_310]);
diff --git a/packages/upgrade/tests/Tempest34/Tempest34RectorTest.php b/packages/upgrade/tests/Tempest34/Tempest34RectorTest.php
@@ -77,22 +77,6 @@ public function test_fully_qualified_discovery_cache(): void
             ->assertNotContains('Tempest\Core\DiscoveryCache');
     }
 
-    public function test_priority_namespace_change(): void
-    {
-        $this->rector
-            ->runFixture(__DIR__ . '/Fixtures/PriorityNamespaceChange.input.php')
-            ->assertContains('use Tempest\Support\Priority;')
-            ->assertNotContains('use Tempest\Core\Priority;');
-    }
-
-    public function test_fully_qualified_priority(): void
-    {
-        $this->rector
-            ->runFixture(__DIR__ . '/Fixtures/FullyQualifiedPriority.input.php')
-            ->assertContains('Tempest\Support\Priority')
-            ->assertNotContains('Tempest\Core\Priority');
-    }
-
     public function test_kernel_discovery_locations_refactored(): void
     {
         $this->rector

Original file line number	Diff line number	Diff line change
`@@ -13,4 +13,6 @@ final class TempestLevelSetList`
`13`	`13`	`public const string UP_TO_TEMPEST_30 = __DIR__ . '/../../config/sets/level/up-to-tempest-30.php';`
`14`	`14`
`15`	`15`	`public const string UP_TO_TEMPEST_34 = __DIR__ . '/../../config/sets/level/up-to-tempest-34.php';`
	`16`	`+`
	`17`	`+ public const string UP_TO_TEMPEST_310 = __DIR__ . '/../../config/sets/level/up-to-tempest-310.php';`
`16`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,4 +13,6 @@ final class TempestSetList`
`13`	`13`	`public const string TEMPEST_30 = __DIR__ . '/../../config/sets/tempest30.php';`
`14`	`14`
`15`	`15`	`public const string TEMPEST_34 = __DIR__ . '/../../config/sets/tempest34.php';`
	`16`	`+`
	`17`	`+ public const string TEMPEST_310 = __DIR__ . '/../../config/sets/tempest310.php';`
`16`	`18`	`}`