Skip to content

do not check template type variance in constructor #2311

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 2 commits into from
Apr 1, 2023
Merged

do not check template type variance in constructor #2311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ed0714
do not check template type variance in constructor
jiripudil Mar 31, 2023
7b067f1
fix test
jiripudil Mar 31, 2023
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
4 changes: 2 additions & 2 deletions src/Rules/Generics/MethodSignatureVarianceRule.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ public function processNode(Node $node, Scope $scope): array
sprintf('in param-out type of parameter %%s of method %s::%s()', SprintfHelper::escapeFormatString($method->getDeclaringClass()->getDisplayName()), SprintfHelper::escapeFormatString($method->getName())),
sprintf('in return type of method %s::%s()', $method->getDeclaringClass()->getDisplayName(), $method->getName()),
sprintf('in method %s::%s()', $method->getDeclaringClass()->getDisplayName(), $method->getName()),
$method->getName() === '__construct' || $method->isStatic(),
$method->isPrivate(),
$method->isStatic(),
$method->isPrivate() || $method->getName() === '__construct',
);
}

Expand Down
5 changes: 0 additions & 5 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 @@ -59,11 +59,6 @@
"line": 124,
"ignorable": true
},
{
"message": "Template type T is declared as covariant, but occurs in invariant position in parameter v of method PHPStan\\Generics\\Variance\\ConstructorAndStatic::__construct().",
"line": 142,
"ignorable": true
},
{
"message": "Template type T is declared as covariant, but occurs in invariant position in parameter v of method PHPStan\\Generics\\Variance\\ConstructorAndStatic::create().",
"line": 153,
Expand Down
2 changes: 2 additions & 0 deletions tests/PHPStan/Rules/Generics/MethodSignatureVarianceRuleTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,8 @@ public function testRule(): void
79,
],
]);

$this->analyse([__DIR__ . '/data/method-signature-variance-constructor.php'], []);
}

public function testBug8880(): void
Expand Down
72 changes: 72 additions & 0 deletions tests/PHPStan/Rules/Generics/data/method-signature-variance-constructor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
<?php

namespace MethodSignatureVariance\Constructor;

/** @template-contravariant T */
interface In {
}

/** @template-covariant T */
interface Out {
}

/** @template T */
interface Invariant {
}

/** @template X */
class A {
/**
* @param X $a
* @param In<X> $b
* @param In<In<X>> $c
* @param In<Out<X>> $d
* @param In<Invariant<X>> $e
* @param Out<X> $f
* @param Out<In<X>> $g
* @param Out<Out<X>> $h
* @param Out<Invariant<X>> $i
* @param Invariant<X> $j
* @param Invariant<In<X>> $k
* @param Invariant<Out<X>> $l
*/
function __construct($a, $b, $c, $d, $e, $f, $g, $h, $i, $j, $k, $l) {}
}

/** @template-covariant X */
class B {
/**
* @param X $a
* @param In<X> $b
* @param In<In<X>> $c
* @param In<Out<X>> $d
* @param In<Invariant<X>> $e
* @param Out<X> $f
* @param Out<In<X>> $g
* @param Out<Out<X>> $h
* @param Out<Invariant<X>> $i
* @param Invariant<X> $j
* @param Invariant<In<X>> $k
* @param Invariant<Out<X>> $l
*/
function __construct($a, $b, $c, $d, $e, $f, $g, $h, $i, $j, $k, $l) {}
}

/** @template-contravariant X */
class C {
/**
* @param X $a
* @param In<X> $b
* @param In<In<X>> $c
* @param In<Out<X>> $d
* @param In<Invariant<X>> $e
* @param Out<X> $f
* @param Out<In<X>> $g
* @param Out<Out<X>> $h
* @param Out<Invariant<X>> $i
* @param Invariant<X> $j
* @param Invariant<In<X>> $k
* @param Invariant<Out<X>> $l
*/
function __construct($a, $b, $c, $d, $e, $f, $g, $h, $i, $j, $k, $l) {}
}