Skip to content

Commit 800e0c4

Browse files
authored
Do not check template type variance in constructor
1 parent eeccc36 commit 800e0c4

4 files changed

Lines changed: 76 additions & 7 deletions

File tree

‎src/Rules/Generics/MethodSignatureVarianceRule.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ public function processNode(Node $node, Scope $scope): array
3535
sprintf('in param-out type of parameter %%s of method %s::%s()', SprintfHelper::escapeFormatString($method->getDeclaringClass()->getDisplayName()), SprintfHelper::escapeFormatString($method->getName())),
3636
sprintf('in return type of method %s::%s()', $method->getDeclaringClass()->getDisplayName(), $method->getName()),
3737
sprintf('in method %s::%s()', $method->getDeclaringClass()->getDisplayName(), $method->getName()),
38-
$method->getName() === '__construct' || $method->isStatic(),
39-
$method->isPrivate(),
38+
$method->isStatic(),
39+
$method->isPrivate() || $method->getName() === '__construct',
4040
);
4141
}
4242

‎tests/PHPStan/Generics/data/variance-2.json‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,6 @@
5959
"line": 124,
6060
"ignorable": true
6161
},
62-
{
63-
"message": "Template type T is declared as covariant, but occurs in invariant position in parameter v of method PHPStan\\Generics\\Variance\\ConstructorAndStatic::__construct().",
64-
"line": 142,
65-
"ignorable": true
66-
},
6762
{
6863
"message": "Template type T is declared as covariant, but occurs in invariant position in parameter v of method PHPStan\\Generics\\Variance\\ConstructorAndStatic::create().",
6964
"line": 153,

‎tests/PHPStan/Rules/Generics/MethodSignatureVarianceRuleTest.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,8 @@ public function testRule(): void
178178
79,
179179
],
180180
]);
181+
182+
$this->analyse([__DIR__ . '/data/method-signature-variance-constructor.php'], []);
181183
}
182184

183185
public function testBug8880(): void
Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
<?php
2+
3+
namespace MethodSignatureVariance\Constructor;
4+
5+
/** @template-contravariant T */
6+
interface In {
7+
}
8+
9+
/** @template-covariant T */
10+
interface Out {
11+
}
12+
13+
/** @template T */
14+
interface Invariant {
15+
}
16+
17+
/** @template X */
18+
class A {
19+
/**
20+
* @param X $a
21+
* @param In<X> $b
22+
* @param In<In<X>> $c
23+
* @param In<Out<X>> $d
24+
* @param In<Invariant<X>> $e
25+
* @param Out<X> $f
26+
* @param Out<In<X>> $g
27+
* @param Out<Out<X>> $h
28+
* @param Out<Invariant<X>> $i
29+
* @param Invariant<X> $j
30+
* @param Invariant<In<X>> $k
31+
* @param Invariant<Out<X>> $l
32+
*/
33+
function __construct($a, $b, $c, $d, $e, $f, $g, $h, $i, $j, $k, $l) {}
34+
}
35+
36+
/** @template-covariant X */
37+
class B {
38+
/**
39+
* @param X $a
40+
* @param In<X> $b
41+
* @param In<In<X>> $c
42+
* @param In<Out<X>> $d
43+
* @param In<Invariant<X>> $e
44+
* @param Out<X> $f
45+
* @param Out<In<X>> $g
46+
* @param Out<Out<X>> $h
47+
* @param Out<Invariant<X>> $i
48+
* @param Invariant<X> $j
49+
* @param Invariant<In<X>> $k
50+
* @param Invariant<Out<X>> $l
51+
*/
52+
function __construct($a, $b, $c, $d, $e, $f, $g, $h, $i, $j, $k, $l) {}
53+
}
54+
55+
/** @template-contravariant X */
56+
class C {
57+
/**
58+
* @param X $a
59+
* @param In<X> $b
60+
* @param In<In<X>> $c
61+
* @param In<Out<X>> $d
62+
* @param In<Invariant<X>> $e
63+
* @param Out<X> $f
64+
* @param Out<In<X>> $g
65+
* @param Out<Out<X>> $h
66+
* @param Out<Invariant<X>> $i
67+
* @param Invariant<X> $j
68+
* @param Invariant<In<X>> $k
69+
* @param Invariant<Out<X>> $l
70+
*/
71+
function __construct($a, $b, $c, $d, $e, $f, $g, $h, $i, $j, $k, $l) {}
72+
}

0 commit comments

Comments
 (0)