Skip to content

Fix array variance (fixes #2627) #30

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
ondrejmirtes merged 1 commit into from
Nov 30, 2019
Merged

Fix array variance (fixes #2627) #30

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
19 changes: 16 additions & 3 deletions src/Type/ArrayType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,11 +328,24 @@ public function inferTemplateTypes(Type $receivedType): TemplateTypeMap

public function getReferencedTemplateTypes(TemplateTypeVariance $positionVariance): array
{
$variance = $positionVariance->compose(TemplateTypeVariance::createInvariant());
$keyVariance = $positionVariance;
$itemVariance = $positionVariance;

if (!$positionVariance->contravariant()) {
$keyType = $this->getKeyType();
if ($keyType instanceof TemplateType) {
$keyVariance = $keyType->getVariance();
}

$itemType = $this->getItemType();
if ($itemType instanceof TemplateType) {
$itemVariance = $itemType->getVariance();
}
}

return array_merge(
$this->getKeyType()->getReferencedTemplateTypes($variance),
$this->getItemType()->getReferencedTemplateTypes($variance)
$this->getKeyType()->getReferencedTemplateTypes($keyVariance),
$this->getItemType()->getReferencedTemplateTypes($itemVariance)
);
}

Expand Down
1 change: 1 addition & 0 deletions tests/PHPStan/Generics/GenericsIntegrationTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ public function dataTopics(): array
['variance'],
['bug2577'],
['bug2620'],
['bug2627'],
];
}

Expand Down
7 changes: 7 additions & 0 deletions tests/PHPStan/Generics/data/bug2627-2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[
{
"message": "Template type TValue is declared as covariant, but occurs in contravariant position in parameter data of method Generics\\Bug2627\\Collection::setData().",
"line": 29,
"ignorable": true
}
]
33 changes: 33 additions & 0 deletions tests/PHPStan/Generics/data/bug2627.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<?php

namespace Generics\Bug2627;

/**
* @template-covariant TValue
*/
class Collection {
/** @var array<int,TValue> $data */
private $data;

/**
* @param array<int,TValue> $data
*/
public function __construct(array $data) {
$this->data = $data;
}

/**
* @return array<int,TValue>
*/
public function getData() {
return $this->data;
}

/**
* @param array<int,TValue> $data
*/
public function setData(array $data): void {
$this->data = $data;
}

}
12 changes: 6 additions & 6 deletions tests/PHPStan/Generics/data/variance-2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@
"ignorable": true
},
{
"message": "Template type T is declared as covariant, but occurs in contravariant position in parameter e of method PHPStan\\Generics\\Variance\\Foo::x().",
"message": "Template type T is declared as covariant, but occurs in contravariant position in parameter d of method PHPStan\\Generics\\Variance\\Foo::x().",
"line": 52,
"ignorable": true
},
{
"message": "Template type T is declared as covariant, but occurs in invariant position in parameter b of method PHPStan\\Generics\\Variance\\Foo::x().",
"message": "Template type T is declared as covariant, but occurs in contravariant position in parameter e of method PHPStan\\Generics\\Variance\\Foo::x().",
"line": 52,
"ignorable": true
},
{
"message": "Template type T is declared as covariant, but occurs in invariant position in parameter d of method PHPStan\\Generics\\Variance\\Foo::x().",
"message": "Template type T is declared as covariant, but occurs in invariant position in parameter b of method PHPStan\\Generics\\Variance\\Foo::x().",
"line": 52,
"ignorable": true
},
Expand Down Expand Up @@ -50,17 +50,17 @@
"ignorable": true
},
{
"message": "Template type T is declared as covariant, but occurs in contravariant position in parameter e of function PHPStan\\Generics\\Variance\\x().",
"message": "Template type T is declared as covariant, but occurs in contravariant position in parameter d of function PHPStan\\Generics\\Variance\\x().",
"line": 101,
"ignorable": true
},
{
"message": "Template type T is declared as covariant, but occurs in invariant position in parameter b of function PHPStan\\Generics\\Variance\\x().",
"message": "Template type T is declared as covariant, but occurs in contravariant position in parameter e of function PHPStan\\Generics\\Variance\\x().",
"line": 101,
"ignorable": true
},
{
"message": "Template type T is declared as covariant, but occurs in invariant position in parameter d of function PHPStan\\Generics\\Variance\\x().",
"message": "Template type T is declared as covariant, but occurs in invariant position in parameter b of function PHPStan\\Generics\\Variance\\x().",
"line": 101,
"ignorable": true
},
Expand Down