Make NameScopeFactory simpler (#6092)

rectorphp · Jun 30, 2024 · ef33350 · ef33350
1 parent b94486c
commit ef33350
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 16 deletions.
diff --git a/src/DependencyInjection/LazyContainerFactory.php b/src/DependencyInjection/LazyContainerFactory.php
@@ -4,7 +4,6 @@
 
 namespace Rector\DependencyInjection;
 
-use Rector\PHPStanStaticTypeMapper\TypeMapper\StaticTypeMapper;
 use Doctrine\Inflector\Inflector;
 use Doctrine\Inflector\Rules\English\InflectorFactory;
 use Illuminate\Container\Container;
@@ -152,6 +151,7 @@
 use Rector\PHPStanStaticTypeMapper\TypeMapper\ParentStaticTypeMapper;
 use Rector\PHPStanStaticTypeMapper\TypeMapper\ResourceTypeMapper;
 use Rector\PHPStanStaticTypeMapper\TypeMapper\SelfObjectTypeMapper;
+use Rector\PHPStanStaticTypeMapper\TypeMapper\StaticTypeMapper;
 use Rector\PHPStanStaticTypeMapper\TypeMapper\StrictMixedTypeMapper;
 use Rector\PHPStanStaticTypeMapper\TypeMapper\StringTypeMapper;
 use Rector\PHPStanStaticTypeMapper\TypeMapper\ThisTypeMapper;

diff --git a/src/StaticTypeMapper/Naming/NameScopeFactory.php b/src/StaticTypeMapper/Naming/NameScopeFactory.php
@@ -42,21 +42,13 @@ public function createNameScopeFromNodeWithoutTemplateTypes(Node $node): NameSco
         return new NameScope($namespace, $usesAliasesToNames, $className);
     }
 
+    /**
+     * @api
+     * @deprecated Use createNameScopeFromNodeWithoutTemplateTypes() instead, as same
+     */
     public function createNameScopeFromNode(Node $node): NameScope
     {
-        $nameScope = $this->createNameScopeFromNodeWithoutTemplateTypes($node);
-
-        /** @var non-empty-string|null $namespace */
-        $namespace = $nameScope->getNamespace();
-
-        return new NameScope(
-            $namespace,
-            $nameScope->getUses(),
-            $nameScope->getClassName(),
-            null,
-            null
-            // $templateTypeMap
-        );
+        return $this->createNameScopeFromNodeWithoutTemplateTypes($node);
     }
 
     /**

diff --git a/src/StaticTypeMapper/StaticTypeMapper.php b/src/StaticTypeMapper/StaticTypeMapper.php
@@ -78,7 +78,7 @@ public function mapPHPStanPhpDocTypeToPHPStanType(PhpDocTagValueNode $phpDocTagV
 
     public function mapPHPStanPhpDocTypeNodeToPHPStanType(TypeNode $typeNode, Node $node): Type
     {
-        $nameScope = $this->nameScopeFactory->createNameScopeFromNode($node);
+        $nameScope = $this->nameScopeFactory->createNameScopeFromNodeWithoutTemplateTypes($node);
         return $this->phpDocTypeMapper->mapToPHPStanType($typeNode, $node, $nameScope);
     }
 }
diff --git a/tests/StaticTypeMapper/PhpDoc/PhpDocTypeMapperTest.php b/tests/StaticTypeMapper/PhpDoc/PhpDocTypeMapperTest.php
@@ -35,7 +35,7 @@ protected function setUp(): void
     public function test(TypeNode $typeNode, string $expectedPHPStanType): void
     {
         $nop = new Nop();
-        $nameScope = $this->nameScopeFactory->createNameScopeFromNode($nop);
+        $nameScope = $this->nameScopeFactory->createNameScopeFromNodeWithoutTemplateTypes($nop);
 
         $phpStanType = $this->phpDocTypeMapper->mapToPHPStanType($typeNode, $nop, $nameScope);
         $this->assertInstanceOf($expectedPHPStanType, $phpStanType);