Skip to content

Commit 5eb35ba

Browse files
committed
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.
1 parent e0249c1 commit 5eb35ba

4 files changed

Lines changed: 13 additions & 44 deletions

File tree

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"brick/math": "^0.14.0",
1919
"phpstan/phpdoc-parser": "^2.1",
2020
"symfony/polyfill-php84": "^1.33",
21-
"typhoon/type": "dev-alias"
21+
"typhoon/type": "^0.6"
2222
},
2323
"require-dev": {
2424
"bamarni/composer-bin-plugin": "^1.8.2",

composer.lock

Lines changed: 8 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Context.php

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44

55
namespace Typhoon\PHPStanTypeParser;
66

7-
use Typhoon\Type\AliasAtClassT;
8-
use Typhoon\Type\AliasAtFunctionT;
97
use Typhoon\Type\TemplateT;
108

119
final class Context
@@ -20,11 +18,6 @@ final class Context
2018
*/
2119
private array $templates = [];
2220

23-
/**
24-
* @var array<non-empty-string, AliasAtFunctionT|AliasAtClassT>
25-
*/
26-
private array $aliases = [];
27-
2821
public function __construct(
2922
public readonly ?Name $namespace = null,
3023
) {}
@@ -37,32 +30,21 @@ public function use(Name $name, ?Name $as = null): self
3730
return $context;
3831
}
3932

40-
public function useTemplate(TemplateT $template): self
33+
public function template(TemplateT $template): self
4134
{
4235
$context = clone $this;
4336
$context->templates[$template->name] = $template;
4437

4538
return $context;
4639
}
4740

48-
/**
49-
* @param ?non-empty-string $as
50-
*/
51-
public function useAlias(AliasAtFunctionT|AliasAtClassT $alias, ?string $as = null): self
52-
{
53-
$context = clone $this;
54-
$context->aliases[$as ?? $alias->name] = $alias;
55-
56-
return $context;
57-
}
58-
5941
public function resolveAsClass(string $name): Name
6042
{
6143
return Name::parse($name)->resolveClass($this->namespace, $this->importTable);
6244
}
6345

64-
public function resolve(string $name): TemplateT|AliasAtFunctionT|AliasAtClassT|Name
46+
public function resolve(string $name): TemplateT|Name
6547
{
66-
return $this->templates[$name] ?? $this->aliases[$name] ?? $this->resolveAsClass($name);
48+
return $this->templates[$name] ?? $this->resolveAsClass($name);
6749
}
6850
}

src/Parser.php

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,6 @@
3131
use PHPStan\PhpDocParser\Parser\TypeParser;
3232
use PHPStan\PhpDocParser\ParserConfig;
3333
use Typhoon\Type;
34-
use Typhoon\Type\AliasAtClassT;
35-
use Typhoon\Type\AliasAtFunctionT;
36-
use Typhoon\Type\AliasT;
3734
use Typhoon\Type\ArrayBareT;
3835
use Typhoon\Type\ArrayT;
3936
use Typhoon\Type\CallableT;
@@ -280,14 +277,6 @@ private function identifier(string $name, array $genericNodes = []): Type
280277
return $resolved;
281278
}
282279

283-
if ($resolved instanceof AliasAtFunctionT || $resolved instanceof AliasAtClassT) {
284-
if ($templateArguments === []) {
285-
return $resolved;
286-
}
287-
288-
return new AliasT($resolved, $templateArguments);
289-
}
290-
291280
/** @var class-string */
292281
$class = $resolved->toString();
293282

@@ -415,7 +404,7 @@ private function callable(CallableTypeNode $node): CallableT
415404

416405
foreach ($node->templateTypes as $templateNode) {
417406
$templateFactories[] = Template::factory($templateNode->name, type: $type);
418-
$context = $context->useTemplate($type);
407+
$context = $context->template($type);
419408
}
420409

421410
$parser = $this->withContext($context);

0 commit comments

Comments
 (0)