From 0f21039b5edc3113d4c0fe1fa055e22a10ae4097 Mon Sep 17 00:00:00 2001 From: Enzo Innocenzi Date: Wed, 22 Apr 2026 17:36:57 +0200 Subject: [PATCH] refactor(upgrade): move `Priority` fixer to Tempest 3.10 ruleset --- .../config/sets/level/up-to-tempest-310.php | 16 ++++++++++ packages/upgrade/config/sets/tempest310.php | 13 ++++++++ packages/upgrade/config/sets/tempest34.php | 2 -- .../upgrade/src/Set/TempestLevelSetList.php | 2 ++ packages/upgrade/src/Set/TempestSetList.php | 2 ++ .../UpdatePriorityImportsRector.php | 2 +- .../Fixtures/FullyQualifiedPriority.input.php | 0 .../PriorityNamespaceChange.input.php | 0 .../tests/Tempest310/Tempest310RectorTest.php | 31 +++++++++++++++++++ .../tests/Tempest310/tempest310_rector.php | 9 ++++++ .../tests/Tempest34/Tempest34RectorTest.php | 16 ---------- 11 files changed, 74 insertions(+), 19 deletions(-) create mode 100644 packages/upgrade/config/sets/level/up-to-tempest-310.php create mode 100644 packages/upgrade/config/sets/tempest310.php rename packages/upgrade/src/{Tempest34 => Tempest310}/UpdatePriorityImportsRector.php (96%) rename packages/upgrade/tests/{Tempest34 => Tempest310}/Fixtures/FullyQualifiedPriority.input.php (100%) rename packages/upgrade/tests/{Tempest34 => Tempest310}/Fixtures/PriorityNamespaceChange.input.php (100%) create mode 100644 packages/upgrade/tests/Tempest310/Tempest310RectorTest.php create mode 100644 packages/upgrade/tests/Tempest310/tempest310_rector.php diff --git a/packages/upgrade/config/sets/level/up-to-tempest-310.php b/packages/upgrade/config/sets/level/up-to-tempest-310.php new file mode 100644 index 000000000..b8babd1f9 --- /dev/null +++ b/packages/upgrade/config/sets/level/up-to-tempest-310.php @@ -0,0 +1,16 @@ +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 new file mode 100644 index 000000000..0a2b5bb71 --- /dev/null +++ b/packages/upgrade/config/sets/tempest310.php @@ -0,0 +1,13 @@ +rule(UpdatePriorityImportsRector::class); +}; diff --git a/packages/upgrade/config/sets/tempest34.php b/packages/upgrade/config/sets/tempest34.php index 67155d675..41d2aa0b0 100644 --- a/packages/upgrade/config/sets/tempest34.php +++ b/packages/upgrade/config/sets/tempest34.php @@ -5,7 +5,6 @@ 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); @@ -13,5 +12,4 @@ $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 index 14e0e3181..5b3a714c1 100644 --- 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 index 6e839e6b2..62833a203 100644 --- 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/Tempest34/UpdatePriorityImportsRector.php b/packages/upgrade/src/Tempest310/UpdatePriorityImportsRector.php similarity index 96% rename from packages/upgrade/src/Tempest34/UpdatePriorityImportsRector.php rename to packages/upgrade/src/Tempest310/UpdatePriorityImportsRector.php index 6964d94d4..4919860c6 100644 --- a/packages/upgrade/src/Tempest34/UpdatePriorityImportsRector.php +++ b/packages/upgrade/src/Tempest310/UpdatePriorityImportsRector.php @@ -1,6 +1,6 @@ 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 new file mode 100644 index 000000000..7e02437e4 --- /dev/null +++ b/packages/upgrade/tests/Tempest310/tempest310_rector.php @@ -0,0 +1,9 @@ +withSets([TempestSetList::TEMPEST_310]); diff --git a/packages/upgrade/tests/Tempest34/Tempest34RectorTest.php b/packages/upgrade/tests/Tempest34/Tempest34RectorTest.php index fd019c8c8..9720f726a 100644 --- 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