Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 18 additions & 2 deletions src/Type/ClosureType.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@
use PHPStan\Type\Generic\TemplateType;
use PHPStan\Type\Generic\TemplateTypeHelper;
use PHPStan\Type\Generic\TemplateTypeMap;
use PHPStan\Type\Generic\TemplateTypeVariance;
use PHPStan\Type\Generic\TemplateTypeVarianceMap;
use PHPStan\Type\Traits\NonArrayTypeTrait;
use PHPStan\Type\Traits\NonGeneralizableTypeTrait;
use PHPStan\Type\Traits\NonGenericTypeTrait;
use PHPStan\Type\Traits\NonIterableTypeTrait;
use PHPStan\Type\Traits\NonOffsetAccessibleTypeTrait;
use PHPStan\Type\Traits\NonRemoveableTypeTrait;
Expand All @@ -53,7 +53,6 @@ class ClosureType implements TypeWithClassName, CallableParametersAcceptor
{

use NonArrayTypeTrait;
use NonGenericTypeTrait;
use NonIterableTypeTrait;
use UndecidedComparisonTypeTrait;
use NonOffsetAccessibleTypeTrait;
Expand Down Expand Up @@ -540,6 +539,23 @@ private function inferTemplateTypesOnParametersAcceptor(ParametersAcceptor $para
return $typeMap->union($this->getReturnType()->inferTemplateTypes($returnType));
}

public function getReferencedTemplateTypes(TemplateTypeVariance $positionVariance): array
{
$references = $this->getReturnType()->getReferencedTemplateTypes(
$positionVariance->compose(TemplateTypeVariance::createCovariant()),
);

$paramVariance = $positionVariance->compose(TemplateTypeVariance::createContravariant());

foreach ($this->getParameters() as $param) {
foreach ($param->getType()->getReferencedTemplateTypes($paramVariance) as $reference) {
$references[] = $reference;
}
}

return $references;
}

public function traverse(callable $cb): Type
{
if ($this->isCommonCallable) {
Expand Down
10 changes: 10 additions & 0 deletions tests/PHPStan/Rules/Generics/MethodSignatureVarianceRuleTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -234,4 +234,14 @@ public function testPr2465(): void
]);
}

public function testBug10609(): void
{
$this->analyse([__DIR__ . '/data/bug-10609.php'], [
[
'Template type A is declared as covariant, but occurs in contravariant position in parameter fn of method Bug10609\Collection::tap().',
13,
],
]);
}

}
16 changes: 16 additions & 0 deletions tests/PHPStan/Rules/Generics/data/bug-10609.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?php

namespace Bug10609;

/**
* @template-covariant A
*/
final class Collection
{
/**
* @param \Closure(A): A $fn
*/
public function tap(mixed $fn): void
{
}
}
Loading