Fix

ondrejmirtes · ondrejmirtes · commit 6d5c6fe717d2 · 2020-06-05T15:30:57.000+02:00
diff --git a/tests/PHPStan/Analyser/AnalyserIntegrationTest.php b/tests/PHPStan/Analyser/AnalyserIntegrationTest.php
@@ -174,13 +174,17 @@ public function testCollectWarnings(): void
 		restore_error_handler();
 		$errors = $this->runAnalyse(__DIR__ . '/data/declaration-warning.php');
 		if (self::$useStaticReflectionProvider) {
-			$this->assertCount(0, $errors);
+			$this->assertCount(1, $errors);
+			$this->assertSame('Parameter #1 $i of method DeclarationWarning\Bar::doFoo() is not optional.', $errors[0]->getMessage());
+			$this->assertSame(22, $errors[0]->getLine());
 			return;
 		}
-		$this->assertCount(1, $errors);
+		$this->assertCount(2, $errors);
 		$this->assertSame('Declaration of DeclarationWarning\Bar::doFoo(int $i): void should be compatible with DeclarationWarning\Foo::doFoo(): void', $errors[0]->getMessage());
 		$this->assertSame(__DIR__ . DIRECTORY_SEPARATOR . 'data' . DIRECTORY_SEPARATOR . 'declaration-warning.php', $errors[0]->getFile());
 		$this->assertSame(PHP_VERSION_ID >= 70400 ? 22 : 27, $errors[0]->getLine());
+		$this->assertSame('Parameter #1 $i of method DeclarationWarning\Bar::doFoo() is not optional.', $errors[1]->getMessage());
+		$this->assertSame(22, $errors[1]->getLine());
 	}
 
 	public function testPropertyAssignIntersectionStaticTypeBug(): void
diff --git a/tests/PHPStan/Rules/Methods/OverridingMethodRuleTest.php b/tests/PHPStan/Rules/Methods/OverridingMethodRuleTest.php
@@ -5,7 +5,6 @@
 use PHPStan\Php\PhpVersion;
 use PHPStan\Rules\Rule;
 use PHPStan\Testing\RuleTestCase;
-use const PHP_VERSION_ID;
 
 /**
  * @extends RuleTestCase<OverridingMethodRule>
@@ -21,13 +20,32 @@ protected function getRule(): Rule
 		return new OverridingMethodRule(new PhpVersion($this->phpVersionId));
 	}
 
-	public function testOverridingFinalMethod(): void
+	public function dataOverridingFinalMethod(): array
+	{
+		return [
+			[
+				70300,
+				'compatible',
+			],
+			[
+				70400,
+				'contravariant',
+			],
+		];
+	}
+
+	/**
+	 * @dataProvider dataOverridingFinalMethod
+	 * @param int $phpVersion
+	 * @param string $message
+	 */
+	public function testOverridingFinalMethod(int $phpVersion, string $message): void
 	{
 		if (!self::$useStaticReflectionProvider) {
 			$this->markTestSkipped('Test requires static reflection.');
 		}
 
-		$this->phpVersionId = PHP_VERSION_ID;
+		$this->phpVersionId = $phpVersion;
 		$this->analyse([__DIR__ . '/data/overriding-method.php'], [
 			[
 				'Method OverridingFinalMethod\Bar::doFoo() overrides final method OverridingFinalMethod\Foo::doFoo().',
@@ -54,15 +72,15 @@ public function testOverridingFinalMethod(): void
 				68,
 			],
 			[
-				'Parameter #1 $s (string) of method OverridingFinalMethod\Dolor::__construct() is not contravariant with parameter #1 $i (int) of method OverridingFinalMethod\Ipsum::__construct().',
+				'Parameter #1 $s (string) of method OverridingFinalMethod\Dolor::__construct() is not ' . $message . ' 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 (string) of method OverridingFinalMethod\FixedArray::setSize() is not contravariant with parameter #1 $size (int) of method SplFixedArray::setSize().',
+				'Parameter #1 $size (string) of method OverridingFinalMethod\FixedArray::setSize() is not ' . $message . ' with parameter #1 $size (int) of method SplFixedArray::setSize().',
 				125,
 			],
 			[
