Fix typos and improve type handling in SpecialTypeResolver; correct GenericTypeNode instantiation and enhance debug logging

Author: rcalicdan

src/Resolver/SpecialTypeResolver.php

@@ -89,9 +89,11 @@ public static function resolve(TypeNode $node, \ReflectionClass|\ReflectionFunct
             return self::resolveConstType($node, $declaringClass, $ref);
         }
 
-        if ($node instanceof            $innerTypes = array_map(fn ($t) => self::resolve($t, $ref, $thisObj), $node->genericTypes);
+        if ($node instanceof GenericTypeNode) {
+            $genericType = self::resolve($node->type, $ref, $thisObj);
+            $innerTypes = array_map(fn($t) => self::resolve($t, $ref, $thisObj), $node->genericTypes);
 
-            return new GnericTypeNode(
+            return new GenericTypeNode(
                 $genericType instanceof IdentifierTypeNode ? $genericType : $node->type,
                 $innerTypes,
                 $node->variances
@@ -143,14 +145,14 @@ public static function resolve(TypeNode $node, \ReflectionClass|\ReflectionFunct
         }
 
         if ($node instanceof UnionTypeNode) {
-            return new UnionTypeNode(array_map(fn ($t) => self::resolve($t, $ref, $thisObj), $node->types));
+            return new UnionTypeNode(array_map(fn($t) => self::resolve($t, $ref, $thisObj), $node->types));
         }
 
-        if ($node intanceof IntersectionTypeNode) {
-            return new IntersectionTypeNode(array_map(fn ($t) => self::resolve($t, $ref, $thisObj), $node->types));
+        if ($node instanceof IntersectionTypeNode) {
+            return new IntersectionTypeNode(array_map(fn($t) => self::resolve($t, $ref, $thisObj), $node->types));
         }
 
-        return $node
+        return $node;
     }
 
     /**
@@ -179,9 +181,9 @@ public static function resolveForFile(TypeNode $node, string $file): TypeNode
 
         if ($node instanceof GenericTypeNode) {
             $genericType = self::resolveForFile($node->type, $file);
-            $innerTypes = array_map(fn ($t) => self::resolveForFile($t, $file), $node->genericTypes);
+            $innerTypes = array_map(fn($t) => self::resolveForFile($t, $file), $node->genericTypes);
 
-            return new GenricTypeNode(
+            return new GenericTypeNode(
                 $genericType instanceof IdentifierTypeNode ? $genericType : $node->type,
                 $innerTypes,
                 $node->variances
@@ -233,12 +235,7 @@ public static function resolveForFile(TypeNode $node, string $file): TypeNode
         }
 
         if ($node instanceof UnionTypeNode) {
-            return new UnionTypeNode(array_map(fn ($t) => self::resolveForFile($t, $file), $node->types));
-        }
-
-        if ($node instnceof IntersectionTypeNode) {
-            return new IntersectionTypeNode(array_map(fn ($t) => self::resolveForFile($t, $file), $node->types));
-(fn($t) => self::resolveForFile($, $file), $node->types));
+            return new UnionTypeNode(array_map(fn($t) => self::resolveForFile($t, $file), $node->types));
         }
 
         if ($node instanceof IntersectionTypeNode) {
@@ -248,8 +245,6 @@ public static function resolveForFile(TypeNode $node, string $file): TypeNode
         return clone $node;
     }
 
-    // --- Private Helper Extractions for Reflection Context ---
-
     /**
      * @param \ReflectionClass<object>|\ReflectionFunction|\ReflectionMethod|string $context
      *
@@ -344,7 +339,15 @@ private static function resolveOffsetAccess(OffsetAccessTypeNode $node, \Reflect
             if ($baseType instanceof ConstTypeNode && $baseType->constExpr instanceof ConstFetchNode) {
                 $resolvedNode = self::resolveConstantOffsetValue($baseType->constExpr->className, $baseType->constExpr->name, $offsetKey);
                 if ($resolvedNode !== null) {
-               /**
+                    return $resolvedNode;
+                }
+            }
+        }
+
+        return new OffsetAccessTypeNode($baseType, $offsetType);
+    }
+
+    /**
      * @param \ReflectionClass<object>|\ReflectionFunction|\ReflectionMethod $ref
      */
     private static function resolveArrayShape(ArrayShapeNode $node, \ReflectionClass|\ReflectionFunction|\ReflectionMethod $ref, ?object $thisObj): ArrayShapeNode
@@ -356,15 +359,13 @@ private static function resolveArrayShape(ArrayShapeNode $node, \ReflectionClass
             $className = null;
             $constName = null;
 
-            // --- LIVE CI DEBUG LOGGING ---
             $debugClass = $keyName !== null ? get_class($keyName) : 'null';
             $debugVal = $keyName !== null && method_exists($keyName, '__toString') ? (string) $keyName : 'unknown';
             fwrite(\STDERR, "\n[DEBUG] ArrayShapeItem KeyType: {$debugClass} | Value: {$debugVal}\n");
 
             if ($keyName instanceof IdentifierTypeNode) {
                 fwrite(\STDERR, "[DEBUG] IdentifierName: {$keyName->name}\n");
             }
-            // -----------------------------
 
             if ($keyName instanceof ConstFetchNode && $keyName->className !== '') {
                 $className = $keyName->className;
@@ -374,13 +375,11 @@ private static function resolveArrayShape(ArrayShapeNode $node, \ReflectionClass
                 [$className, $constName] = explode('::', $keyName->name, 2);
             }
 
-            // --- MORE DEBUG LOGGING ---
             if ($className !== null && $constName !== null) {
                 fwrite(\STDERR, "[DEBUG] Split into Class: {$className} | Const: {$constName}\n");
             } else {
                 fwrite(\STDERR, "[DEBUG] Did NOT split into Class and Const.\n");
             }
-            // --------------------------
 
             if ($className !== null && $constName !== null) {
                 $lowerClassName = strtolower($className);
@@ -424,10 +423,6 @@ private static function resolveArrayShape(ArrayShapeNode $node, \ReflectionClass
             $unsealedType = new ArrayShapeUnsealedTypeNode($unsealedValue, $unsealedKey);
         }
 
-        return ArrayShapeNode::createUnsealed($items, $unsealedType, $node->kind);
-    }nsealedTypeNode($unsealedValue, $unsealedKey);
-        }
-
         return ArrayShapeNode::createUnsealed($items, $unsealedType, $node->kind);
     }