Reverted declaration sites for TemplateType and StaticType, added constraint to TemplateType

src/AtClass.php

@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Typhoon\Type;
+
+/**
+ * @api
+ * @psalm-immutable
+ */
+final class AtClass
+{
+    /**
+     * @var class-string
+     */
+    public readonly string $name;
+
+    /**
+     * @internal
+     * @psalm-internal Typhoon\Type
+     * @param class-string $name
+     */
+    public function __construct(
+        string $name,
+    ) {
+        $this->name = $name;
+    }
+}

src/AtFunction.php

@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Typhoon\Type;
+
+/**
+ * @api
+ * @psalm-immutable
+ */
+final class AtFunction
+{
+    /**
+     * @var callable-string
+     */
+    public readonly string $name;
+
+    /**
+     * @internal
+     * @psalm-internal Typhoon\Type
+     * @param callable-string $name
+     */
+    public function __construct(
+        string $name,
+    ) {
+        $this->name = $name;
+    }
+}

src/AtMethod.php

@@ -0,0 +1,36 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Typhoon\Type;
+
+/**
+ * @api
+ * @psalm-immutable
+ */
+final class AtMethod
+{
+    /**
+     * @var class-string
+     */
+    public readonly string $class;
+
+    /**
+     * @var non-empty-string
+     */
+    public readonly string $name;
+
+    /**
+     * @internal
+     * @psalm-internal Typhoon\Type
+     * @param class-string $class
+     * @param non-empty-string $name
+     */
+    public function __construct(
+        string $class,
+        string $name,
+    ) {
+        $this->class = $class;
+        $this->name = $name;
+    }
+}

src/StaticType.php

@@ -12,6 +12,11 @@
  */
 final class StaticType implements Type
 {
+    /**
+     * @var class-string<TObject>
+     */
+    public readonly string $declaredAtClass;
+
     /**
      * @var list<Type>
      */
@@ -21,11 +26,14 @@ final class StaticType implements Type
      * @internal
      * @psalm-internal Typhoon\Type
      * @no-named-arguments
+     * @param class-string<TObject> $declaredAtClass
      * @param list<Type> $templateArguments
      */
     public function __construct(
+        string $declaredAtClass,
         array $templateArguments = [],
     ) {
+        $this->declaredAtClass = $declaredAtClass;
         $this->templateArguments = $templateArguments;
     }
 

src/TemplateType.php

@@ -17,15 +17,27 @@ final class TemplateType implements Type
      */
     public readonly string $name;
 
+    public readonly AtMethod|AtClass|AtFunction $declaredAt;
+
+    /**
+     * @var Type<TType>
+     */
+    public readonly Type $constraint;
+
     /**
      * @internal
      * @psalm-internal Typhoon\Type
      * @param non-empty-string $name
+     * @param Type<TType> $constraint
      */
     public function __construct(
         string $name,
+        AtFunction|AtClass|AtMethod $declaredAt,
+        Type $constraint,
     ) {
         $this->name = $name;
+        $this->declaredAt = $declaredAt;
+        $this->constraint = $constraint;
     }
 
     public function accept(TypeVisitor $visitor): mixed

src/types.php

@@ -265,10 +265,13 @@ public static function object(string $class, Type ...$templateArguments): NamedO
     /**
      * @psalm-pure
      * @no-named-arguments
+     * @template TObject of object
+     * @param class-string<TObject> $declaredAtClass
+     * @return StaticType<TObject>
      */
-    public static function static(Type ...$templateArguments): StaticType
+    public static function static(string $declaredAtClass, Type ...$templateArguments): StaticType
     {
-        return new StaticType($templateArguments);
+        return new StaticType($declaredAtClass, $templateArguments);
     }
 
     /**
@@ -367,11 +370,39 @@ public static function valueOf(Type $type): ValueOfType
 
     /**
      * @psalm-pure
+     * @template TType
+     * @param non-empty-string $name
+     * @param Type<TType> $constraint
+     * @return TemplateType<TType>
+     */
+    public static function template(string $name, AtMethod|AtClass|AtFunction $declaredAt, Type $constraint = self::mixed): TemplateType
+    {
+        return new TemplateType($name, $declaredAt, $constraint);
+    }
+
+    /**
+     * @param callable-string $name
+     */
+    public static function atFunction(string $name): AtFunction
+    {
+        return new AtFunction($name);
+    }
+
+    /**
+     * @param class-string $name
+     */
+    public static function atClass(string $name): AtClass
+    {
+        return new AtClass($name);
+    }
+
+    /**
+     * @param class-string $class
      * @param non-empty-string $name
      */
-    public static function template(string $name): TemplateType
+    public static function atMethod(string $class, string $name): AtMethod
     {
-        return new TemplateType($name);
+        return new AtMethod($class, $name);
     }
 
     /**

tests/psalm/StaticType.phpt

@@ -3,7 +3,7 @@
 
 namespace Typhoon\Type;
 
-$_type = PsalmTest::extractType(new StaticType());
-/** @psalm-check-type-exact $_type = \object */
+$_type = PsalmTest::extractType(new StaticType(\stdClass::class));
+/** @psalm-check-type-exact $_type = \stdClass */
 
 --EXPECT--

tests/psalm/TemplateType.phpt

@@ -3,7 +3,7 @@
 
 namespace Typhoon\Type;
 
-$_type = PsalmTest::extractType(new TemplateType('T'));
-/** @psalm-check-type-exact $_type = \mixed */
+$_type = PsalmTest::extractType(new TemplateType('T', new AtFunction('trim'), ObjectType::type));
+/** @psalm-check-type-exact $_type = \object */
 
 --EXPECT--