Improve Types::asNonLiteralType for TKeyedArray

fp4php · Jul 10, 2022 · dab985a · dab985a
1 parent 2b9aa88
commit dab985a
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/Toolkit/Types.php b/src/Toolkit/Types.php
@@ -212,10 +212,12 @@ public function asNonLiteralType(Union $type): Union
                     : new TNonEmptyString(),
                 $a instanceof TLiteralInt => new TInt(),
                 $a instanceof TLiteralFloat => new TFloat(),
-                $a instanceof TKeyedArray => new TNonEmptyArray([
-                    self::asNonLiteralType($a->getGenericKeyType()),
-                    self::asNonLiteralType($a->getGenericValueType()),
-                ]),
+                $a instanceof TKeyedArray => $a->is_list
+                    ? new TNonEmptyList($a->getGenericValueType())
+                    : new TNonEmptyArray([
+                        self::asNonLiteralType($a->getGenericKeyType()),
+                        self::asNonLiteralType($a->getGenericValueType()),
+                    ]),
                 $a instanceof TNonEmptyList => new TNonEmptyList(
                     self::asNonLiteralType($a->type_param),
                 ),