Bleeding edge - Fix position variance of static method parameters

Author: jiripudil

conf/bleedingEdge.neon

@@ -33,3 +33,4 @@ parameters:
 		instanceofType: true
 		paramOutVariance: true
 		allInvalidPhpDocs: true
+		strictStaticMethodTemplateTypeVariance: true

conf/config.neon

@@ -63,6 +63,7 @@ parameters:
 		instanceofType: false
 		paramOutVariance: false
 		allInvalidPhpDocs: false
+		strictStaticMethodTemplateTypeVariance: false
 	fileExtensions:
 		- php
 	checkAdvancedIsset: false
@@ -296,6 +297,7 @@ parametersSchema:
 		instanceofType: bool()
 		paramOutVariance: bool()
 		allInvalidPhpDocs: bool()
+		strictStaticMethodTemplateTypeVariance: bool()
 	])
 	fileExtensions: listOf(string())
 	checkAdvancedIsset: bool()
@@ -1050,6 +1052,7 @@ services:
 		class: PHPStan\Rules\Generics\VarianceCheck
 		arguments:
 			checkParamOutVariance: %featureToggles.paramOutVariance%
+			strictStaticVariance: %featureToggles.strictStaticMethodTemplateTypeVariance%
 
 	-
 		class: PHPStan\Rules\IssetCheck

src/Rules/Generics/VarianceCheck.php

@@ -15,6 +15,7 @@ class VarianceCheck
 
 	public function __construct(
 		private bool $checkParamOutVariance,
+		private bool $strictStaticVariance,
 	)
 	{
 	}
@@ -52,7 +53,7 @@ public function checkParametersAcceptor(
 		}
 
 		$covariant = TemplateTypeVariance::createCovariant();
-		$parameterVariance = $isStatic
+		$parameterVariance = $isStatic && !$this->strictStaticVariance
 			? TemplateTypeVariance::createStatic()
 			: TemplateTypeVariance::createContravariant();
 

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

@@ -59,6 +59,16 @@
         "line": 124,
         "ignorable": true
     },
+    {
+        "message": "Template type T is declared as covariant, but occurs in contravariant position in parameter t of method PHPStan\\Generics\\Variance\\ConstructorAndStatic::create().",
+        "line": 153,
+        "ignorable": true
+    },
+    {
+        "message": "Template type T is declared as covariant, but occurs in contravariant position in parameter w of method PHPStan\\Generics\\Variance\\ConstructorAndStatic::create().",
+        "line": 153,
+        "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,

tests/PHPStan/Rules/Generics/ClassAncestorsRuleTest.php

@@ -17,7 +17,7 @@ protected function getRule(): Rule
 			new GenericAncestorsCheck(
 				$this->createReflectionProvider(),
 				new GenericObjectTypeCheck(),
-				new VarianceCheck(true),
+				new VarianceCheck(true, true),
 				true,
 				[],
 			),

tests/PHPStan/Rules/Generics/EnumAncestorsRuleTest.php

@@ -18,7 +18,7 @@ protected function getRule(): Rule
 			new GenericAncestorsCheck(
 				$this->createReflectionProvider(),
 				new GenericObjectTypeCheck(),
-				new VarianceCheck(true),
+				new VarianceCheck(true, true),
 				true,
 				[],
 			),

tests/PHPStan/Rules/Generics/InterfaceAncestorsRuleTest.php

@@ -17,7 +17,7 @@ protected function getRule(): Rule
 			new GenericAncestorsCheck(
 				$this->createReflectionProvider(),
 				new GenericObjectTypeCheck(),
-				new VarianceCheck(true),
+				new VarianceCheck(true, true),
 				true,
 				[],
 			),

tests/PHPStan/Rules/Generics/MethodSignatureVarianceRuleTest.php

@@ -180,6 +180,33 @@ public function testRule(): void
 		]);
 
 		$this->analyse([__DIR__ . '/data/method-signature-variance-constructor.php'], []);
+
+		$this->analyse([__DIR__ . '/data/method-signature-variance-static.php'], [
+			[
+				'Template type X is declared as covariant, but occurs in contravariant position in parameter a of method MethodSignatureVariance\StaticMethod\B::a().',
+				43,
+			],
+			[
+				'Template type X is declared as covariant, but occurs in contravariant position in parameter c of method MethodSignatureVariance\StaticMethod\B::a().',
+				43,
+			],
+			[
+				'Template type X is declared as covariant, but occurs in contravariant position in return type of method MethodSignatureVariance\StaticMethod\B::c().',
+				49,
+			],
+			[
+				'Template type X is declared as contravariant, but occurs in covariant position in parameter b of method MethodSignatureVariance\StaticMethod\C::a().',
+				62,
+			],
+			[
+				'Template type X is declared as contravariant, but occurs in covariant position in return type of method MethodSignatureVariance\StaticMethod\C::b().',
+				65,
+			],
+			[
+				'Template type X is declared as contravariant, but occurs in covariant position in return type of method MethodSignatureVariance\StaticMethod\C::d().',
+				71,
+			],
+		]);
 	}
 
 	public function testBug8880(): void

tests/PHPStan/Rules/Generics/UsedTraitsRuleTest.php

@@ -19,7 +19,7 @@ protected function getRule(): Rule
 			new GenericAncestorsCheck(
 				$this->createReflectionProvider(),
 				new GenericObjectTypeCheck(),
-				new VarianceCheck(true),
+				new VarianceCheck(true, true),
 				true,
 				[],
 			),

tests/PHPStan/Rules/Generics/data/method-signature-variance-static.php

@@ -0,0 +1,72 @@
+<?php
+
+namespace MethodSignatureVariance\StaticMethod;
+
+/** @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 Out<X> $c
+	 */
+	static function a($a, $b, $c) {}
+
+	/** @return X */
+	static function b() {}
+
+	/** @return In<X> */
+	static function c() {}
+
+	/** @return Out<X> */
+	static function d() {}
+}
+
+/** @template-covariant X */
+class B {
+	/**
+	 * @param X $a
+	 * @param In<X> $b
+	 * @param Out<X> $c
+	 */
+	static function a($a, $b, $c) {}
+
+	/** @return X */
+	static function b() {}
+
+	/** @return In<X> */
+	static function c() {}
+
+	/** @return Out<X> */
+	static function d() {}
+}
+
+/** @template-contravariant X */
+class C {
+	/**
+	 * @param X $a
+	 * @param In<X> $b
+	 * @param Out<X> $c
+	 */
+	static function a($a, $b, $c) {}
+
+	/** @return X */
+	static function b() {}
+
+	/** @return In<X> */
+	static function c() {}
+
+	/** @return Out<X> */
+	static function d() {}
+}