Fix tests

phpstan · Sep 4, 2024 · 069d6e9 · 069d6e9
1 parent 88560b6
commit 069d6e9
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 14 deletions.
diff --git a/tests/PHPStan/Rules/Functions/ArrowFunctionReturnTypeRuleTest.php b/tests/PHPStan/Rules/Functions/ArrowFunctionReturnTypeRuleTest.php
@@ -39,9 +39,20 @@ public function testRule(): void
  'Anonymous function should return int but returns string.',
  14,
  ],
+
+ ]);
+ }
+
+ public function testRuleNever(): void
+ {
+ if (PHP_VERSION_ID < 80100) {
+ self::markTestSkipped('Test requires PHP 8.1.');
+ }
+
+ $this->analyse([__DIR__ . '/data/arrow-function-never-return.php'], [
  [
  'Anonymous function should never return but return statement found.',
- 44,
+ 12,
  ],
  ]);
  }

diff --git a/tests/PHPStan/Rules/Functions/ExistingClassesInArrowFunctionTypehintsRuleTest.php b/tests/PHPStan/Rules/Functions/ExistingClassesInArrowFunctionTypehintsRuleTest.php
@@ -289,7 +289,14 @@ public function testIntersectionTypes(int $phpVersion, array $errors): void
  public function testNever(): void
  {
  $errors = [];
- if (PHP_VERSION_ID < 80200) {
+ if (PHP_VERSION_ID < 80100) {
+ $errors = [
+ [
+ 'Anonymous function has invalid return type ArrowFunctionNever\never.',
+ 6,
+ ],
+ ];
+ } elseif (PHP_VERSION_ID < 80200) {
  $errors = [
  [
  'Never return type in arrow function is supported only on PHP 8.2 and later.',

diff --git a/tests/PHPStan/Rules/Functions/data/arrow-function-never-return.php b/tests/PHPStan/Rules/Functions/data/arrow-function-never-return.php
@@ -0,0 +1,15 @@
+<?php // lint >= 8.1
+
+namespace ArrowFunctionNeverReturn;
+
+class Baz
+{
+
+ public function doFoo(): void
+ {
+ $f = fn () => throw new \Exception();
+ $g = fn (): never => throw new \Exception();
+ $g = fn (): never => 1;
+ }
+
+}
diff --git a/tests/PHPStan/Rules/Functions/data/arrow-functions-return-type.php b/tests/PHPStan/Rules/Functions/data/arrow-functions-return-type.php
@@ -33,15 +33,3 @@ public function doBar(): void
 }
 
 static fn (int $value): iterable => yield $value;
-
-class Baz
-{
-
- public function doFoo(): void
- {
- $f = fn () => throw new \Exception();
- $g = fn (): never => throw new \Exception();
- $g = fn (): never => 1;
- }
-
-}
diff --git a/tests/PHPStan/Rules/Playground/FunctionNeverRuleTest.php b/tests/PHPStan/Rules/Playground/FunctionNeverRuleTest.php
@@ -4,6 +4,7 @@
 
 use PHPStan\Rules\Rule;
 use PHPStan\Testing\RuleTestCase;
+use const PHP_VERSION_ID;
 
 /**
  * @extends RuleTestCase<FunctionNeverRule>
@@ -18,6 +19,10 @@ protected function getRule(): Rule
 
  public function testRule(): void
  {
+ if (PHP_VERSION_ID < 80100) {
+ self::markTestSkipped('Test requires PHP 8.1 or greater.');
+ }
+
  $this->analyse([__DIR__ . '/data/function-never.php'], [
  [
  'Function FunctionNever\doBar() always throws an exception, it should have return type "never".',

diff --git a/tests/PHPStan/Rules/Playground/MethodNeverRuleTest.php b/tests/PHPStan/Rules/Playground/MethodNeverRuleTest.php
@@ -4,6 +4,7 @@
 
 use PHPStan\Rules\Rule;
 use PHPStan\Testing\RuleTestCase;
+use const PHP_VERSION_ID;
 
 /**
  * @extends RuleTestCase<MethodNeverRule>
@@ -18,6 +19,10 @@ protected function getRule(): Rule
 
  public function testRule(): void
  {
+ if (PHP_VERSION_ID < 80100) {
+ self::markTestSkipped('Test requires PHP 8.1 or greater.');
+ }
+
  $this->analyse([__DIR__ . '/data/method-never.php'], [
  [
  'Method MethodNever\Foo::doBar() always throws an exception, it should have return type "never".',