From 5ed0714a9f4999937d5da33f3683a9781f132df0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ji=C5=99=C3=AD=20Pudil?= <me@jiripudil.cz>
Date: Fri, 31 Mar 2023 14:21:59 +0200
Subject: [PATCH 1/2] do not check template type variance in constructor

---
 .../Generics/MethodSignatureVarianceRule.php  |  4 +-
 .../MethodSignatureVarianceRuleTest.php       |  2 +
 .../method-signature-variance-constructor.php | 72 +++++++++++++++++++
 3 files changed, 76 insertions(+), 2 deletions(-)
 create mode 100644 tests/PHPStan/Rules/Generics/data/method-signature-variance-constructor.php

diff --git a/src/Rules/Generics/MethodSignatureVarianceRule.php b/src/Rules/Generics/MethodSignatureVarianceRule.php
index 64102703f47..02caaff9c1e 100644
--- a/src/Rules/Generics/MethodSignatureVarianceRule.php
+++ b/src/Rules/Generics/MethodSignatureVarianceRule.php
@@ -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',
 		);
 	}
 
diff --git a/tests/PHPStan/Rules/Generics/MethodSignatureVarianceRuleTest.php b/tests/PHPStan/Rules/Generics/MethodSignatureVarianceRuleTest.php
index 184f12ca510..80d09a5c360 100644
--- a/tests/PHPStan/Rules/Generics/MethodSignatureVarianceRuleTest.php
+++ b/tests/PHPStan/Rules/Generics/MethodSignatureVarianceRuleTest.php
@@ -178,6 +178,8 @@ public function testRule(): void
 				79,
 			],
 		]);
+
+		$this->analyse([__DIR__ . '/data/method-signature-variance-constructor.php'], []);
 	}
 
 	public function testBug8880(): void
diff --git a/tests/PHPStan/Rules/Generics/data/method-signature-variance-constructor.php b/tests/PHPStan/Rules/Generics/data/method-signature-variance-constructor.php
new file mode 100644
index 00000000000..57d4dfc3b97
--- /dev/null
+++ b/tests/PHPStan/Rules/Generics/data/method-signature-variance-constructor.php
@@ -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) {}
+}

From 7b067f1d7d9b275f6a9cfcbb26147a3b18185a7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ji=C5=99=C3=AD=20Pudil?= <me@jiripudil.cz>
Date: Fri, 31 Mar 2023 14:45:22 +0200
Subject: [PATCH 2/2] fix test

---
 tests/PHPStan/Generics/data/variance-2.json | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/tests/PHPStan/Generics/data/variance-2.json b/tests/PHPStan/Generics/data/variance-2.json
index 888e38af9cb..d1474e29e5a 100644
--- a/tests/PHPStan/Generics/data/variance-2.json
+++ b/tests/PHPStan/Generics/data/variance-2.json
@@ -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,