fix covariant type check when template has bound

phpstan · Jul 8, 2020 · b9c29a5 · b9c29a5
1 parent 87e3764
commit b9c29a5
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/src/Type/Generic/TemplateObjectType.php b/src/Type/Generic/TemplateObjectType.php
@@ -169,7 +169,7 @@ public function toArgument(): TemplateType
 		return new self(
 			$this->scope,
 			new TemplateTypeArgumentStrategy(),
-			TemplateTypeVariance::createInvariant(),
+			$this->variance,
 			$this->name,
 			$this->getClassName()
 		);

diff --git a/tests/PHPStan/Rules/Generics/MethodSignatureVarianceRuleTest.php b/tests/PHPStan/Rules/Generics/MethodSignatureVarianceRuleTest.php
@@ -23,27 +23,31 @@ public function testRule(): void
 		$this->analyse([__DIR__ . '/data/method-signature-variance.php'], [
 			[
 				'Template type T is declared as covariant, but occurs in contravariant position in parameter a of method MethodSignatureVariance\C::a().',
-				23,
+				25,
 			],
 			[
 				'Template type T is declared as covariant, but occurs in invariant position in parameter b of method MethodSignatureVariance\C::a().',
-				23,
+				25,
 			],
 			[
 				'Template type T is declared as covariant, but occurs in contravariant position in parameter c of method MethodSignatureVariance\C::a().',
-				23,
+				25,
+			],
+			[
+				'Template type W is declared as covariant, but occurs in contravariant position in parameter d of method MethodSignatureVariance\C::a().',
+				25,
 			],
 			[
 				'Template type U is declared as covariant, but occurs in contravariant position in parameter a of method MethodSignatureVariance\C::b().',
-				33,
+				35,
 			],
 			[
 				'Template type U is declared as covariant, but occurs in invariant position in parameter b of method MethodSignatureVariance\C::b().',
-				33,
+				35,
 			],
 			[
 				'Template type U is declared as covariant, but occurs in contravariant position in parameter c of method MethodSignatureVariance\C::b().',
-				33,
+				35,
 			],
 		]);
 	}

diff --git a/tests/PHPStan/Rules/Generics/data/method-signature-variance.php b/tests/PHPStan/Rules/Generics/data/method-signature-variance.php
@@ -12,15 +12,17 @@ interface Invariant {
 
 /**
  * @template-covariant T
+ * @template-covariant W of \DateTimeInterface
  */
 class C {
 	/**
 	 * @param Out<T> $a
 	 * @param Invariant<T> $b
 	 * @param T $c
+	 * @param W $d
 	 * @return T
 	 */
-	function a($a, $b, $c) {
+	function a($a, $b, $c, $d) {
 		return $c;
 	}
 	/**