Revert "Add Context::useAlias()"

This reverts commit 974172d.

Revert "Try alternative alias idea"

This reverts commit 1f873d7.

Revert "Try alternative alias idea"

This reverts commit e0249c1.

Author: vudaltsov

composer.json

@@ -18,7 +18,7 @@
         "brick/math": "^0.14.0",
         "phpstan/phpdoc-parser": "^2.1",
         "symfony/polyfill-php84": "^1.33",
-        "typhoon/type": "dev-alias"
+        "typhoon/type": "^0.6"
     },
     "require-dev": {
         "bamarni/composer-bin-plugin": "^1.8.2",

composer.lock

@@ -4,8 +4,6 @@
 
 namespace Typhoon\PHPStanTypeParser;
 
-use Typhoon\Type\AliasAtClassT;
-use Typhoon\Type\AliasAtFunctionT;
 use Typhoon\Type\TemplateT;
 
 final class Context
@@ -20,11 +18,6 @@ final class Context
      */
     private array $templates = [];
 
-    /**
-     * @var array<non-empty-string, AliasAtFunctionT|AliasAtClassT>
-     */
-    private array $aliases = [];
-
     public function __construct(
         public readonly ?Name $namespace = null,
     ) {}
@@ -37,32 +30,21 @@ public function use(Name $name, ?Name $as = null): self
         return $context;
     }
 
-    public function useTemplate(TemplateT $template): self
+    public function template(TemplateT $template): self
     {
         $context = clone $this;
         $context->templates[$template->name] = $template;
 
         return $context;
     }
 
-    /**
-     * @param ?non-empty-string $as
-     */
-    public function useAlias(AliasAtFunctionT|AliasAtClassT $alias, ?string $as = null): self
-    {
-        $context = clone $this;
-        $context->aliases[$as ?? $alias->name] = $alias;
-
-        return $context;
-    }
-
     public function resolveAsClass(string $name): Name
     {
         return Name::parse($name)->resolveClass($this->namespace, $this->importTable);
     }
 
-    public function resolve(string $name): TemplateT|AliasAtFunctionT|AliasAtClassT|Name
+    public function resolve(string $name): TemplateT|Name
     {
-        return $this->templates[$name] ?? $this->aliases[$name] ?? $this->resolveAsClass($name);
+        return $this->templates[$name] ?? $this->resolveAsClass($name);
     }
 }

src/Context.php

@@ -31,9 +31,6 @@
 use PHPStan\PhpDocParser\Parser\TypeParser;
 use PHPStan\PhpDocParser\ParserConfig;
 use Typhoon\Type;
-use Typhoon\Type\AliasAtClassT;
-use Typhoon\Type\AliasAtFunctionT;
-use Typhoon\Type\AliasT;
 use Typhoon\Type\ArrayBareT;
 use Typhoon\Type\ArrayT;
 use Typhoon\Type\CallableT;
@@ -280,14 +277,6 @@ private function identifier(string $name, array $genericNodes = []): Type
             return $resolved;
         }
 
-        if ($resolved instanceof AliasAtFunctionT || $resolved instanceof AliasAtClassT) {
-            if ($templateArguments === []) {
-                return $resolved;
-            }
-
-            return new AliasT($resolved, $templateArguments);
-        }
-
         /** @var class-string */
         $class = $resolved->toString();
 
@@ -415,7 +404,7 @@ private function callable(CallableTypeNode $node): CallableT
 
         foreach ($node->templateTypes as $templateNode) {
             $templateFactories[] = Template::factory($templateNode->name, type: $type);
-            $context = $context->useTemplate($type);
+            $context = $context->template($type);
         }
 
         $parser = $this->withContext($context);