Skip more mixed tests

ondrejmirtes · ondrejmirtes · commit 8b43cfaace43 · 2024-09-04T15:30:35.000+02:00
diff --git a/tests/PHPStan/Analyser/AnalyserIntegrationTest.php b/tests/PHPStan/Analyser/AnalyserIntegrationTest.php
@@ -827,6 +827,10 @@ public function testBug7094(): void
 
 	public function testOffsetAccess(): void
 	{
+		if (PHP_VERSION_ID < 80000) {
+			self::markTestSkipped('Test requires PHP 8.0.');
+		}
+
 		$errors = $this->runAnalyse(__DIR__ . '/nsrt/offset-access.php');
 		$this->assertCount(1, $errors);
 		$this->assertSame('PHPDoc tag @return contains unresolvable type.', $errors[0]->getMessage());
@@ -1063,6 +1067,10 @@ public function testBug8376(): void
 
 	public function testAssertDocblock(): void
 	{
+		if (PHP_VERSION_ID < 80000) {
+			self::markTestSkipped('Test requires PHP 8.0.');
+		}
+
 		$errors = $this->runAnalyse(__DIR__ . '/nsrt/assert-docblock.php');
 		$this->assertCount(4, $errors);
 		$this->assertSame('Call to method AssertDocblock\A::testInt() with string will always evaluate to false.', $errors[0]->getMessage());
@@ -1396,6 +1404,10 @@ public function testBug11147(): void
 
 	public function testBug11283(): void
 	{
+		if (PHP_VERSION_ID < 80000) {
+			self::markTestSkipped('Test requires PHP 8.0.');
+		}
+
 		$errors = $this->runAnalyse(__DIR__ . '/data/bug-11283.php');
 		$this->assertNoErrors($errors);
 	}
diff --git a/tests/PHPStan/Analyser/NodeScopeResolverTest.php b/tests/PHPStan/Analyser/NodeScopeResolverTest.php
@@ -152,7 +152,10 @@ public function dataFileAsserts(): iterable
 		yield from $this->gatherAssertTypes(__DIR__ . '/../Rules/Properties/data/bug-7839.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/../Rules/Classes/data/bug-5333.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/../Rules/Methods/data/bug-8174.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/../Rules/Comparison/data/bug-8169.php');
+
+		if (PHP_VERSION_ID >= 80000) {
+			yield from $this->gatherAssertTypes(__DIR__ . '/../Rules/Comparison/data/bug-8169.php');
+		}
 		yield from $this->gatherAssertTypes(__DIR__ . '/../Rules/Functions/data/bug-8280.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/../Rules/Comparison/data/bug-8277.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/../Rules/Variables/data/bug-8113.php');
diff --git a/tests/PHPStan/Analyser/nsrt/bug-10131.php b/tests/PHPStan/Analyser/nsrt/bug-10131.php
@@ -1,4 +1,4 @@
-<?php
+<?php // lint >= 8.0
 
 namespace Bug10131;
 
diff --git a/tests/PHPStan/Analyser/nsrt/bug-7607.php b/tests/PHPStan/Analyser/nsrt/bug-7607.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types = 1);
+<?php // lint >= 8.0
+
+declare(strict_types = 1);
 
 namespace Bug7607;
 
diff --git a/tests/PHPStan/Analyser/nsrt/bug-7685.php b/tests/PHPStan/Analyser/nsrt/bug-7685.php
@@ -1,4 +1,4 @@
-<?php
+<?php // lint >= 8.0
 
 namespace bug7685;
 
diff --git a/tests/PHPStan/Analyser/nsrt/bug-9105.php b/tests/PHPStan/Analyser/nsrt/bug-9105.php
@@ -1,4 +1,4 @@
-<?php
+<?php // lint >= 8.0
 
 namespace Bug9105;
 
diff --git a/tests/PHPStan/Analyser/nsrt/falsey-isset-certainty.php b/tests/PHPStan/Analyser/nsrt/falsey-isset-certainty.php
@@ -1,4 +1,4 @@
-<?php
+<?php // lint >= 8.0
 
 namespace FalseyIssetCertainty;
 
diff --git a/tests/PHPStan/Analyser/nsrt/falsey-ternary-certainty.php b/tests/PHPStan/Analyser/nsrt/falsey-ternary-certainty.php
@@ -1,4 +1,4 @@
-<?php
+<?php // lint >= 8.0
 
 namespace FalseyTernaryCertainty;
 
diff --git a/tests/PHPStan/Analyser/nsrt/in_array_loose.php b/tests/PHPStan/Analyser/nsrt/in_array_loose.php
@@ -1,4 +1,4 @@
-<?php
+<?php // lint >= 8.0
 
 namespace InArrayLoose;
 
diff --git a/tests/PHPStan/Rules/Comparison/ImpossibleCheckTypeMethodCallRuleTest.php b/tests/PHPStan/Rules/Comparison/ImpossibleCheckTypeMethodCallRuleTest.php
@@ -208,15 +208,15 @@ public function testBug8169(): void
 		$this->analyse([__DIR__ . '/data/bug-8169.php'], [
 			[
 				'Call to method Bug8169\HelloWorld::assertString() with string will always evaluate to true.',
-				19,
+				21,
 			],
 			[
 				'Call to method Bug8169\HelloWorld::assertString() with string will always evaluate to true.',
-				26,
+				28,
 			],
 			[
 				'Call to method Bug8169\HelloWorld::assertString() with int will always evaluate to false.',
-				33,
+				35,
 			],
 		]);
 	}
