Skip to content

Generics on phpstan-type aliases #5378

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
shmax wants to merge 28 commits into
base: 2.1.x
Choose a base branch
from
Draft

Generics on phpstan-type aliases #5378

Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
b973b5f
first pass
shmax Apr 1, 2026
eb67c21
enforce required generic params
shmax Apr 1, 2026
6fdb88f
more tests
shmax Apr 1, 2026
b27d26e
tests for invalud usage
shmax Apr 1, 2026
4f18071
fix regression
shmax Apr 1, 2026
95abc98
add more scenarios to test fixture
shmax Apr 1, 2026
f529784
remove empty patch
shmax Apr 1, 2026
590daa6
coalesce to empty array
shmax Apr 1, 2026
b8e0c55
lint
shmax Apr 1, 2026
a94b14b
fix use function ordering
shmax Apr 1, 2026
beedafb
fix generic alias resolution: skip alias path when name resolves to a…
shmax Apr 1, 2026
e023f92
remove resolveWithDefaults: bare generic alias usage restores old Tem…
shmax Apr 1, 2026
04c8aec
fix phpstan self-analysis errors: ignore property.notFound, add null …
shmax Apr 1, 2026
0195d7d
remove ignore
shmax Apr 1, 2026
95ae9e4
add property.notFound baseline entry for PHP < 8.0 (phpdoc-parser lac…
shmax Apr 1, 2026
2fd32f3
move property.notFound baseline entry to universal phpstan-baseline.n…
shmax Apr 1, 2026
89423b3
fix generic alias bare-usage resolution and data-provider parameter s…
shmax Apr 2, 2026
6c7322d
update baseline after rebase onto 2.1.x
shmax Apr 2, 2026
2321f59
add temp patches
shmax Apr 2, 2026
5726a40
use LateResolvableType
shmax Apr 2, 2026
6426482
remove
shmax Apr 2, 2026
fb9203b
lint
shmax Apr 2, 2026
d7fe98c
fix array vs list error
shmax Apr 2, 2026
e3aebe9
remove dead code
shmax Apr 2, 2026
ef31211
fold getRawGenericTypeAliasesUsage into getNonGenericObjectTypesWithG…
shmax Apr 15, 2026
106b589
update lock hash
shmax Apr 15, 2026
45ba91b
lint
shmax Apr 15, 2026
57a2395
remove unnecessary BC coverage from generic type alias resolution
shmax Apr 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
remove dead code
  • Loading branch information
@shmax
shmax committed Apr 15, 2026
commit e3aebe95eb4439c2ce37b0635699fdab1f2847ef
44 changes: 0 additions & 44 deletions src/Type/TypeAlias.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,9 @@
use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode;
use PHPStan\PhpDocParser\Ast\Type\TypeNode;
use PHPStan\Type\Generic\TemplateTypeFactory;
use PHPStan\Type\Generic\TemplateTypeHelper;
use PHPStan\Type\Generic\TemplateTypeMap;
use PHPStan\Type\Generic\TemplateTypeScope;
use PHPStan\Type\Generic\TemplateTypeVariance;
use PHPStan\Type\Generic\TemplateTypeVarianceMap;
use function array_map;
use function array_values;
use function count;
Expand Down Expand Up @@ -61,11 +59,6 @@ public function resolve(TypeNodeResolver $typeNodeResolver): Type
return $this->resolvedType = $typeNodeResolver->resolve($this->typeNode, $nameScope);
}

public function getAliasName(): string
{
return $this->aliasName;
}

/** Whether this alias was declared with type parameters (e.g. @phpstan-type Foo<T>). */
public function isGeneric(): bool
{
Expand Down Expand Up @@ -113,43 +106,6 @@ public function createApplicationType(TypeNodeResolver $typeNodeResolver, array
);
}

/**
* Resolves the alias body substituting concrete $args for each declared template parameter.
*
* @param Type[] $args Concrete types in the same order as the declared template params.
*/
public function resolveWithArgs(TypeNodeResolver $typeNodeResolver, array $args): Type
{
$resolvedType = $this->resolve($typeNodeResolver);

if (count($this->templateTagValueNodes) === 0) {
return $resolvedType;
}

// Map each template param name to the supplied arg (or its declared default / upper bound).
$templateTypeMapTypes = [];
foreach (array_values($this->templateTagValueNodes) as $i => $templateTagValueNode) {
if (isset($args[$i])) {
$templateTypeMapTypes[$templateTagValueNode->name] = $args[$i];
} else {
$bound = $templateTagValueNode->bound !== null
? $typeNodeResolver->resolve($templateTagValueNode->bound, $this->nameScope)
: new MixedType(true);
$default = $templateTagValueNode->default !== null
? $typeNodeResolver->resolve($templateTagValueNode->default, $this->nameScope)
: null;
$templateTypeMapTypes[$templateTagValueNode->name] = $default ?? $bound;
}
}

return TemplateTypeHelper::resolveTemplateTypes(
$resolvedType,
new TemplateTypeMap($templateTypeMapTypes),
TemplateTypeVarianceMap::createEmpty(),
TemplateTypeVariance::createInvariant(),
);
}

/**
* Builds a NameScope augmented with TemplateType placeholders for each declared template param,
* so the alias body can reference them (e.g. `TFilter` resolves to a TemplateType).
Expand Down