Fix

ondrejmirtes · ondrejmirtes · commit 4576346b96fa · 2020-06-07T11:59:48.000+02:00
diff --git a/tests/PHPStan/Rules/Methods/OverridingMethodRuleTest.php b/tests/PHPStan/Rules/Methods/OverridingMethodRuleTest.php
@@ -30,20 +30,22 @@ public function dataOverridingFinalMethod(): array
 			[
 				70300,
 				'compatible',
+				'compatible',
 			],
 			[
 				70400,
 				'contravariant',
+				'covariant',
 			],
 		];
 	}
 
 	/**
 	 * @dataProvider dataOverridingFinalMethod
 	 * @param int $phpVersion
-	 * @param string $message
+	 * @param string $contravariantMessage
 	 */
-	public function testOverridingFinalMethod(int $phpVersion, string $message): void
+	public function testOverridingFinalMethod(int $phpVersion, string $contravariantMessage): void
 	{
 		if (!self::$useStaticReflectionProvider) {
 			$this->markTestSkipped('Test requires static reflection.');
@@ -76,15 +78,15 @@ public function testOverridingFinalMethod(int $phpVersion, string $message): voi
 				68,
 			],
 			[
-				'Parameter #1 $s (string) of method OverridingFinalMethod\Dolor::__construct() is not ' . $message . ' with parameter #1 $i (int) of method OverridingFinalMethod\Ipsum::__construct().',
+				'Parameter #1 $s (string) of method OverridingFinalMethod\Dolor::__construct() is not ' . $contravariantMessage . ' with parameter #1 $i (int) of method OverridingFinalMethod\Ipsum::__construct().',
 				110,
 			],
 			[
 				'Method OverridingFinalMethod\Dolor::doFoo() overrides method OverridingFinalMethod\Ipsum::doFoo() but misses parameter #1 $i.',
 				115,
 			],
 			[
-				'Parameter #1 $size (int) of method OverridingFinalMethod\FixedArray::setSize() is not ' . $message . ' with parameter #1 $size (mixed) of method SplFixedArray::setSize().',
+				'Parameter #1 $size (int) of method OverridingFinalMethod\FixedArray::setSize() is not ' . $contravariantMessage . ' with parameter #1 $size (mixed) of method SplFixedArray::setSize().',
 				125,
 			],
 			[
@@ -282,20 +284,26 @@ public function testReturnTypeCovariance(
 		$this->analyse([__DIR__ . '/data/return-type-covariance.php'], $expectedErrors);
 	}
 
-	public function testParle(): void
+	/**
+	 * @dataProvider dataOverridingFinalMethod
+	 * @param int $phpVersion
+	 * @param string $contravariantMessage
+	 * @param string $covariantMessage
+	 */
+	public function testParle(int $phpVersion, string $contravariantMessage, string $covariantMessage): void
 	{
 		if (!self::$useStaticReflectionProvider) {
 			$this->markTestSkipped('Test requires static reflection.');
 		}
 
-		$this->phpVersionId = PHP_VERSION_ID;
+		$this->phpVersionId = $phpVersion;
 		$this->analyse([__DIR__ . '/data/parle.php'], [
 			[
-				'Parameter #1 $state (int) of method OverridingParle\Foo::pushState() is not contravariant with parameter #1 $state (string) of method Parle\RLexer::pushState().',
+				'Parameter #1 $state (int) of method OverridingParle\Foo::pushState() is not ' . $contravariantMessage . ' with parameter #1 $state (string) of method Parle\RLexer::pushState().',
 				8,
 			],
 			[
-				'Return type string of method OverridingParle\Foo::pushState() is not covariant with return type int of method Parle\RLexer::pushState().',
+				'Return type string of method OverridingParle\Foo::pushState() is not ' . $covariantMessage . ' with return type int of method Parle\RLexer::pushState().',
 				8,
 			],
 		]);

Original file line number	Diff line number	Diff line change
`@@ -30,20 +30,22 @@ public function dataOverridingFinalMethod(): array`
`30`	`30`	`[`
`31`	`31`	`70300,`
`32`	`32`	`'compatible',`
	`33`	`+ 'compatible',`
`33`	`34`	`],`
`34`	`35`	`[`
`35`	`36`	`70400,`
`36`	`37`	`'contravariant',`
	`38`	`+ 'covariant',`
`37`	`39`	`],`
`38`	`40`	`];`
`39`	`41`	`}`
`40`	`42`
`41`	`43`	`/**`
`42`	`44`	`* @dataProvider dataOverridingFinalMethod`
`43`	`45`	`* @param int $phpVersion`
`44`		`- * @param string $message`
	`46`	`+ * @param string $contravariantMessage`
`45`	`47`	`*/`
`46`		`- public function testOverridingFinalMethod(int $phpVersion, string $message): void`
	`48`	`+ public function testOverridingFinalMethod(int $phpVersion, string $contravariantMessage): void`
`47`	`49`	`{`
`48`	`50`	`if (!self::$useStaticReflectionProvider) {`
`49`	`51`	`$this->markTestSkipped('Test requires static reflection.');`
`@@ -76,15 +78,15 @@ public function testOverridingFinalMethod(int $phpVersion, string $message): voi`
`76`	`78`	`68,`
`77`	`79`	`],`
`78`	`80`	`[`
`79`		`- 'Parameter #1 $s (string) of method OverridingFinalMethod\Dolor::__construct() is not ' . $message . ' with parameter #1 $i (int) of method OverridingFinalMethod\Ipsum::__construct().',`
	`81`	`+ 'Parameter #1 $s (string) of method OverridingFinalMethod\Dolor::__construct() is not ' . $contravariantMessage . ' with parameter #1 $i (int) of method OverridingFinalMethod\Ipsum::__construct().',`
`80`	`82`	`110,`
`81`	`83`	`],`
`82`	`84`	`[`
`83`	`85`	`'Method OverridingFinalMethod\Dolor::doFoo() overrides method OverridingFinalMethod\Ipsum::doFoo() but misses parameter #1 $i.',`
`84`	`86`	`115,`
`85`	`87`	`],`
`86`	`88`	`[`
`87`		`- 'Parameter #1 $size (int) of method OverridingFinalMethod\FixedArray::setSize() is not ' . $message . ' with parameter #1 $size (mixed) of method SplFixedArray::setSize().',`
	`89`	`+ 'Parameter #1 $size (int) of method OverridingFinalMethod\FixedArray::setSize() is not ' . $contravariantMessage . ' with parameter #1 $size (mixed) of method SplFixedArray::setSize().',`
`88`	`90`	`125,`
`89`	`91`	`],`
`90`	`92`	`[`
`@@ -282,20 +284,26 @@ public function testReturnTypeCovariance(`
`282`	`284`	`$this->analyse([__DIR__ . '/data/return-type-covariance.php'], $expectedErrors);`
`283`	`285`	`}`
`284`	`286`
`285`		`- public function testParle(): void`
	`287`	`+ /**`
	`288`	`+ * @dataProvider dataOverridingFinalMethod`
	`289`	`+ * @param int $phpVersion`
	`290`	`+ * @param string $contravariantMessage`
	`291`	`+ * @param string $covariantMessage`
	`292`	`+ */`
	`293`	`+ public function testParle(int $phpVersion, string $contravariantMessage, string $covariantMessage): void`
`286`	`294`	`{`
`287`	`295`	`if (!self::$useStaticReflectionProvider) {`
`288`	`296`	`$this->markTestSkipped('Test requires static reflection.');`
`289`	`297`	`}`
`290`	`298`
`291`		`- $this->phpVersionId = PHP_VERSION_ID;`
	`299`	`+ $this->phpVersionId = $phpVersion;`
`292`	`300`	`$this->analyse([__DIR__ . '/data/parle.php'], [`
`293`	`301`	`[`
`294`		`- 'Parameter #1 $state (int) of method OverridingParle\Foo::pushState() is not contravariant with parameter #1 $state (string) of method Parle\RLexer::pushState().',`
	`302`	`+ 'Parameter #1 $state (int) of method OverridingParle\Foo::pushState() is not ' . $contravariantMessage . ' with parameter #1 $state (string) of method Parle\RLexer::pushState().',`
`295`	`303`	`8,`
`296`	`304`	`],`
`297`	`305`	`[`
`298`		`- 'Return type string of method OverridingParle\Foo::pushState() is not covariant with return type int of method Parle\RLexer::pushState().',`
	`306`	`+ 'Return type string of method OverridingParle\Foo::pushState() is not ' . $covariantMessage . ' with return type int of method Parle\RLexer::pushState().',`
`299`	`307`	`8,`
`300`	`308`	`],`
`301`	`309`	`]);`