diff --git a/tests/PHPStan/Rules/Comparison/data/bug-8169.php b/tests/PHPStan/Rules/Comparison/data/bug-8169.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types = 1);
+<?php // lint >= 8.0
+
+declare(strict_types = 1);
 
 namespace Bug8169;
 
diff --git a/tests/PHPStan/Rules/Functions/ExistingClassesInTypehintsRuleTest.php b/tests/PHPStan/Rules/Functions/ExistingClassesInTypehintsRuleTest.php
@@ -368,6 +368,10 @@ public function dataRequiredParameterAfterOptional(): array
 	 */
 	public function testRequiredParameterAfterOptional(int $phpVersionId, array $errors): void
 	{
+		if (PHP_VERSION_ID < 80000) {
+			self::markTestSkipped('Test requires PHP 8.0.');
+		}
+
 		$this->phpVersionId = $phpVersionId;
 		$this->analyse([__DIR__ . '/data/required-parameter-after-optional.php'], $errors);
 	}
@@ -439,6 +443,10 @@ public function testTrueTypehint(): void
 
 	public function testConditionalReturnType(): void
 	{
+		if (PHP_VERSION_ID < 80000) {
+			self::markTestSkipped('Test requires PHP 8.0.');
+		}
+
 		$this->analyse([__DIR__ . '/data/conditional-return-type.php'], [
 			[
 				'Template type T of function FunctionConditionalReturnType\notGet() is not referenced in a parameter.',
@@ -449,6 +457,10 @@ public function testConditionalReturnType(): void
 
 	public function testTemplateInParamOut(): void
 	{
+		if (PHP_VERSION_ID < 80000) {
+			self::markTestSkipped('Test requires PHP 8.0.');
+		}
+
 		$this->analyse([__DIR__ . '/data/param-out.php'], [
 			[
 				'Template type S of function ParamOutTemplate\uselessGeneric() is not referenced in a parameter.',
diff --git a/tests/PHPStan/Rules/Methods/ExistingClassesInTypehintsRuleTest.php b/tests/PHPStan/Rules/Methods/ExistingClassesInTypehintsRuleTest.php
@@ -437,6 +437,25 @@ public function testTrueTypehint(): void
 	{
 		if (PHP_VERSION_ID >= 80200) {
 			$errors = [];
+		} elseif (PHP_VERSION_ID >= 80000) {
+			$errors = [
+				[
+					'Parameter $v of method NativeTrueType\Truthy::foo() has invalid type NativeTrueType\true.',
+					10,
+				],
+				[
+					'Method NativeTrueType\Truthy::foo() has invalid return type NativeTrueType\true.',
+					10,
+				],
+				[
+					'Parameter $trueUnion of method NativeTrueType\Truthy::trueUnion() has invalid type NativeTrueType\true.',
+					14,
+				],
+				[
+					'Method NativeTrueType\Truthy::trueUnionReturn() has invalid return type NativeTrueType\true.',
+					31,
+				],
+			];
 		} else {
 			$errors = [
 				[
@@ -447,14 +466,30 @@ public function testTrueTypehint(): void
 					'Method NativeTrueType\Truthy::foo() has invalid return type NativeTrueType\true.',
 					10,
 				],
+				[
+					"Method NativeTrueType\Truthy::trueUnion() uses native union types but they're supported only on PHP 8.0 and later.",
+					14,
+				],
 				[
 					'Parameter $trueUnion of method NativeTrueType\Truthy::trueUnion() has invalid type NativeTrueType\true.',
 					14,
 				],
+				[
+					'Parameter $trueUnion of method NativeTrueType\Truthy::trueUnion() has invalid type NativeTrueType\null.',
+					14,
+				],
+				[
+					"Method NativeTrueType\Truthy::trueUnionReturn() uses native union types but they're supported only on PHP 8.0 and later.",
+					31,
+				],
 				[
 					'Method NativeTrueType\Truthy::trueUnionReturn() has invalid return type NativeTrueType\true.',
 					31,
 				],
+				[
+					'Method NativeTrueType\Truthy::trueUnionReturn() has invalid return type NativeTrueType\null.',
+					31,
+				],
 			];
 		}
 
diff --git a/tests/PHPStan/Rules/Methods/ReturnTypeRuleTest.php b/tests/PHPStan/Rules/Methods/ReturnTypeRuleTest.php
@@ -283,8 +283,31 @@ public function testReturnTypeRule(): void
 		]);
 	}
 
+	public function testMisleadingMixedType(): void
+	{
+		if (PHP_VERSION_ID >= 80000) {
+			$errors = [];
+		} else {
+			$errors = [
+				[
+					'Method MethodMisleadingMixedReturn\Foo::misleadingMixedReturnType() should return MethodMisleadingMixedReturn\mixed but returns int.',
+					11,
+				],
+				[
+					'Method MethodMisleadingMixedReturn\Foo::misleadingMixedReturnType() should return MethodMisleadingMixedReturn\mixed but returns true.',
+					14,
+				],
+			];
+		}
+		$this->analyse([__DIR__ . '/data/method-misleading-mixed-return.php'], $errors);
+	}
+
 	public function testMisleadingTypehintsInClassWithoutNamespace(): void
 	{
+		if (PHP_VERSION_ID < 80000) {
+			self::markTestSkipped('Test requires PHP 8.0.');
+		}
+
 		$this->analyse([__DIR__ . '/data/misleadingTypehints.php'], [
 			[
 				'Method FooWithoutNamespace::misleadingBoolReturnType() should return boolean but returns true.',
@@ -522,6 +545,10 @@ public function testBug2573(): void
 
 	public function testBug4603(): void
 	{
+		if (PHP_VERSION_ID < 80000) {
+			self::markTestSkipped('Test requires PHP 8.0.');
+		}
+
 		$this->analyse([__DIR__ . '/data/bug-4603.php'], []);
 	}
 
@@ -774,6 +801,10 @@ public function testBug6358(): void
 
 	public function testBug8071(): void
 	{
+		if (PHP_VERSION_ID < 80000) {
+			self::markTestSkipped('Test requires PHP 8.0.');
+		}
+
 		$this->checkExplicitMixed = true;
 		$this->analyse([__DIR__ . '/data/bug-8071.php'], [
 			[
diff --git a/tests/PHPStan/Rules/Methods/data/method-misleading-mixed-return.php b/tests/PHPStan/Rules/Methods/data/method-misleading-mixed-return.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace MethodMisleadingMixedReturn;
+
+class Foo
+{
+
+	public function misleadingMixedReturnType(): mixed
+	{
+		if (rand(0, 1)) {
+			return 1;
+		}
+		if (rand(0, 1)) {
+			return true;
+		}
+		if (rand(0, 1)) {
+			return new mixed();
+		}
+	}
+
+}
diff --git a/tests/PHPStan/Rules/Methods/data/returnTypes.php b/tests/PHPStan/Rules/Methods/data/returnTypes.php
@@ -375,7 +375,7 @@ public function misleadingIntReturnType(): \ReturnTypes\integer
 		}
 	}
 
-	public function misleadingMixedReturnType(): mixed
+	/*public function misleadingMixedReturnType(): mixed
 	{
 		if (rand(0, 1)) {
 			return 1;
@@ -386,7 +386,7 @@ public function misleadingMixedReturnType(): mixed
 		if (rand(0, 1)) {
 			return new mixed();
 		}
-	}
+	}*/
 }
 
 class FooChild extends Foo
diff --git a/tests/PHPStan/Rules/Properties/NullsafePropertyFetchRuleTest.php b/tests/PHPStan/Rules/Properties/NullsafePropertyFetchRuleTest.php
@@ -66,6 +66,10 @@ public function testBug8517(): void
 
 	public function testBug9105(): void
 	{
+		if (PHP_VERSION_ID < 80000) {
+			self::markTestSkipped('Test requires PHP 8.0.');
+		}
+
 		$this->analyse([__DIR__ . '/../../Analyser/nsrt/bug-9105.php'], []);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<?php`
	`1`	`+<?php // lint >= 8.0`
`2`	`2`
`3`	`3`	`namespace Bug10131;`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -208,15 +208,15 @@ public function testBug8169(): void`
`208`	`208`	`$this->analyse([__DIR__ . '/data/bug-8169.php'], [`
`209`	`209`	`[`
`210`	`210`	`'Call to method Bug8169\HelloWorld::assertString() with string will always evaluate to true.',`
`211`		`- 19,`
	`211`	`+ 21,`
`212`	`212`	`],`
`213`	`213`	`[`
`214`	`214`	`'Call to method Bug8169\HelloWorld::assertString() with string will always evaluate to true.',`
`215`		`- 26,`
	`215`	`+ 28,`
`216`	`216`	`],`
`217`	`217`	`[`
`218`	`218`	`'Call to method Bug8169\HelloWorld::assertString() with int will always evaluate to false.',`
`219`		`- 33,`
	`219`	`+ 35,`
`220`	`220`	`],`
`221`	`221`	`]);`
`222`	`222`	`}`