use scalar

rectorphp · Jun 30, 2024 · c053b91 · c053b91
1 parent 554cad9
commit c053b91
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/StaticTypeMapper/Naming/NameScopeFactory.php b/src/StaticTypeMapper/Naming/NameScopeFactory.php
@@ -66,7 +66,7 @@ public function createNameScopeFromNodeWithoutTemplateTypes(Node $node): NameSco
     public function createNameScopeFromNode(Node $node): NameScope
     {
         $nameScope = $this->createNameScopeFromNodeWithoutTemplateTypes($node);
-        $templateTypeMap = $this->templateTemplateTypeMap($node);
+        //        $templateTypeMap = $this->templateTemplateTypeMap($node);
         /** @var non-empty-string|null $namespace */
         $namespace = $nameScope->getNamespace();
 
@@ -75,7 +75,8 @@ public function createNameScopeFromNode(Node $node): NameScope
             $nameScope->getUses(),
             $nameScope->getClassName(),
             null,
-            $templateTypeMap
+            null
+            // $templateTypeMap
         );
     }
 

diff --git a/tests/Issues/IssueConditionalType/Fixture/fixture.php.inc b/tests/Issues/IssueConditionalType/Fixture/fixture.php.inc
@@ -25,7 +25,7 @@ class Fixture
     /**
      * @template TValue of array<array|scalar>|scalar
      *
-     * @return (TValue is (bool | float | int | string) ? (array | bool | float | int | string) : array<(array | bool | float | int | string)>)
+     * @return (TValue is scalar ? array|scalar : array<array|scalar>)
      */
     public function resolveValue()
     {