Skip to content

Do not generalize template types in @template-covariant #2821

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

Merged
merged 1 commit into from
Dec 12, 2023
Merged

Do not generalize template types in @template-covariant #2821

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 7 additions & 5 deletions src/Analyser/MutatingScope.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5063,11 +5063,13 @@ private function exactInstantiation(New_ $node, string $className): ?Type
return $type->getBound();
}

$isArrayKey = $type->getBound()->describe(VerbosityLevel::precise()) === '(int|string)';
if ($newType->isScalar()->yes() && !$type->getVariance()->covariant() && $isArrayKey) {
$newType = $newType->generalize(GeneralizePrecision::templateArgument());
} elseif ($newType->isConstantValue()->yes() && (!$type->getBound()->isScalar()->yes() || $isArrayKey)) {
$newType = $newType->generalize(GeneralizePrecision::templateArgument());
if (!$type->getVariance()->covariant()) {
$isArrayKey = $type->getBound()->describe(VerbosityLevel::precise()) === '(int|string)';
if ($newType->isScalar()->yes() && $isArrayKey) {
$newType = $newType->generalize(GeneralizePrecision::templateArgument());
} elseif ($newType->isConstantValue()->yes() && (!$type->getBound()->isScalar()->yes() || $isArrayKey)) {
$newType = $newType->generalize(GeneralizePrecision::templateArgument());
}
}

return $newType;
Expand Down
12 changes: 7 additions & 5 deletions src/Reflection/ResolvedFunctionVariant.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,11 +184,13 @@ private function resolveResolvableTemplateTypes(Type $type, TemplateTypeVariance
return $traverse($type);
}

$isArrayKey = $type->getBound()->describe(VerbosityLevel::precise()) === '(int|string)';
if ($newType->isScalar()->yes() && !$type->getVariance()->covariant() && $isArrayKey) {
$newType = $newType->generalize(GeneralizePrecision::templateArgument());
} elseif ($newType->isConstantValue()->yes() && (!$type->getBound()->isScalar()->yes() || $isArrayKey)) {
$newType = $newType->generalize(GeneralizePrecision::templateArgument());
if (!$type->getVariance()->covariant()) {
$isArrayKey = $type->getBound()->describe(VerbosityLevel::precise()) === '(int|string)';
if ($newType->isScalar()->yes() && $isArrayKey) {
$newType = $newType->generalize(GeneralizePrecision::templateArgument());
} elseif ($newType->isConstantValue()->yes() && (!$type->getBound()->isScalar()->yes() || $isArrayKey)) {
$newType = $newType->generalize(GeneralizePrecision::templateArgument());
}
}

$variance = TemplateTypeVariance::createInvariant();
Expand Down
2 changes: 1 addition & 1 deletion tests/PHPStan/Analyser/data/bug-7078.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,5 @@ public function get(TypeDefault ...$type);

function (Param $p) {
$result = $p->get(new TypeDefault(1), new TypeDefault('a'));
assertType('int|string', $result);
assertType('1|\'a\'', $result);
};
29 changes: 29 additions & 0 deletions tests/PHPStan/Analyser/data/generics-do-not-generalize.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,3 +117,32 @@ function (): void {

assertType('ArrayIterator<int, string>', createArrayIterator($a));
};

/** @template T */
class FooInvariant
{

/** @param T $p */
public function __construct($p)
{

}

}

/** @template-covariant T */
class FooCovariant
{

/** @param T $p */
public function __construct($p)
{

}

}

function (): void {
assertType('GenericsDoNotGeneralize\\FooInvariant<int>', new FooInvariant(1));
assertType('GenericsDoNotGeneralize\\FooCovariant<1>', new FooCovariant(1));
};