Fix Invariant<Out<In<K>>> returns variance checking

phpstan · Jul 11, 2022 · 3d7710a · 3d7710a
1 parent fd5fa82
commit 3d7710a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/Type/Generic/TemplateTypeVariance.php b/src/Type/Generic/TemplateTypeVariance.php
@@ -93,6 +93,10 @@ public function compose(self $other): self
 			return self::createInvariant();
 		}
 
+		if ($this->invariant()) {
+			return self::createInvariant();
+		}
+
 		return $other;
 	}
 

diff --git a/tests/PHPStan/Rules/Generics/MethodSignatureVarianceRuleTest.php b/tests/PHPStan/Rules/Generics/MethodSignatureVarianceRuleTest.php
@@ -126,7 +126,7 @@ public function testRule(): void
 				152,
 			],
 			[
-				'Template type K is declared as covariant, but occurs in contravariant position in parameter l of method MethodSignatureVariance\C::a().',
+				'Template type K is declared as covariant, but occurs in invariant position in parameter l of method MethodSignatureVariance\C::a().',
 				152,
 			],
 			[
@@ -158,11 +158,11 @@ public function testRule(): void
 				182,
 			],
 			[
-				'Template type K is declared as covariant, but occurs in contravariant position in return type of method MethodSignatureVariance\C::l().',
+				'Template type K is declared as covariant, but occurs in invariant position in return type of method MethodSignatureVariance\C::l().',
 				185,
 			],
 			[
-				'Template type K is declared as covariant, but occurs in contravariant position in return type of method MethodSignatureVariance\C::m().',
+				'Template type K is declared as covariant, but occurs in invariant position in return type of method MethodSignatureVariance\C::m().',
 				188,
 			],
 		]);