wip

Author: brendt

…/src/Tempest2/RemoveUriImportsRector.php …/src/Tempest2/UpdateUriImportsRector.phppackages/upgrade/src/Tempest2/RemoveUriImportsRector.php renamed to packages/upgrade/src/Tempest2/UpdateUriImportsRector.php packages/upgrade/src/Tempest2/RemoveUriImportsRector.php renamed to packages/upgrade/src/Tempest2/UpdateUriImportsRector.php

@@ -3,10 +3,9 @@
 namespace Tempest\Upgrade\Tempest2;
 
 use PhpParser\Node;
-use PhpParser\NodeVisitor;
 use Rector\Rector\AbstractRector;
 
-final class RemoveUriImportsRector extends AbstractRector
+final class UpdateUriImportsRector extends AbstractRector
 {
     public function getNodeTypes(): array
     {
@@ -21,8 +20,12 @@ public function refactor(Node $node): ?int
             return null;
         }
 
-        if ($node->name->toString() === 'Tempest\uri' || $node->name->toString() === 'Tempest\is_current_uri') {
-            return NodeVisitor::REMOVE_NODE;
+        if ($node->name->toString() === 'Tempest\uri') {
+            $node->name = new Node\Name('Tempest\Router\uri');
+        }
+
+        if ($node->name->toString() === 'Tempest\is_current_uri') {
+            $node->name = new Node\Name('Tempest\Router\is_current_uri');
         }
 
         return null;

packages/upgrade/src/tempest2.php

@@ -8,18 +8,14 @@
 use Tempest\Upgrade\Tempest2\MigrationRector;
 use Tempest\Upgrade\Tempest2\RemoveDatabaseMigrationImportRector;
 use Tempest\Upgrade\Tempest2\RemoveIdImportRector;
-use Tempest\Upgrade\Tempest2\RemoveUriImportsRector;
+use Tempest\Upgrade\Tempest2\UpdateUriImportsRector;
 
 return static function (RectorConfig $config): void {
     $config->importNames();
     $config->importShortClasses();
 
     $config->rule(MigrationRector::class);
-
-    $config->ruleWithConfiguration(RenameFunctionRector::class, [
-        'Tempest\uri' => 'Tempest\Router\uri',
-        'Tempest\is_current_uri' => 'Tempest\Router\is_current_uri',
-    ]);
+    $config->rule(UpdateUriImportsRector::class);
 
     $config->ruleWithConfiguration(RenameClassRector::class, [
         'Tempest\Database\Id' => 'Tempest\Database\PrimaryKey',
@@ -72,5 +68,4 @@
 
     $config->rule(RemoveIdImportRector::class);
     $config->rule(RemoveDatabaseMigrationImportRector::class);
-    $config->rule(RemoveUriImportsRector::class);
 };