Add TypeKind::Tentative

typhoon-php · Aug 1, 2024 · 23948b1 · 23948b1
1 parent bf37fb3
commit 23948b1
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/Internal/Data/TypeData.php b/Internal/Data/TypeData.php
@@ -68,6 +68,7 @@ public function get(TypeKind $kind = TypeKind::Resolved): ?Type
         return match ($kind) {
             TypeKind::Resolved => $this->annotated ?? $this->inferred ?? $this->tentative ?? $this->native ?? types::mixed,
             TypeKind::Native => $this->native,
+            TypeKind::Tentative => $this->tentative,
             TypeKind::Inferred => $this->inferred,
             TypeKind::Annotated => $this->annotated,
         };

diff --git a/Internal/NativeAdapter/FunctionAdapter.php b/Internal/NativeAdapter/FunctionAdapter.php
@@ -7,7 +7,6 @@
 use Typhoon\DeclarationId\AnonymousFunctionId;
 use Typhoon\DeclarationId\NamedFunctionId;
 use Typhoon\Reflection\FunctionReflection;
-use Typhoon\Reflection\Internal\Data;
 use Typhoon\Reflection\ParameterReflection;
 use Typhoon\Reflection\TypeKind;
 
@@ -199,7 +198,7 @@ public function getStaticVariables(): array
 
     public function getTentativeReturnType(): ?\ReflectionType
     {
-        return $this->reflection->data[Data::Type]->tentative?->accept(new ToNativeTypeConverter());
+        return $this->reflection->returnType(TypeKind::Tentative)?->accept(new ToNativeTypeConverter());
     }
 
     public function hasReturnType(): bool
@@ -209,7 +208,7 @@ public function hasReturnType(): bool
 
     public function hasTentativeReturnType(): bool
     {
-        return $this->reflection->data[Data::Type]->tentative !== null;
+        return $this->reflection->returnType(TypeKind::Tentative) !== null;
     }
 
     public function inNamespace(): bool

diff --git a/Internal/NativeAdapter/MethodAdapter.php b/Internal/NativeAdapter/MethodAdapter.php
@@ -214,7 +214,7 @@ public function getStaticVariables(): array
 
     public function getTentativeReturnType(): ?\ReflectionType
     {
-        return $this->reflection->data[Data::Type]->tentative?->accept(new ToNativeTypeConverter());
+        return $this->reflection->returnType(TypeKind::Tentative)?->accept(new ToNativeTypeConverter());
     }
 
     /**
@@ -238,7 +238,7 @@ public function hasReturnType(): bool
 
     public function hasTentativeReturnType(): bool
     {
-        return $this->reflection->data[Data::Type]->tentative !== null;
+        return $this->reflection->returnType(TypeKind::Tentative) !== null;
     }
 
     public function inNamespace(): bool

diff --git a/TypeKind.php b/TypeKind.php
@@ -9,8 +9,9 @@
  */
 enum TypeKind
 {
-    case Resolved;
     case Native;
+    case Tentative;
     case Inferred;
     case Annotated;
+    case Resolved;
 }