php <8.1 compat

phpstan · Jan 7, 2024 · 3a87cc0 · 3a87cc0
1 parent 300e590
commit 3a87cc0
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/tests/PHPStan/Rules/Classes/RequireExtendsRuleTest.php b/tests/PHPStan/Rules/Classes/RequireExtendsRuleTest.php
@@ -4,6 +4,7 @@
 
 use PHPStan\Rules\Rule;
 use PHPStan\Testing\RuleTestCase;
+use const PHP_VERSION_ID;
 
 /**
  * @extends RuleTestCase<RequireExtendsRule>
@@ -18,7 +19,11 @@ protected function getRule(): Rule
 
 	public function testRule(): void
 	{
-		$this->analyse([__DIR__ . '/../PhpDoc/data/incompatible-require-extends.php'], [
+		if (PHP_VERSION_ID < 80100) {
+			$this->markTestSkipped('Test requires PHP 8.1');
+		}
+
+		$expectedErrors = [
 			[
 				'IncompatibleRequireExtends\ValidTrait requires using class to extend IncompatibleRequireExtends\SomeClass, but IncompatibleRequireExtends\InValidTraitUse2 does not.',
 				46,
@@ -35,7 +40,9 @@ public function testRule(): void
 				'IncompatibleRequireExtends\ValidInterface requires implementing class to extend IncompatibleRequireExtends\SomeClass, but IncompatibleRequireExtends\InvalidInterfaceUse does not.',
 				58,
 			],
-		]);
+		];
+
+		$this->analyse([__DIR__ . '/../PhpDoc/data/incompatible-require-extends.php'], $expectedErrors);
 	}
 
 }
diff --git a/tests/PHPStan/Rules/PhpDoc/IncompatibleRequireExtendsTypeRuleTest.php b/tests/PHPStan/Rules/PhpDoc/IncompatibleRequireExtendsTypeRuleTest.php
@@ -5,6 +5,7 @@
 use PHPStan\Rules\ClassCaseSensitivityCheck;
 use PHPStan\Rules\Rule;
 use PHPStan\Testing\RuleTestCase;
+use const PHP_VERSION_ID;
 
 /**
  * @extends RuleTestCase<IncompatibleRequireExtendsTypeRule>
@@ -26,6 +27,13 @@ protected function getRule(): Rule
 
 	public function testRule(): void
 	{
+		$enumError = 'PHPDoc tag @require-extends cannot contain non-class type IncompatibleRequireExtends\SomeEnum.';
+		$enumTip = null;
+		if (PHP_VERSION_ID < 80100) {
+			$enumError = 'PHPDoc tag @require-extends contains unknown class IncompatibleRequireExtends\SomeEnum.';
+			$enumTip = 'Learn more at https://phpstan.org/user-guide/discovering-symbols';
+		}
+
 		$this->analyse([__DIR__ . '/data/incompatible-require-extends.php'], [
 			[
 				'PHPDoc tag @require-extends cannot contain non-class type IncompatibleRequireExtends\SomeTrait.',
@@ -36,8 +44,9 @@ public function testRule(): void
 				13,
 			],
 			[
-				'PHPDoc tag @require-extends cannot contain non-class type IncompatibleRequireExtends\SomeEnum.',
+				$enumError,
 				18,
+				$enumTip,
 			],
 			[
 				'PHPDoc tag @require-extends contains unknown class IncompatibleRequireExtends\TypeDoesNotExist.',