typhoon-php · vudaltsov · Aug 8, 2024
diff --git a/src/Reflection/ClassReflection.php b/src/Reflection/ClassReflection.php
@@ -242,9 +242,6 @@ public function isBackedEnum(): bool
         return $this->data[Data::BackingType] !== null;
     }
 
-    /**
-     * @return (TObject is \BackedEnum ? Type<int|string> : ?Type<int|string>)
-     */
     public function enumBackingType(): ?Type
     {
         return $this->data[Data::BackingType];

diff --git a/src/Reflection/Internal/Data/BackingTypeKey.php b/src/Reflection/Internal/Data/BackingTypeKey.php
@@ -11,7 +11,7 @@
 /**
  * @internal
  * @psalm-internal Typhoon\Reflection\Internal
- * @implements OptionalKey<?Type<int|string>>
+ * @implements OptionalKey<?Type>
  */
 enum BackingTypeKey implements OptionalKey
 {

diff --git a/src/Reflection/Internal/NativeReflector/NativeReflectionBasedReflector.php b/src/Reflection/Internal/NativeReflector/NativeReflectionBasedReflector.php
@@ -134,9 +134,6 @@ private static function reflectParents(\ReflectionClass $class): array
         return $parents;
     }
 
-    /**
-     * @return ?Type<int|string>
-     */
     private static function reflectBackingType(\ReflectionEnum $enum): ?Type
     {
         $type = $enum->getBackingType();

diff --git a/src/Reflection/Internal/PhpParser/NodeReflector.php b/src/Reflection/Internal/PhpParser/NodeReflector.php
@@ -127,7 +127,6 @@ public function reflectClassLike(ClassLike $node, Context $context): TypedMap
         }
 
         if ($node instanceof Enum_) {
-            /** @var ?Type<int|string> */
             $backingType = $this->reflectType($context, $node->scalarType);
 
             return $data

diff --git a/src/Reflection/Internal/PhpParser/UnresolvedConstantType.php b/src/Reflection/Internal/PhpParser/UnresolvedConstantType.php
@@ -11,7 +11,6 @@
 /**
  * @internal
  * @psalm-internal Typhoon\Reflection\Internal\PhpParser
- * @implements Type<mixed>
  */
 final class UnresolvedConstantType implements Type
 {

diff --git a/src/Type/CHANGELOG.md b/src/Type/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [Unreleased]
+
+### Changed
+
+- Remove `Type<TType>` template in favor of future plugins for Psalm and PHPStan.
+
 ## [0.4.3] 2024-08-06
 
 ### Added

diff --git a/src/Type/Internal/AliasType.php b/src/Type/Internal/AliasType.php
@@ -11,7 +11,6 @@
 /**
  * @internal
  * @psalm-internal Typhoon\Type
- * @implements Type<mixed>
  */
 final class AliasType implements Type
 {

diff --git a/src/Type/Internal/ArgumentType.php b/src/Type/Internal/ArgumentType.php
@@ -11,7 +11,6 @@
 /**
  * @internal
  * @psalm-internal Typhoon\Type
- * @implements Type<mixed>
  */
 final class ArgumentType implements Type
 {

diff --git a/src/Type/Internal/ArrayType.php b/src/Type/Internal/ArrayType.php
@@ -11,7 +11,6 @@
 /**
  * @internal
  * @psalm-internal Typhoon\Type
- * @implements Type<array<mixed>>
  */
 final class ArrayType implements Type
 {

diff --git a/src/Type/Internal/CallableType.php b/src/Type/Internal/CallableType.php
@@ -11,7 +11,6 @@
 /**
  * @internal
  * @psalm-internal Typhoon\Type
- * @implements Type<callable>
  */
 final class CallableType implements Type
 {

diff --git a/src/Type/Internal/ClassConstantMaskType.php b/src/Type/Internal/ClassConstantMaskType.php
@@ -10,7 +10,6 @@
 /**
  * @internal
  * @psalm-internal Typhoon\Type
- * @implements Type<mixed>
  */
 final class ClassConstantMaskType implements Type
 {

diff --git a/src/Type/Internal/ClassConstantType.php b/src/Type/Internal/ClassConstantType.php
@@ -10,7 +10,6 @@
 /**
  * @internal
  * @psalm-internal Typhoon\Type
- * @implements Type<mixed>
  */
 final class ClassConstantType implements Type
 {

diff --git a/src/Type/Internal/ClassStringType.php b/src/Type/Internal/ClassStringType.php
@@ -10,7 +10,6 @@
 /**
  * @internal
  * @psalm-internal Typhoon\Type
- * @implements Type<non-empty-string>
  */
 final class ClassStringType implements Type
 {

diff --git a/src/Type/Internal/ConditionalType.php b/src/Type/Internal/ConditionalType.php
@@ -10,7 +10,6 @@
 /**
  * @internal
  * @psalm-internal Typhoon\Type
- * @implements Type<mixed>
  */
 final class ConditionalType implements Type
 {

diff --git a/src/Type/Internal/ConstantType.php b/src/Type/Internal/ConstantType.php
@@ -11,7 +11,6 @@
 /**
  * @internal
  * @psalm-internal Typhoon\Type
- * @implements Type<mixed>
  */
 final class ConstantType implements Type
 {

diff --git a/src/Type/Internal/FloatType.php b/src/Type/Internal/FloatType.php
@@ -11,8 +11,6 @@
  * @internal
  * @psalm-internal Typhoon\Type
  * @readonly
- * @template-covariant TValue of float
- * @implements Type<TValue>
  */
 final class FloatType implements Type
 {

diff --git a/src/Type/Internal/FloatValueType.php b/src/Type/Internal/FloatValueType.php
@@ -10,14 +10,9 @@
 /**
  * @internal
  * @psalm-internal Typhoon\Type
- * @template-covariant TValue of float
- * @implements Type<TValue>
  */
 final class FloatValueType implements Type
 {
-    /**
-     * @param TValue $value
-     */
     public function __construct(
         private readonly float $value,
     ) {}

diff --git a/src/Type/Internal/IntMaskType.php b/src/Type/Internal/IntMaskType.php
@@ -10,7 +10,6 @@
 /**
  * @internal
  * @psalm-internal Typhoon\Type
- * @implements Type<int>
  */
 final class IntMaskType implements Type
 {

diff --git a/src/Type/Internal/IntType.php b/src/Type/Internal/IntType.php
@@ -11,8 +11,6 @@
  * @internal
  * @psalm-internal Typhoon\Type
  * @readonly
- * @template-covariant TValue of int
- * @implements Type<TValue>
  */
 final class IntType implements Type
 {

diff --git a/src/Type/Internal/IntValueType.php b/src/Type/Internal/IntValueType.php
@@ -10,14 +10,9 @@
 /**
  * @internal
  * @psalm-internal Typhoon\Type
- * @template-covariant TValue of int
- * @implements Type<TValue>
  */
 final class IntValueType implements Type
 {
-    /**
-     * @param TValue $value
-     */
     public function __construct(
         private readonly int $value,
     ) {}

diff --git a/src/Type/Internal/IntersectionType.php b/src/Type/Internal/IntersectionType.php
@@ -10,7 +10,6 @@
 /**
  * @internal
  * @psalm-internal Typhoon\Type
- * @implements Type<mixed>
  */
 final class IntersectionType implements Type
 {

diff --git a/src/Type/Internal/IterableType.php b/src/Type/Internal/IterableType.php
@@ -10,16 +10,9 @@
 /**
  * @internal
  * @psalm-internal Typhoon\Type
- * @template-covariant TKey
- * @template-covariant TValue
- * @implements Type<iterable<TKey, TValue>>
  */
 final class IterableType implements Type
 {
-    /**
-     * @param Type<TKey> $key
-     * @param Type<TValue> $value
-     */
     public function __construct(
         private readonly Type $key,
         private readonly Type $value,

diff --git a/src/Type/Internal/KeyType.php b/src/Type/Internal/KeyType.php
@@ -10,7 +10,6 @@
 /**
  * @internal
  * @psalm-internal Typhoon\Type
- * @implements Type<mixed>
  */
 final class KeyType implements Type
 {

diff --git a/src/Type/Internal/ListType.php b/src/Type/Internal/ListType.php
@@ -11,7 +11,6 @@
 /**
  * @internal
  * @psalm-internal Typhoon\Type
- * @implements Type<list<mixed>>
  */
 final class ListType implements Type
 {

diff --git a/src/Type/Internal/LiteralType.php b/src/Type/Internal/LiteralType.php
@@ -10,14 +10,9 @@
 /**
  * @internal
  * @psalm-internal Typhoon\Type
- * @template-covariant TType
- * @implements Type<TType>
  */
 final class LiteralType implements Type
 {
-    /**
-     * @param Type<TType> $type
-     */
     public function __construct(
         private readonly Type $type,
     ) {}

diff --git a/src/Type/Internal/NamedObjectType.php b/src/Type/Internal/NamedObjectType.php
@@ -12,7 +12,6 @@
 /**
  * @internal
  * @psalm-internal Typhoon\Type
- * @implements Type<object>
  */
 final class NamedObjectType implements Type
 {

diff --git a/src/Type/Internal/NonEmptyArrayType.php b/src/Type/Internal/NonEmptyArrayType.php
@@ -11,7 +11,6 @@
 /**
  * @internal
  * @psalm-internal Typhoon\Type
- * @implements Type<non-empty-array<mixed>>
  */
 final class NonEmptyArrayType implements Type
 {

diff --git a/src/Type/Internal/NotType.php b/src/Type/Internal/NotType.php
@@ -10,7 +10,6 @@
 /**
  * @internal
  * @psalm-internal Typhoon\Type
- * @implements Type<mixed>
  */
 final class NotType implements Type
 {

diff --git a/src/Type/Internal/ObjectType.php b/src/Type/Internal/ObjectType.php
@@ -11,7 +11,6 @@
 /**
  * @internal
  * @psalm-internal Typhoon\Type
- * @implements Type<object>
  */
 final class ObjectType implements Type
 {

diff --git a/src/Type/Internal/OffsetType.php b/src/Type/Internal/OffsetType.php
@@ -10,7 +10,6 @@
 /**
  * @internal
  * @psalm-internal Typhoon\Type
- * @implements Type<mixed>
  */
 final class OffsetType implements Type
 {

diff --git a/src/Type/Internal/ParentType.php b/src/Type/Internal/ParentType.php
@@ -11,7 +11,6 @@
 /**
  * @internal
  * @psalm-internal Typhoon\Type
- * @implements Type<object>
  */
 final class ParentType implements Type
 {

diff --git a/src/Type/Internal/SelfType.php b/src/Type/Internal/SelfType.php
@@ -12,7 +12,6 @@
 /**
  * @internal
  * @psalm-internal Typhoon\Type
- * @implements Type<object>
  */
 final class SelfType implements Type
 {

diff --git a/src/Type/Internal/StaticType.php b/src/Type/Internal/StaticType.php
@@ -12,7 +12,6 @@
 /**
  * @internal
  * @psalm-internal Typhoon\Type
- * @implements Type<object>
  */
 final class StaticType implements Type
 {

diff --git a/src/Type/Internal/StringValueType.php b/src/Type/Internal/StringValueType.php
@@ -10,14 +10,9 @@
 /**
  * @internal
  * @psalm-internal Typhoon\Type
- * @template-covariant TValue of string
- * @implements Type<TValue>
  */
 final class StringValueType implements Type
 {
-    /**
-     * @param TValue $value
-     */
     public function __construct(
         private readonly string $value,
     ) {}

diff --git a/src/Type/Internal/TemplateType.php b/src/Type/Internal/TemplateType.php
@@ -11,7 +11,6 @@
 /**
  * @internal
  * @psalm-internal Typhoon\Type
- * @implements Type<mixed>
  */
 final class TemplateType implements Type
 {

diff --git a/src/Type/Internal/UnionType.php b/src/Type/Internal/UnionType.php
@@ -10,13 +10,11 @@
 /**
  * @internal
  * @psalm-internal Typhoon\Type
- * @template-covariant TType
- * @implements Type<TType>
  */
 final class UnionType implements Type
 {
     /**
-     * @param non-empty-list<Type<TType>> $types
+     * @param non-empty-list<Type> $types
      */
     public function __construct(
         private readonly array $types,

diff --git a/src/Type/Internal/VarianceAwareType.php b/src/Type/Internal/VarianceAwareType.php
@@ -11,14 +11,9 @@
 /**
  * @internal
  * @psalm-internal Typhoon\Type
- * @template-covariant TType
- * @implements Type<TType>
  */
 final class VarianceAwareType implements Type
 {
-    /**
-     * @param Type<TType> $type
-     */
     public function __construct(
         private readonly Type $type,
         private readonly Variance $variance,

diff --git a/src/Type/Parameter.php b/src/Type/Parameter.php
@@ -6,13 +6,9 @@
 
 /**
  * @api
- * @template-covariant TType
  */
 final class Parameter
 {
-    /**
-     * @param Type<TType> $type
-     */
     public function __construct(
         public readonly Type $type = types::mixed,
         public readonly bool $hasDefault = false,

diff --git a/src/Type/ShapeElement.php b/src/Type/ShapeElement.php
@@ -6,13 +6,9 @@
 
 /**
  * @api
- * @template-covariant TType
  */
 final class ShapeElement
 {
-    /**
-     * @param Type<TType> $type
-     */
     public function __construct(
         public readonly Type $type,
         public readonly bool $optional = false,

diff --git a/src/Type/Type.php b/src/Type/Type.php
@@ -6,7 +6,6 @@
 
 /**
  * @api
- * @template-covariant TType
  */
 interface Type
 {
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,7 +6,6 @@ @@
     /**
      * @api
-     * @template-covariant TType
      */
     interface Type
     {
@@ Expand Down @@